[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[Zheng Junjie via Guix-patches via]

hello!

I updated some kde package, and add plasma desktop.

and have some other changes:
1. change qt-wrap wrap QML2_IMPORT_PATH from `=' to `prefix', because some qt
program have optional/circular runtime qml dependencies, so get them from
environment.

2. add some envvar to sddm service, make breeze theme work.

you also can see in https://github.com/Z572/guix/tree/kde-5.108.0

Hartmut Goebel (1):
  services: Add Plasme desktop service.

Zheng Junjie (208):
  gnu: extra-cmake-modules: Update to 5.108.0.
  gnu: kconfig: Update to 5.108.0.
  gnu: kquickcharts: Update to 5.108.0.
  gnu: attica: Update to 5.108.0.
  gnu: attica: use G-expressions.
  gnu: bluez-qt: Update to 5.108.0.
  gnu: breeze-icons: Update to 5.108.0.
  gnu: kapidox: Update to 5.108.0.
  gnu: kapidox: use G-expressions.
  gnu: karchive: Update to 5.108.0.
  gnu: kcalendarcore: Update to 5.108.0.
  gnu: kcalendarcore: use G-expressions.
  gnu: kcodecs: Update to 5.108.0.
  gnu: kcoreaddons: Update to 5.108.0.
  gnu: kcoreaddons: use G-expressions.
  gnu: kauth: Update to 5.108.0.
  gnu: kauth: use G-expressions.
  gnu: kwidgetsaddons: Update to 5.108.0.
  gnu: kwidgetsaddons: use G-expressions.
  gnu: kwindowsystem: Update to 5.108.0.
  gnu: kwindowsystem: use G-expressions.
  gnu: modemmanager-qt: Update to 5.108.0.
  gnu: modemmanager-qt: use G-expressions.
  gnu: networkmanager-qt: Update to 5.108.0.
  gnu: networkmanager-qt: use G-expressions.
  gnu: oxygen-icons: Update to 5.108.0.
  gnu: prison: Update to 5.108.0.
  gnu: ki18n: Update to 5.108.0.
  gnu: ki18n: use G-expressions.
  gnu: kidletime: Update to 5.108.0.
  gnu: kirigami: Update to 5.108.0.
  gnu: kitemmodels: Update to 5.108.0.
  gnu: kitemviews: Update to 5.108.0.
  gnu: kplotting: Update to 5.108.0.
  gnu: ksyntaxhighlighting: Update to 5.108.0.
  gnu: kcompletion: Update to 5.108.0.
  gnu: kcrash: Update to 5.108.0.
  gnu: kcontacts: Update to 5.108.0.
  gnu: kcontacts: use G-expressions.
  gnu: kjobwidgets: Update to 5.108.0.
  gnu: knotifications: Update to 5.108.0.
  gnu: knotifications: use G-expressions.
  gnu: kpty: Update to 5.108.0.
  gnu: kpty: use G-expressions.
  gnu: kunitconversion: Update to 5.108.0.
  gnu: syndication: Update to 5.108.0.
  gnu: kdoctools: Update to 5.108.0.
  gnu: kdoctools: use G-expressions.
  gnu: kpackage: Update to 5.108.0.
  gnu: kpackage: use G-expressions.
  gnu: kguiaddons: Update to 5.108.0.
  gnu: kholidays: Update to 5.108.0.
  gnu: kconfigwidgets: Update to 5.108.0.
  gnu: kconfigwidgets: use G-expressions.
  gnu: kiconthemes: Update to 5.108.0.
  gnu: sonnet: Update to 5.108.0.
  gnu: solid: Update to 5.108.0.
  gnu: solid: use G-expressions.
  gnu: threadweaver: Update to 5.108.0.
  gnu: kjs: Update to 5.108.0.
  gnu: kjsembed: Update to 5.108.0.
  gnu: plasma-wayland-protocols: Update to 1.10.0.
  gnu: kwayland: Update to 5.108.0.
  gnu: kdnssd: Update to 5.108.0.
  gnu: kimageformats: Update to 5.108.0.
  gnu: kimageformats: use G-expressions.
  gnu: kdesignerplugin: Update to 5.108.0.
  gnu: kdbusaddons: Update to 5.108.0.
  gnu: kglobalaccel: Update to 5.108.0.
  gnu: kservice: Update to 5.108.0.
  gnu: kxmlgui: Update to 5.108.0.
  gnu: kbookmarks: Update to 5.108.0.
  gnu: ktextwidgets: Update to 5.108.0.
  gnu: kpeople: Update to 5.108.0.
  gnu: kwallet: Update to 5.108.0.
  gnu: kded: Update to 5.108.0.
  gnu: kdesu: Update to 5.108.0.
  gnu: kemoticons: Update to 5.108.0.
  gnu: kemoticons: use G-expressions.
  gnu: qqc2-desktop-style: Update to 5.108.0.
  gnu: kfilemetadata: Update to 5.108.0.
  gnu: kfilemetadata: use G-expressions.
  gnu: kio: Update to 5.108.0.
  gnu: kdeclarative: Update to 5.108.0.
  gnu: kdeclarative: use G-expressions.
  gnu: kactivities: Update to 5.108.0.
  gnu: kactivities-stats: Update to 5.108.0.
  gnu: kcmutils: Update to 5.108.0.
  gnu: kcmutils: use G-expressions.
  gnu: knotifyconfig: Update to 5.108.0.
  gnu: kparts: Update to 5.108.0.
  gnu: kinit: Update to 5.108.0.
  gnu: kdav: Update to 5.108.0.
  gnu: kdav: use G-expressions.
  gnu: kross: Update to 5.108.0.
  gnu: kmediaplayer: Update to 5.108.0.
  gnu: purpose: Update to 5.108.0.
  gnu: purpose: use G-expressions.
  gnu: kxmlrpcclient: Update to 5.108.0.
  gnu: kdelibs4support: Update to 5.108.0.
  gnu: khtml: Update to 5.108.0.
  gnu: ktexteditor: Update to 5.108.0.
  gnu: baloo: Update to 5.108.0.
  gnu: baloo: use G-expressions.
  gnu: knewstuff: Update to 5.108.0.
  gnu: plasma-framework: Update to 5.108.0.
  gnu: plasma-framework: use G-expressions.
  gnu: kde-frameworkintegration: Update to 5.108.0.
  gnu: krunner: Update to 5.108.0.
  gnu: grantlee: Update to 5.3.1.
  gnu: grantlee: use G-expressions.
  gnu: grantleetheme: Update to 23.04.3.
  gnu: baloo-widgets: Update to 23.04.3.
  gnu: libkomparediff2: Update to 23.04.3.
  gnu: qca: Update to 2.3.6.
  gnu: kdf: Update to 23.04.3.
  gnu: poxml: Update to 23.04.3.
  gnu: kdegraphics-mobipocket: Update to 23.04.3.
  gnu: libkexiv2: Update to 23.04.3.
  gnu: libkdegames: Update to 23.04.3.
  gnu: kcachegrind: Update to 23.04.3.
  gnu: ktimer: Update to 23.04.3.
  gnu: kirigami-addons: Update to 0.9.0.
  gnu: kdeconnect: Update to 23.04.3.
  gnu: kdeconnect: use G-expressions.
  gnu: kpmcore: Update to 23.04.3.
  gnu: kpmcore: use G-expressions.
  gnu: kosmindoormap: Update to 23.04.3.
  gnu: kopeninghours: Update to 23.04.3.
  gnu: kopeninghours: use G-expressions.
  gnu: marble-qt: Update to 23.04.3.
  gnu: marble-qt: use G-expressions.
  gnu: okular: Update to 23.04.3.
  gnu: kdevelop-pg-qt: Update to 2.2.2.
  gnu: kpublictransport: Update to 23.04.3.
  gnu:  kpublictransport: use G-expressions.
  gnu: dolphin: Update to 23.04.3.
  gnu: dolphin-plugins: Update to 23.04.3.
  gnu: konsole: Update to 23.04.3.
  gnu: yakuake: Update to 23.04.3.
  gnu: ksystemlog: Update to 23.04.3.
  gnu: khelpcenter: Update to 23.04.3.
  gnu: khelpcenter: use G-expressions.
  gnu: bluedevil: Update to 5.27.6.
  gnu: kactivitymanagerd: Update to 5.27.6.
  gnu: kdecoration: Update to 5.27.6.
  gnu: kwayland-server: Update to 5.24.7.
  gnu: breeze: Update to 5.27.6.
  gnu: breeze-gtk: Update to 5.27.6.
  gnu: drkonqi: Update to 5.27.6.
  gnu: kgamma: Update to 5.27.6.
  gnu: kmenuedit: Update to 5.27.6.
  gnu: ksshaskpass: Update to 5.27.6.
  gnu: libksysguard: Update to 5.27.6.
  gnu: kwallet-pam: Update to 5.27.6.
  gnu: kwrited: Update to 5.27.6.
  gnu: milou: Update to 5.27.6.
  gnu: oxygen-sounds: Update to 5.27.6.
  gnu: plasmatube: Update to 23.01.0.
  gnu: plasma-disks: Update to 5.27.6.
  gnu: plasma-firewall: Update to 5.27.6.
  gnu: plasma-nano: Update to 5.27.6.
  gnu: plasma-pa: Update to 5.27.6.
  gnu: polkit-kde-agent: Update to 5.27.6.
  gnu: calindori: Update to 23.01.0.
  gnu: kongress: Update to 23.01.0.
  gnu: bluedevil: Update to 5.27.6.
  gnu: libkscreen: Update to 5.27.6.
  gnu: kscreen: Update to 5.27.6.
  gnu: layer-shell-qt: Update to 5.27.6.
  gnu: plasma-workspace-wallpapers: Update to 5.27.6.
  gnu: plasma-vault: Update to 5.27.6.
  gnu: kwayland-integration: Update to 5.27.6.
  gnu: plasma-nm: Update to 5.27.6.
  gnu: plasma-systemmonitor: Update to 5.27.6.
  gnu: ksystemstats: Update to 5.27.6.
  gnu: Add qtvirtualkeyboard-5.
  gnu: kscreenlocker: Update to 5.27.6.
  gnu: kscreenlocker: Format with 'guix style'.
  gnu: discover: Update to 5.27.6.
  gnu: Add wayland-protocols-next.
  gnu: kwin: Update to 5.27.6.
  gnu: kio-extras: Update to 23.04.3.
  gnu: plasma-workspace: Update to 5.27.6.
  gnu: plasma-desktop: Update to 5.27.6.
  gnu: kde-cli-tools: Update to 5.27.6.
  gnu: khotkeys: Update to 5.27.6.
  gnu: system-settings: Update to 5.27.6.
  gnu: powerdevil: Update to 5.27.6.
  gnu: plasma-integration: Update to 5.27.6.
  gnu: plasma-browser-integration: Update to 5.27.6.
  gnu: plasma-bigscreen: Update to 5.26.90.
  gnu: kinfocenter: Update to 5.27.6.
  gnu: plasma: Update to 5.27.6.
  gnu: xdg-desktop-portal-kde: Update to 5.27.6.
  gnu: plasma-welcome: Update to 5.27.6.
  gnu: kmix: Update to 23.04.3.
  gnu: kwave: Update to 23.04.3.
  gnu: kid3: Update to 3.9.4.
  gnu: libkcompactdisc: Update to 23.04.3.
  gnu: libkcddb: Update to 23.04.3.
  gnu: system-settings: add some qml runtime dependency to inputs.
  gnu: plasma-workspace: add some qml runtime dependency to inputs.
  gnu: plasma-desktop: add qtquickcontrols-5 to inputs.
  qt-utils: wrap QML2_IMPORT_PATH from '=' to 'prefix'.
  services: sddm: set some envvar to constructor.
  gnu: plasma: cleanup propagated-inputs.
  examples: add plasma operating-system example

 Makefile.am                                   |    1 +
 doc/guix.texi                                 |   18 +
 gnu/local.mk                                  |    1 -
 gnu/packages/freedesktop.scm                  |   26 +-
 gnu/packages/kde-frameworks.scm               | 1008 +++++++++--------
 gnu/packages/kde-multimedia.scm               |   22 +-
 gnu/packages/kde-plasma.scm                   |  567 ++++++----
 gnu/packages/kde-systemtools.scm              |   55 +-
 gnu/packages/kde.scm                          |  225 ++--
 .../patches/kwayland-skip-flaky-test.patch    |   13 -
 gnu/packages/qt.scm                           |   60 +-
 gnu/services/desktop.scm                      |   53 +
 gnu/services/sddm.scm                         |   11 +-
 gnu/system/examples/plasma.tmpl               |   67 ++
 guix/build/qt-utils.scm                       |    2 +-
 15 files changed, 1251 insertions(+), 878 deletions(-)
 delete mode 100644 gnu/packages/patches/kwayland-skip-flaky-test.patch
 create mode 100644 gnu/system/examples/plasma.tmpl


base-commit: fdfea4c4ed0d31494fcb3633c26290f4eba9d2af
-- 
2.41.0

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Zheng Junjie <873216071@qq.com> writes:

> hello!
>
> I updated some kde package, and add plasma desktop.

Hello, I had pick those patches from your Github repo, and modify
some commit messages (mostly from 'use ...' to 'Use ...', 'add ...' to
'Add ...') to hopefully align better with our style.

And put it here https://codeberg.org/iyzsong/guix with my wip (building
qtwebengine now...), I plan to update all KDE packages (games, internet,
multimedia, etc.), and will push to a kde-updates branch on
git.savannah.gnu.org once it's in good shape.

FYI, I had more updates with:

gnu: qca: Update to 2.3.7.
gnu: kirigami-addons: Update to 0.10.0.
gnu: kdevelop: Update to 23.04.3.
gnu: krfb: Update to 23.04.3.
gnu: libktorrent: Update to 23.04.3.
gnu: ktorrent: Update to 23.04.3.
gnu: krdc: Update to 23.04.3.
gnu: kopete: Update to 23.04.3.
gnu: konversation: Update to 23.04.3.
gnu: kget: Update to 23.04.3.
gnu: kjumpingcube: Update to 23.04.3.
gnu: ksquares: Update to 23.04.3.
gnu: kreversi: Update to 23.04.3.
gnu: knavalbattle: Update to 23.04.3.
gnu: kollision: Update to 23.04.3.
gnu: ksnakeduel: Update to 23.04.3.
gnu: killbots: Update to 23.04.3.
gnu: bovo: Update to 23.04.3.
gnu: kspaceduel: Update to 23.04.3.
gnu: kapman: Update to 23.04.3.
gnu: lskat: Update to 23.04.3.
gnu: kubrick: Update to 23.04.3.
gnu: kigo: Update to 23.04.3.
gnu: kiriki: Update to 23.04.3.
gnu: palapeli: Update to 23.04.3.
gnu: ksirk: Update to 23.04.3.
gnu: granatier: Update to 23.04.3.
gnu: bomber: Update to 23.04.3.
gnu: knetwalk: Update to 23.04.3.
gnu: kblackbox: Update to 23.04.3.
gnu: kfourinline: Update to 23.04.3.
gnu: kdiamond: Update to 23.04.3.
gnu: kgoldrunner: Update to 23.04.3.
gnu: klines: Update to 23.04.3.
gnu: ksudoku: Update to 23.04.3.
gnu: kblocks: Update to 23.04.3.
gnu: kbounce: Update to 23.04.3.
gnu: konquest: Update to 23.04.3.
gnu: kmines: Update to 23.04.3.
gnu: kbreakout: Update to 23.04.3.
gnu: kajongg: Update to 23.04.3.
gnu: kshisen: Update to 23.04.3.
gnu: kmahjongg: Update to 23.04.3.
gnu: libkmahjongg: Update to 23.04.3.
gnu: kolf: Update to 23.04.3.
gnu: picmi: Update to 23.04.3.
gnu: ktuberling: Update to 23.04.3.

(Already build and try all games, found 3 majiang games: kajongg kshisen
kmahjongg broken somehow..)

I expect in one next week or two we can do a request-for-merge to CI.

Thanks!

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

宋文武 <iyzsong@envs.net> writes:

> Zheng Junjie <873216071@qq.com> writes:
>
>> hello!
>>
>> I updated some kde package, and add plasma desktop.
>
> Hello, I had pick those patches from your Github repo, and modify
> some commit messages (mostly from 'use ...' to 'Use ...', 'add ...' to
> 'Add ...') to hopefully align better with our style.
>
> And put it here https://codeberg.org/iyzsong/guix with my wip (building
> qtwebengine now...), I plan to update all KDE packages (games, internet,
> multimedia, etc.), and will push to a kde-updates branch on
> git.savannah.gnu.org once it's in good shape.

I have push a kde-updates branch to savannah, with plasma update to
5.27.7.  Applications are all build fine but some have runtime issues.
I haven't got Plasma built due to substitute issues, will try later in
next days...

In addition to version updates, there have some changes:

2b9e2e65cf gnu: Remove kwayland-server.
08846c7ebf gnu: qgpgme: Propagate gpgme.
b9e192ad9a gnu: Add qcoro-qt5.
ab3eba1447 gnu: Add kpipewire.

Review is welcome, Thanks!

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

宋文武 <iyzsong@envs.net> writes:

> 宋文武 <iyzsong@envs.net> writes:
>
>> Zheng Junjie <873216071@qq.com> writes:
>>
>>> hello!
>>>
>>> I updated some kde package, and add plasma desktop.
>>
>> Hello, I had pick those patches from your Github repo, and modify
>> some commit messages (mostly from 'use ...' to 'Use ...', 'add ...' to
>> 'Add ...') to hopefully align better with our style.
>>
>> And put it here https://codeberg.org/iyzsong/guix with my wip (building
>> qtwebengine now...), I plan to update all KDE packages (games, internet,
>> multimedia, etc.), and will push to a kde-updates branch on
>> git.savannah.gnu.org once it's in good shape.
>
> I have push a kde-updates branch to savannah, with plasma update to
> 5.27.7.  Applications are all build fine but some have runtime issues.
> I haven't got Plasma built due to substitute issues, will try later in
> next days...
>
> In addition to version updates, there have some changes:
>
> 2b9e2e65cf gnu: Remove kwayland-server.
> 08846c7ebf gnu: qgpgme: Propagate gpgme.
> b9e192ad9a gnu: Add qcoro-qt5.
> ab3eba1447 gnu: Add kpipewire.
>
> Review is welcome, Thanks!

Plasma build and works fine.
Also fixed 3 mahjongg games with:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-kajongg-Hardcode-paths-to-ogg123-and-python3.patch --]
[-- Type: text/x-patch, Size: 2418 bytes --]

From 1e4085670a149df7e9858ef6c52995415cf27037 Mon Sep 17 00:00:00 2001
Message-ID: <1e4085670a149df7e9858ef6c52995415cf27037.1691235884.git.iyzsong@member.fsf.org>
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Sat, 5 Aug 2023 15:37:57 +0800
Subject: [PATCH 1/2] gnu: kajongg: Hardcode paths to 'ogg123' and 'python3'.

* gnu/packages/kde-games.scm (kajongg)[inputs]: Add vorbis-tools.
[arguments]<#:phases>: Hardcode paths to 'ogg123' and 'python3'.
---
 gnu/packages/kde-games.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm
index a47deb6c68..9e2b885c2b 100644
--- a/gnu/packages/kde-games.scm
+++ b/gnu/packages/kde-games.scm
@@ -37,7 +37,8 @@ (define-module (gnu packages kde-games)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages qt))
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages xiph))
 
 (define-public ktuberling
   (package
@@ -300,7 +301,15 @@ (define-public kajongg
              (substitute* "src/mjresource.py"
                (("'share', 'kmahjongglib'" all)
                 (string-append "'" (assoc-ref inputs "libkmahjongg")
-                               "/share', 'kmahjongglib'")))))
+                               "/share', 'kmahjongglib'")))
+             (substitute* "src/sound.py"
+               (("oggBinary = 'ogg123'")
+                (format #f "oggBinary = '~a'"
+                        (search-input-file inputs "bin/ogg123"))))
+             (substitute* "src/common.py"
+               (("interpreterName = 'python3'")
+                (format #f "interpreterName = '~a'"
+                        (search-input-file inputs "bin/python3"))))))
          (add-after 'qt-wrap 'wrap
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
@@ -327,7 +336,8 @@ (define-public kajongg
            python-qtpy
            python-zope-interface
            qtbase-5
-           qtsvg-5))
+           qtsvg-5
+           vorbis-tools))
     (home-page "https://apps.kde.org/kajongg/")
     (synopsis "Classical Mah Jongg game for 4 players")
     (description "Kajongg is the ancient Chinese board game for 4 players.

base-commit: 0a4490e4fd77a0dd50262d080bd024a2f41cdc4a
-- 
2.41.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-libkmahjongg-Make-its-tilset-available-to-games.patch --]
[-- Type: text/x-patch, Size: 2231 bytes --]

From 4c0a6635d81970da2f461757ff891f2528a57b5c Mon Sep 17 00:00:00 2001
Message-ID: <4c0a6635d81970da2f461757ff891f2528a57b5c.1691235884.git.iyzsong@member.fsf.org>
In-Reply-To: <1e4085670a149df7e9858ef6c52995415cf27037.1691235884.git.iyzsong@member.fsf.org>
References: <1e4085670a149df7e9858ef6c52995415cf27037.1691235884.git.iyzsong@member.fsf.org>
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Sat, 5 Aug 2023 19:36:49 +0800
Subject: [PATCH 2/2] gnu: libkmahjongg: Make its tilset available to games.

* gnu/packages/kde-games.scm (libkmahjongg)[arguments]: Add a phase
to add its "$out/share" to XDG_DATA_DIRS.
---
 gnu/packages/kde-games.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm
index 9e2b885c2b..8ed530d83e 100644
--- a/gnu/packages/kde-games.scm
+++ b/gnu/packages/kde-games.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages kde-games)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system qt)
+  #:use-module (guix gexp)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gl)
@@ -184,6 +185,24 @@ (define-public libkmahjongg
       (sha256
        (base32 "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3"))))
     (build-system qt-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-tileset-dir
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              ;; Add "$out/share" to XDG_DATA_DIRS so that the default tileset
+              ;; is always available.
+              (substitute* "src/kmahjonggtileset.cpp"
+                (("_inited = true;")
+                 (format #f "QByteArray x = qgetenv(\"XDG_DATA_DIRS\");
+if (!x.isEmpty()) {
+  QString datadirs = QString::fromLocal8Bit(x) + QLatin1String(\":~a\");
+  qputenv(\"XDG_DATA_DIRS\", datadirs.toLocal8Bit());
+}
+_inited = true;"
+                         (string-append
+                          (assoc-ref outputs "out") "/share")))))))))
     (native-inputs
      (list extra-cmake-modules))
     (inputs
-- 
2.41.0


[-- Attachment #4: Type: text/plain, Size: 178 bytes --]


CC to guix-devel: Anyone can help to setup a CI job for this kde-updates
branch? (more than 2000 packages will need rebuild due to sdl2 -> fcitx -> extra-cmake-modules)
Thanks!

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[Andreas Enge]

Hello,

Am Wed, Aug 02, 2023 at 10:48:43PM +0800 schrieb 宋文武:
> I have push a kde-updates branch to savannah, with plasma update to
> 5.27.7.

I have added a cuirass specification, you can follow the branch here:
   https://ci.guix.gnu.org/jobset/kde-updates

Andreas

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Andreas Enge <andreas@enge.fr> writes:

> Hello,
>
> Am Wed, Aug 02, 2023 at 10:48:43PM +0800 schrieb 宋文武:
>> I have push a kde-updates branch to savannah, with plasma update to
>> 5.27.7.
>
> I have added a cuirass specification, you can follow the branch here:
>    https://ci.guix.gnu.org/jobset/kde-updates
>
> Andreas

Thank you!  Fixed failures due to missing ktextaddons with:

  5ced446828 gnu: Add ktextaddons.
  8d1a785d59 gnu: Add missing ktextaddons to kde-pim packages.

Also fixed kalendar and kgpg:
  67f32a2fd2 gnu: kalendar: Add missing inputs.
  1a02365c4a gnu: kgpg: Skip flaky test.

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[Andreas Enge]

Am Tue, Aug 08, 2023 at 08:39:26PM +0800 schrieb 宋文武:
> Thank you!  Fixed failures due to missing ktextaddons with:
>   5ced446828 gnu: Add ktextaddons.
>   8d1a785d59 gnu: Add missing ktextaddons to kde-pim packages.
> Also fixed kalendar and kgpg:
>   67f32a2fd2 gnu: kalendar: Add missing inputs.
>   1a02365c4a gnu: kgpg: Skip flaky test.

Thank you! Does this also fix this older bug report:
   https://issues.guix.gnu.org/53543
or if not, could you check if there is a simple fix?

Andreas

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Andreas Enge <andreas@enge.fr> writes:

> Am Tue, Aug 08, 2023 at 08:39:26PM +0800 schrieb 宋文武:
>> Thank you!  Fixed failures due to missing ktextaddons with:
>>   5ced446828 gnu: Add ktextaddons.
>>   8d1a785d59 gnu: Add missing ktextaddons to kde-pim packages.
>> Also fixed kalendar and kgpg:
>>   67f32a2fd2 gnu: kalendar: Add missing inputs.
>>   1a02365c4a gnu: kgpg: Skip flaky test.
>
> Thank you! Does this also fix this older bug report:
>    https://issues.guix.gnu.org/53543
> or if not, could you check if there is a simple fix?

Yes, kmessagelib build fine now.

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Andreas Enge <andreas@enge.fr> writes:

> Am Tue, Aug 08, 2023 at 08:39:26PM +0800 schrieb 宋文武:
>> Thank you!  Fixed failures due to missing ktextaddons with:
>>   5ced446828 gnu: Add ktextaddons.
>>   8d1a785d59 gnu: Add missing ktextaddons to kde-pim packages.
>> Also fixed kalendar and kgpg:
>>   67f32a2fd2 gnu: kalendar: Add missing inputs.
>>   1a02365c4a gnu: kgpg: Skip flaky test.


Hello, I pushed follow commits:
  f39cfc3d5b gnu: gst-plugins-bad: Skip flaky test.
  00efabe6fe gnu: korganizer: Fix tests.
  f36c52e076 gnu: akregator: Add missing ktextaddons to inputs.
  55f3b17915 gnu: grantlee: Fix build on i686-linux.

gst-plugins-bad will unblock gtk and various packages,

qtwebengine/i686 was failed on master too with:
  ld: libQt5WebEngineCore.so.5.15.8: final close failed: memory exhausted
I'd leave it as it is...

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[Andreas Enge]

Am Wed, Aug 09, 2023 at 06:33:05PM +0800 schrieb 宋文武:
> qtwebengine/i686 was failed on master too with:
>   ld: libQt5WebEngineCore.so.5.15.8: final close failed: memory exhausted
> I'd leave it as it is...

Yes, since it is not a regression that is okay.

Andreas

[bug#64798] Request for merging "kde-updates" branch

[宋文武 via Guix-patches via]

Hello, I think the "kde-updates" branch is ready to be merged.

[bug#64798] [PATCH 000/209] update kde package and add plasma desktop

[Sughosha via Guix-patches via]

plasma-systemmonitor needs qqc2-desktop-style to show the processes,
and also spectacle needs to be added.

Sughosha (3):
  gnu: plasma-systemmonitor: Add qqc2-desktop-style to inputs.
  gnu: Add spectacle.
  gnu: plasma: Add spectacle to inputs.

 gnu/packages/kde-plasma.scm      |  5 +++
 gnu/packages/kde-systemtools.scm | 53 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)


base-commit: f39cfc3d5b4529548b15fd7edf45893c572fe45a
-- 
2.41.0

[bug#64798] [PATCH 1/3] gnu: plasma-systemmonitor: Add qqc2-desktop-style to inputs.

[Sughosha via Guix-patches via]

* gnu/packages/kde-plasma.scm (plasma-systemmonitor)[inputs]: Add qqc2-desktop-style.
---
 gnu/packages/kde-plasma.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 28c723ae9c..6fb0d1017f 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -2265,6 +2265,7 @@ (define-public plasma-systemmonitor
                   ksystemstats
                   kitemmodels
                   libksysguard
+                  qqc2-desktop-style
                   qtdeclarative-5
                   qtquickcontrols2-5))
     (synopsis "System sensors, process information and other system resources
-- 
2.41.0

[bug#64798] [PATCH 2/3] gnu: Add spectacle.

[Sughosha via Guix-patches via]

* gnu/packages/kde-systemtools.scm (spectacle): New variable.
---
 gnu/packages/kde-systemtools.scm | 53 ++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index bac044bf76..56ce37fea8 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -340,6 +340,59 @@ (define-public ksystemlog
 This package is part of the KDE administration module.")
     (license license:gpl2+)))
 
+(define-public spectacle
+  (package
+    (name "spectacle")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/spectacle-" version ".tar.xz"))
+       (sha256
+        (base32 "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "filename_test")))))))
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kconfig
+           kcoreaddons
+           kdbusaddons
+           kglobalaccel
+           kguiaddons
+           ki18n
+           kio
+           kirigami
+           knotifications
+           kpipewire
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libxcb
+           purpose
+           qtdeclarative-5
+           qtquickcontrols2-5
+           qtwayland-5
+           qtx11extras
+           wayland
+           wayland-protocols
+           plasma-wayland-protocols
+           xcb-util
+           xcb-util-cursor
+           xcb-util-image))
+    (home-page "https://apps.kde.org/spectacle/")
+    (synopsis "Screenshot capture utility for KDE")
+    (description "Spectacle is a screenshot taking utility for the KDE.")
+    (license license:gpl2+)))
+
 (define-public yakuake
   (package
     (name "yakuake")
-- 
2.41.0

[bug#64798] [PATCH 3/3] gnu: plasma: Add spectacle to inputs.

[Sughosha via Guix-patches via]

* gnu/packages/kde-plasma.scm (plasma)[propagated-inputs]: Add
spectacle.
---
 gnu/packages/kde-plasma.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 6fb0d1017f..e5a2fd003c 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1482,6 +1482,10 @@ (define-public plasma
                               (resolve-interface
                                '(gnu packages kde-systemtools))
                               'konsole)
+                             (module-ref
+                              (resolve-interface
+                               '(gnu packages kde-systemtools))
+                              'spectacle)
                              ;; kde-gtk-config ;; TODO
 
                              plasma-firewall
-- 
2.41.0

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Sughosha <sughosha@disroot.org> writes:

> plasma-systemmonitor needs qqc2-desktop-style to show the processes,
> and also spectacle needs to be added.
>
> Sughosha (3):
>   gnu: plasma-systemmonitor: Add qqc2-desktop-style to inputs.
>   gnu: Add spectacle.
>   gnu: plasma: Add spectacle to inputs.
>
>  gnu/packages/kde-plasma.scm      |  5 +++
>  gnu/packages/kde-systemtools.scm | 53 ++++++++++++++++++++++++++++++++
>  2 files changed, 58 insertions(+)
>
>
> base-commit: f39cfc3d5b4529548b15fd7edf45893c572fe45a

Pusehd to kde-updates, thank you!

[bug#64798] bug#65199: Request for merging "kde-updates" branch

[宋文武 via Guix-patches via]

> Hello, I think the "kde-updates" branch is ready to be merged.

I merge master into "kde-updates" now (due to ibus gtk changes on
master), when the build is done, it should be ready!

[bug#64798] [PATCH] gnu: kio-extras: Add missing inputs.

[Sughosha via Guix-patches via]

These inputs provide important features.

* gnu/packages/kde.scm (kio-extras)[inputs]: Add gperf, imobiledevice,
kactivities, kactivities-stats, kbookmarks, libkexiv2, libmtp, libplist,
libssh, libtirpc, openexr, phonon, samba and taglib.
---
 gnu/packages/kde.scm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 10fe522605..07d935ec14 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -467,20 +467,33 @@ (define-public kio-extras
                               (setenv "TMPDIR" (getcwd))
                               (invoke "ctest" "-E" "(thumbnailtest|testkioarchive)")))))))
     (native-inputs (list extra-cmake-modules dbus kdoctools qttools-5))
-    (inputs (list karchive
+    (inputs (list gperf
+                  imobiledevice
+                  kactivities
+                  kactivities-stats
+                  karchive
+                  kbookmarks
                   kconfig
                   kconfigwidgets
                   kcoreaddons
+                  kdnssd
                   kdbusaddons
+                  kguiaddons
                   ki18n
-                  kdnssd
                   kio
-                  solid
-                  kbookmarks
-                  kguiaddons
                   ksyntaxhighlighting
+                  libkexiv2
+                  libmtp
+                  libplist
+                  libssh
+                  libtirpc
+                  openexr
+                  phonon
                   qtbase-5
-                  qtsvg-5))
+                  qtsvg-5
+                  samba
+                  solid
+                  taglib))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Additional components to increase the functionality of KIO")
     (description

base-commit: 770f3f587d35e32aba3c6cb0b606f2d2fe8d5ace
-- 
2.41.0

[bug#64798] [PATCH v2] gnu: kio-extras: Add missing inputs.

[Sughosha via Guix-patches via]

Sorry, the previous patch was incomplete.

* gnu/packages/kde.scm (kio-extras)[inputs]: Add gperf, imath,
kactivities, kactivities-stats, kbookmarks, libimobiledevice, libkexiv2,
libmtp, libplist, libssh, libtirpc, openexr, phonon, samba, taglib and
zlib.
---
 gnu/packages/kde.scm | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 10fe522605..afa8cc5b28 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -60,6 +60,7 @@ (define-module (gnu packages kde)
   #:use-module (gnu packages djvu)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages ebook)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
@@ -71,6 +72,7 @@ (define-module (gnu packages kde)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gperf)
   #:use-module (gnu packages gps)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages image)
@@ -78,10 +80,13 @@ (define-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-pim)
   #:use-module (gnu packages kde-plasma)
+  #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages markup)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages mp3)
+  #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages photo)
@@ -90,6 +95,8 @@ (define-module (gnu packages kde)
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages samba)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages version-control)
@@ -467,20 +474,35 @@ (define-public kio-extras
                               (setenv "TMPDIR" (getcwd))
                               (invoke "ctest" "-E" "(thumbnailtest|testkioarchive)")))))))
     (native-inputs (list extra-cmake-modules dbus kdoctools qttools-5))
-    (inputs (list karchive
+    (inputs (list gperf
+                  imath
+                  kactivities
+                  kactivities-stats
+                  karchive
+                  kbookmarks
                   kconfig
                   kconfigwidgets
                   kcoreaddons
+                  kdnssd
                   kdbusaddons
+                  kguiaddons
                   ki18n
-                  kdnssd
                   kio
-                  solid
-                  kbookmarks
-                  kguiaddons
                   ksyntaxhighlighting
+                  libimobiledevice
+                  libkexiv2
+                  libmtp
+                  libplist
+                  libssh
+                  libtirpc
+                  openexr
+                  phonon
                   qtbase-5
-                  qtsvg-5))
+                  qtsvg-5
+                  samba
+                  solid
+                  taglib
+                  zlib))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Additional components to increase the functionality of KIO")
     (description

base-commit: 770f3f587d35e32aba3c6cb0b606f2d2fe8d5ace
-- 
2.41.0

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Sughosha <sughosha@disroot.org> writes:

> Sorry, the previous patch was incomplete.
>
> * gnu/packages/kde.scm (kio-extras)[inputs]: Add gperf, imath,
> kactivities, kactivities-stats, kbookmarks, libimobiledevice, libkexiv2,
> libmtp, libplist, libssh, libtirpc, openexr, phonon, samba, taglib and
> zlib.

Applied to kde-updates branch, with pkg-config, shared-mime-info and
kdsoap added, thank you!

[bug#64798] [PATCH 0/9] Add more KDE applications.

[Sughosha via Guix-patches via]

This series of patches add more KDE applications.

Sughosha (9):
  gnu: Add libkdcraw.
  gnu: Add kcolorpicker.
  gnu: Add kimageannotator.
  gnu: Add gwenview.
  gnu: Add kolourpaint.
  gnu: Add kommit.
  gnu: Add kompare.
  gnu: Add falkon.
  gnu: Add kcolorchooser.

 gnu/packages/kde-frameworks.scm |  53 ++++++++
 gnu/packages/kde-internet.scm   |  45 ++++++-
 gnu/packages/kde.scm            | 214 ++++++++++++++++++++++++++++++++
 3 files changed, 311 insertions(+), 1 deletion(-)


base-commit: 55e7f320fd7ce8f499bfa7c6dd010669f2eaee0e
-- 
2.41.0

[bug#64798] [PATCH 1/9] gnu: Add libkdcraw.

[Sughosha via Guix-patches via]

* gnu/packages/kde.scm (libkdcraw): New variable.
---
 gnu/packages/kde.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index af0752d21e..49b238ca9f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1438,6 +1438,28 @@ (define-public kdegraphics-mobipocket
 Mobipocket e-books in Dolphin and other KDE apps.")
     (license license:gpl2+)))
 
+(define-public libkdcraw
+  (package
+    (name "libkdcraw")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/" name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0vwr44j77c1vffsppkzdasd0l8apzx7jn6llwhzb4bjp93arx18w"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list pkg-config extra-cmake-modules))
+    (inputs
+     (list libraw qtbase-5))
+    (home-page "https://invent.kde.org/graphics/libkexiv2")
+    (synopsis "C++ interface used to decode RAW picture files")
+    (description "Libkdcraw is a C++ interface around LibRaw library used to
+decode RAW picture files.")
+    (license (list license:gpl2+ license:bsd-3))))
+
 (define-public libkexiv2
   (package
     (name "libkexiv2")
-- 
2.41.0

[bug#64798] [PATCH 2/9] gnu: Add kcolorpicker.

[Sughosha via Guix-patches via]

* gnu/packages/kde-frameworks.scm (kcolorpicker): New variable.
---
 gnu/packages/kde-frameworks.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 8e7916df25..aab8b138d6 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages kde-frameworks)
   #:use-module (guix build-system python)
   #:use-module (guix build-system qt)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -556,6 +557,31 @@ (define-public kcodecs
                    license:lgpl2.1 license:lgpl2.1+ license:expat
                    license:lgpl3+ license:mpl1.1))))
 
+(define-public kcolorpicker
+  (package
+    (name "kcolorpicker")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/ksnip/kColorPicker")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1aw41mj0hxin2h3cldiiv7ivq5qv97l0ww42yr7j8hmkzj7qq6ba"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:tests? #f)) ;no tests
+    (home-page "https://github.com/ksnip/kColorPicker")
+    (synopsis "Color Picker with popup menu")
+    (description
+     "kColorPicker is QToolButton with color popup menu which lets you select a
+color.  The popup features a color dialog button which can be used to add
+custom colors to the popup menu.")
+    (license license:lgpl3)))
+
 (define-public kconfig
   (package
     (name "kconfig")
-- 
2.41.0

[bug#64798] [PATCH 3/9] gnu: Add kimageannotator.

[Sughosha via Guix-patches via]

* gnu/packages/kde-frameworks.scm (kimageannotator): New variable.
---
 gnu/packages/kde-frameworks.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index aab8b138d6..001b616fca 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1819,6 +1819,33 @@ (define-public kfilemetadata
 by applications to write metadata.")
     (license (list license:lgpl2.0 license:lgpl2.1 license:lgpl3))))
 
+(define-public kimageannotator
+  (package
+    (name "kimageannotator")
+    (version "0.6.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ksnip/kImageAnnotator")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1gm85d1cnhf51ssj0gs2253fifl48r05d3q5s93jwk3jkq01inll"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:tests? #f)) ;no tests
+    (native-inputs
+     (list qttools-5))
+    (inputs
+     (list kcolorpicker qtsvg-5))
+    (home-page "https://github.com/ksnip/kImageAnnotator")
+    (synopsis "Tool for annotating images")
+    (description
+     "kImageAnnotator is a tool for annotating images.")
+    (license license:lgpl3)))
+
 (define-public kimageformats
   (package
     (name "kimageformats")
-- 
2.41.0

[bug#64798] [PATCH 4/9] gnu: Add gwenview.

[Sughosha via Guix-patches via]

* gnu/packages/kde.scm (gwenview): New variable.
---
 gnu/packages/kde.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 49b238ca9f..61a8d4713d 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -227,6 +227,62 @@ (define-public akregator
 browser for easy news reading.")
     (license license:gpl2+)))
 
+(define-public gwenview
+  (package
+    (name "gwenview")
+    (version "23.04.3")
+    (source
+     (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/release-service/" version
+                            "/src/gwenview-" version ".tar.xz"))
+        (sha256
+         (base32 "0vijsq4174p4asdjq47bzdp2xkfn8hpg7b4dgp3yvapfxwjgp148"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "(placetreemodeltest|historymodeltest|contextmanagertest|urlutilstest)")))))))
+    (native-inputs
+     (list extra-cmake-modules kdoctools pkg-config))
+    (inputs
+     (list baloo
+           cfitsio
+           exiv2
+           kactivities
+           kcolorpicker
+           kguiaddons
+           kiconthemes
+           kimageannotator
+           kio
+           kitemmodels
+           knotifications
+           kparts
+           lcms
+           libjpeg-turbo
+           libkdcraw
+           libpng
+           libtiff
+           phonon
+           purpose
+           qtimageformats
+           qtsvg-5
+           qtwayland-5
+           qtx11extras
+           wayland
+           wayland-protocols
+           zlib))
+    (home-page "https://userbase.kde.org/Gwenview")
+    (synopsis "Image viewer for KDE")
+    (description
+     "Gwenview is an image viewer for KDE.  It also provides image editing and
+annotating features.")
+    (license license:gpl2+)))
+
 (define-public kdenlive
   (package
     (name "kdenlive")
-- 
2.41.0

[bug#64798] [PATCH 5/9] gnu: Add kolourpaint.

[Sughosha via Guix-patches via]

* gnu/packages/kde.scm (kolourpaint): New variable.
---
 gnu/packages/kde.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 61a8d4713d..37e93106c4 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -649,6 +649,34 @@ (define-public kseexpr
 expression library, that is used in Krita.")
     (license license:gpl3+)))
 
+(define-public kolourpaint
+  (package
+    (name "kolourpaint")
+    (version "23.04.3")
+    (source
+     (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/release-service/" version
+                            "/src/kolourpaint-" version ".tar.xz"))
+        (sha256
+         (base32 "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kguiaddons
+           ki18n
+           kio
+           kjobwidgets
+           ktextwidgets
+           kwidgetsaddons
+           kxmlgui))
+    (home-page "http://kolourpaint.org/")
+    (synopsis "Paint program for KDE")
+    (description "KolourPaint is a paint program for KDE.  It is useful for
+painting, image manipulating and icon editing.")
+    (license license:gpl2)))
+
 (define-public krita
   (package
     (name "krita")
-- 
2.41.0

[bug#64798] [PATCH 6/9] gnu: Add kommit.

[Sughosha via Guix-patches via]

* gnu/packages/kde.scm (kommit): New variable.
---
 gnu/packages/kde.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 37e93106c4..cd8dd0e64c 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -879,6 +879,46 @@ (define-public qca
 cards.")
     (license license:lgpl2.1+)))
 
+(define-public kommit
+  (package
+    (name "kommit")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/"
+                                  name "/" name "-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "0vp9d1x01na28p6smbd6spx14bjnzilr2bjsd380h1d17b9cm3hy"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "(difftest|clonedialogtest|overlaytest)")))))))
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list kconfigwidgets
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           ki18n
+           kxmlgui
+           kio
+           ktextwidgets
+           ktexteditor
+           ksyntaxhighlighting))
+    (home-page "https://apps.kde.org/kommit/")
+    (synopsis "Git client for KDE")
+    (description
+     "Kommit is a git client for KDE.")
+    (license license:gpl3+)))
+
 (define-public kopeninghours
   (package
     (name "kopeninghours")
-- 
2.41.0

[bug#64798] [PATCH 7/9] gnu: Add kompare.

[Sughosha via Guix-patches via]

* gnu/packages/kde.scm (kompare): New variable.
---
 gnu/packages/kde.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index cd8dd0e64c..e0299b9af6 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -919,6 +919,50 @@ (define-public kommit
      "Kommit is a git client for KDE.")
     (license license:gpl3+)))
 
+(define-public kompare
+  (package
+    (name "kompare")
+    (version "23.04.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/release-service/" version
+                                  "/src/kompare-" version ".tar.xz"))
+              (sha256
+               (base32
+                "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules kdoctools))
+    (inputs
+     (list libkomparediff2
+           kcodecs
+           kconfig
+           kcoreaddons
+           kiconthemes
+           kjobwidgets
+           kparts
+           ktexteditor
+           kwidgetsaddons))
+    (home-page "https://apps.kde.org/kompare/")
+    (synopsis "Graphical file differences tool")
+    (description
+     "Kompare is a program to view the differences between files.  Features
+include:
+@itemize
+@item comparison of files or directories via a graphical interface,
+@item bezier-based connection widget letting you see both source and destination,
+@item graphical viewing of patch files in normal, context, unified and diff
+ formats,
+@item interactive application of differences,
+@item network transparency,
+@item ability to view plain-text diff output in embedded viewer,
+@item navigation of multiple-file diffs with dockable navigation tree,
+@item graphical interface for commonly used diff command line options,
+@item switch source and destination
+@item and diff statistics.
+@end itemize")
+    (license license:gpl3+)))
+
 (define-public kopeninghours
   (package
     (name "kopeninghours")
-- 
2.41.0

[bug#64798] [PATCH 8/9] gnu: Add falkon.

[Sughosha via Guix-patches via]

* gnu/packages/kde-internet.scm (falkon): New variable.
---
 gnu/packages/kde-internet.scm | 45 ++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index cc767ec868..4c519b93fd 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -52,7 +52,8 @@ (define-module (gnu packages kde-internet)
   #:use-module (gnu packages vnc)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xiph)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))
 
 (define-public choqok
   (package
@@ -114,6 +115,48 @@ (define-public choqok
 @end itemize")
     (license license:gpl3+)))
 
+(define-public falkon
+  (package
+    (name "falkon")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/falkon-" version ".tar.xz"))
+       (sha256
+        (base32
+         "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "ctest" "-E"
+                             "(locationbartest|qmltabsapitest)")))))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config qttools-5))
+    (inputs
+     (list karchive
+           ki18n
+           kio
+           kwallet
+           openssl
+           purpose
+           qtquickcontrols-5
+           qtsvg-5
+           qtwebengine-5
+           qtx11extras
+           qtwayland-5
+           xcb-util))
+    (home-page "https://www.falkon.org/")
+    (synopsis "Qt-based web browser for KDE")
+    (description
+     "Falkon is is a Qt-based web browser for  KDE.")
+    (license license:gpl3+)))
+
 (define-public kget
   (package
     (name "kget")
-- 
2.41.0

[bug#64798] [PATCH 9/9] gnu: Add kcolorchooser.

[Sughosha via Guix-patches via]

* gnu/packages/kde.scm (kcolorchooser): New variable.
---
 gnu/packages/kde.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index e0299b9af6..615fa00796 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -649,6 +649,30 @@ (define-public kseexpr
 expression library, that is used in Krita.")
     (license license:gpl3+)))
 
+(define-public kcolorchooser
+  (package
+    (name "kcolorchooser")
+    (version "23.04.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/kcolorchooser-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list kcoreaddons
+           ki18n
+           kxmlgui))
+    (home-page "https://apps.kde.org/de/kcolorchooser/")
+    (synopsis "Color selector utility")
+    (description "KColorChooser is a utility to select a color.")
+    (license license:expat)))
+
 (define-public kolourpaint
   (package
     (name "kolourpaint")
-- 
2.41.0

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Sughosha <sughosha@disroot.org> writes:

> This series of patches add more KDE applications.
>
> Sughosha (9):
>   gnu: Add libkdcraw.
>   gnu: Add kcolorpicker.
>   gnu: Add kimageannotator.
>   gnu: Add gwenview.
>   gnu: Add kolourpaint.
>   gnu: Add kommit.
>   gnu: Add kompare.
>   gnu: Add falkon.
>   gnu: Add kcolorchooser.
>
>  gnu/packages/kde-frameworks.scm |  53 ++++++++
>  gnu/packages/kde-internet.scm   |  45 ++++++-
>  gnu/packages/kde.scm            | 214 ++++++++++++++++++++++++++++++++
>  3 files changed, 311 insertions(+), 1 deletion(-)
>
>
> base-commit: 55e7f320fd7ce8f499bfa7c6dd010669f2eaee0e

Applied, thank you!

I moved libkdcraw to kde-frameworks, and enable tests for kcolorpicker
and kimageannotator.

[bug#64798] [PATCH] gnu: extra-cmake-modules: Fix libexec path.

[Sughosha via Guix-patches via]

* gnu/packages/kde-frameworks.scm (extra-cmake-modules)[#:phases]:
Fix libexec path.
---
 gnu/packages/kde-frameworks.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9778d9a1c6..ec7b5c041b 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -126,11 +126,13 @@ (define-public extra-cmake-modules
                     (not (null? (package-native-inputs this-package))))
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-lib-path
+          (add-after 'unpack 'fix-lib-and-libexec-path
             (lambda _
-              ;; Always install into /lib and not into /lib64.
               (substitute* "kde-modules/KDEInstallDirsCommon.cmake"
-                (("\"lib64\"") "\"lib\""))
+                ;; Always install into /lib and not into /lib64.
+                (("\"lib64\"") "\"lib\"")
+                ;; Install into /libexec and not into /lib/libexec.
+                (("LIBDIR \"libexec\"") "EXECROOTDIR \"libexec\""))
 
               ;; Determine the install path by the major version of Qt.
               ;; TODO: Base the following on values taken from Qt

base-commit: 461602d07c8da0e29bae392270f4ef3fd4f7fffb
-- 
2.41.0

[bug#64798] [PATCH] gnu: plasma-workspace: Add more inputs and patch path for qdbus.

[Sughosha via Guix-patches via]

* gnu/packages/kde-plasma.scm (plasma-workspace)[inputs]: Add icu4c, kpipewire,
kquickcharts, and qttools-5.
[#:phases]: Patch QtBinariesDir for qdbus.
---
 gnu/packages/kde-plasma.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index b23c2c6ce8..25b1370947 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages kde-plasma)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages ibus)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
@@ -69,6 +70,7 @@ (define-module (gnu packages kde-plasma)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages package-management) ; flatpak
+  #:use-module (gnu packages unicode)
   #:use-module (gnu packages video)
   #:use-module (gnu packages vpn)
   #:use-module (gnu packages vulkan)
@@ -2345,6 +2347,7 @@ (define-public plasma-workspace
                   breeze-icons
                   dbus
                   fontconfig
+                  icu4c
                   iso-codes
                   kactivities
                   kactivities-stats
@@ -2374,6 +2377,8 @@ (define-public plasma-workspace
                   kquickcharts
                   kpackage
                   kpeople
+                  kpipewire
+                  kquickcharts
                   krunner
                   kscreenlocker
                   ktexteditor
@@ -2404,6 +2409,7 @@ (define-public plasma-workspace
                   qtbase-5
                   qtdeclarative-5
                   qtquickcontrols2-5
+                  qttools-5
                   qtwayland-5
                   qtgraphicaleffects
                   qtx11extras
@@ -2416,6 +2422,7 @@ (define-public plasma-workspace
                   xmessage
                   xsetroot
                   polkit-qt
+                  ucd
 
                   libxcursor
                   libkexiv2
@@ -2442,7 +2449,8 @@ (define-public plasma-workspace
                    (let ((xmessage (search-input-file inputs "/bin/xmessage"))
                          (xsetroot (search-input-file inputs "/bin/xsetroot"))
                          (xrdb (search-input-file inputs "/bin/xrdb"))
-                         (kinit #$(this-package-input "kinit")))
+                         (kinit #$(this-package-input "kinit"))
+                         (qttools #$(this-package-input "qttools")))
                      (substitute* "startkde/startplasma.cpp"
                        (("xmessage") xmessage)
                        (("xsetroot") xsetroot))
@@ -2458,7 +2466,13 @@ (define-public plasma-workspace
                                    "startkde/startplasma-wayland.cpp"
                                    "startkde/startplasma-x11.cpp")
                        (("kdeinit5_shutdown")
-                        (string-append kinit "/bin/kdeinit5_shutdown"))))))
+                        (string-append kinit "/bin/kdeinit5_shutdown")))
+                     ;; QT_INSTALL_BINS refers to qtbase, but qdbus is in
+                     ;; qttools.
+                     (substitute* "CMakeLists.txt"
+                       (("ecm_query_qt\\(QtBinariesDir QT_INSTALL_BINS\\)")
+                        (string-append "set(QtBinariesDir \"" qttools
+                                       "/bin\")"))))))
                (delete 'check)
                (add-after 'install 'check-after-install
                  (lambda* (#:key tests? #:allow-other-keys)

base-commit: 461602d07c8da0e29bae392270f4ef3fd4f7fffb
-- 
2.41.0

[bug#64798] [PATCH] gnu: Add kaccounts-providers.

[Sughosha via Guix-patches via]

* gnu/packages/kde-pim.scm (kaccounts-providers): New variable.
---
 gnu/packages/kde-pim.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index d7ab88e256..56cd54be4a 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -600,6 +600,33 @@ (define-public kaccounts-integration
 management system and its Plasma integration components.")
     (license license:lgpl2.0+)))
 
+(define-public kaccounts-providers
+  (package
+    (name "kaccounts-providers")
+    (version "23.04.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/release-service/"
+                                  version "/src/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0"))))
+    (build-system qt-build-system)
+    (native-inputs (list extra-cmake-modules intltool))
+    (inputs (list kaccounts-integration
+                  kcoreaddons
+                  kdeclarative
+                  ki18n
+                  kio
+                  libaccounts-qt
+                  qtwebengine-5
+                  signond))
+    (home-page "https://invent.kde.org/network/kaccounts-providers")
+    (synopsis "Online account providers for the KAccounts system")
+    (description "This package provides online account providers for the
+KAccounts system.")
+    (license license:lgpl2.0+)))
+
 (define-public kalendar
   (package
     (name "kalendar")

base-commit: 461602d07c8da0e29bae392270f4ef3fd4f7fffb
-- 
2.41.0

[bug#64798] [PATCH 1/2] gnu: Add kde-gtk-config.

[Sughosha via Guix-patches via]

* gnu/packages/kde-plasma.scm (kde-gtk-config): New variable.
---
 gnu/packages/kde-plasma.scm | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index b23c2c6ce8..3d68742c2e 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -355,6 +355,44 @@ (define-public kactivitymanagerd
     (home-page "https://invent.kde.org/plasma/kactivitymanagerd")
     (license (list license:gpl2 license:gpl3))))
 
+(define-public kde-gtk-config
+  (package
+    (name "kde-gtk-config")
+    (version "5.27.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/plasma/" version
+                                  "/kde-gtk-config-" version ".tar.xz"))
+              (sha256
+               (base32
+                "13qwj3gdfvs0l6k01n8hf25kzrsksi3qi0b1rzpshcj1ix31wamf"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch-gsettings-schemas-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "cmake/modules/FindGSettingSchemas.cmake"
+                     (("\\$\\{PC_GLIB2_PREFIX\\}")
+                      (assoc-ref inputs "gsettings-desktop-schemas"))))))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config qtsvg-5 sassc))
+    (inputs
+     (list gsettings-desktop-schemas
+           gtk+
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           kguiaddons
+           kdbusaddons
+           kdecoration
+           kwindowsystem
+           xsettingsd))
+    (home-page "https://invent.kde.org/plasma/kde-gtk-config")
+    (synopsis "Sync of KDE settings to GTK applications")
+    (description "This package syncs KDE settings to GTK applications.")
+    (license (list license:bsd-2 license:bsd-3 license:gpl2 license:gpl3))))
+
 (define-public kdecoration
   (package
     (name "kdecoration")

base-commit: 461602d07c8da0e29bae392270f4ef3fd4f7fffb
-- 
2.41.0

[bug#64798] [PATCH 2/2] gnu: plasma: Add kde-gtk-config.

[Sughosha via Guix-patches via]

* gnu/packages/kde-plasma.scm (plasma)[propagated-inputs]: Add
kde-gtk-config.
---
 gnu/packages/kde-plasma.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 3d68742c2e..e0902931f4 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1497,6 +1497,7 @@ (define-public plasma
                              ;; oxygen
                              oxygen-sounds
 
+                             kde-gtk-config
                              kdesu
                              krunner
                              kinfocenter
@@ -1524,7 +1525,6 @@ (define-public plasma
                               (resolve-interface
                                '(gnu packages kde-systemtools))
                               'spectacle)
-                             ;; kde-gtk-config ;; TODO
 
                              kwayland-integration
                              plasma-firewall
-- 
2.41.0

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

Sughosha <sughosha@disroot.org> writes:

> * gnu/packages/kde-frameworks.scm (extra-cmake-modules)[#:phases]:
> Fix libexec path.

Pushed to kde-updates, thanks.


I also removed fcitx from sdl2's inputs, so that it doesn't depend on
extra-cmake-modules any more.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-sdl2-Remove-fcitx-from-inputs.patch --]
[-- Type: text/x-patch, Size: 1365 bytes --]

From 9b283090e93f8db7bce4ce210d805959c5c318c0 Mon Sep 17 00:00:00 2001
Message-ID: <9b283090e93f8db7bce4ce210d805959c5c318c0.1692269711.git.iyzsong@member.fsf.org>
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Thu, 17 Aug 2023 18:46:30 +0800
Subject: [PATCH] gnu: sdl2: Remove fcitx from inputs.

fcitx is not needed at build time for its sdl2 support.

* gnu/packages/sdl.scm (sdl2)[inputs]: Remove fcitx.
---
 gnu/packages/sdl.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 86ec1c033b..11aa5e1602 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -46,7 +46,6 @@ (define-module (gnu packages sdl)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages fcitx)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
@@ -146,7 +145,6 @@ (define-public sdl2
      (modify-inputs (package-inputs sdl)
        (append dbus
                eudev                    ;for discovering input devices
-               fcitx                    ;helps with CJK input
                glib
                ibus-minimal
                libxkbcommon

base-commit: 0ffbdf34567aedb0ae6cef6b869370a415cfaa65
-- 
2.41.0

[bug#64798] [PATCH 0/2] Fix libexec path in KDE packages.

[Sughosha via Guix-patches via]

These patches fix libexec path in the KDE packages  according to the commit
731413a680a33ed1ad909e41e5b388561a63f365.

Sughosha (2):
  gnu: kde-cli-tools: Fix path to kdesu.
  gnu: plasma-workspace: Fix path to kf5.

 gnu/packages/kde-plasma.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


base-commit: 9b283090e93f8db7bce4ce210d805959c5c318c0
-- 
2.41.0

[bug#64798] [PATCH 1/2] gnu: kde-cli-tools: Fix path to kdesu.

[Sughosha via Guix-patches via]

* gnu/packages/kde-plasma.scm (kde-cli-tools)[symlink-kdesu]: Fix path to kdesu.
---
 gnu/packages/kde-plasma.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 08a2f64af6..e699111429 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -449,7 +449,7 @@ (define-public kde-cli-tools
                  (lambda _
                    ;; XXX: nixpkgs say kdesu need kdeinit5 in PATH, but i can't
                    ;; found in source, need check
-                   (symlink (string-append #$output "/lib/libexec/kf5/kdesu")
+                   (symlink (string-append #$output "/libexec/kf5/kdesu")
                             (string-append #$output "/bin/kdesu")))))))
     (native-inputs (list extra-cmake-modules pkg-config shared-mime-info))
     (inputs (list kconfig
-- 
2.41.0

[bug#64798] [PATCH 2/2] gnu: plasma-workspace: Fix path to kf5.

[Sughosha via Guix-patches via]

* gnu/packages/kde-plasma.scm (plasma-workspace)[patch-workspace-bins]: Fix path
to kf5.
---
 gnu/packages/kde-plasma.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index e699111429..11586a6ce2 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -2500,7 +2500,7 @@ (define-public plasma-workspace
                      (substitute* "startkde/plasma-session/startup.cpp"
                        (("CMAKE_INSTALL_FULL_LIBEXECDIR_KF5..")
                         (string-append "\"" kinit
-                                       "/lib/libexec/kf5")))
+                                       "/libexec/kf5")))
                      (substitute* (list
                                    "startkde/startplasma-wayland.cpp"
                                    "startkde/startplasma-x11.cpp")
-- 
2.41.0

bug#65199: Request for merging "kde-updates" branch

[宋文武 via Guix-patches via]

宋文武 <iyzsong@envs.net> writes:

>> Hello, I think the "kde-updates" branch is ready to be merged.
>
> I merge master into "kde-updates" now (due to ibus gtk changes on
> master), when the build is done, it should be ready!

Branch merged, closing!

[bug#64798] [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Sughosha <sughosha@disroot.org> writes:

> These patches fix libexec path in the KDE packages  according to the commit
> 731413a680a33ed1ad909e41e5b388561a63f365.
>
> Sughosha (2):
>   gnu: kde-cli-tools: Fix path to kdesu.
>   gnu: plasma-workspace: Fix path to kf5.
>
>  gnu/packages/kde-plasma.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
>
> base-commit: 9b283090e93f8db7bce4ce210d805959c5c318c0

Hello, I pushed the same fixes with slightly different commit messages,
thank you!

bug#64798: [PATCH 000/209] update kde package and add plasme desktop

[宋文武 via Guix-patches via]

Merged, closing now, thanks!