[bug#70395] [PATCH kde-team 00/63] some kde patch.

[bug#70395] [PATCH kde-team 00/63] some kde patch.

[Zheng Junjie]

Hello! This is the first part of the kde update.

Zheng Junjie (63):
  gnu: extra-cmake-modules: Update to 6.1.0.
  gnu: Add kquickcharts-6.
  gnu: Add attica-6.
  gnu: Add kcodecs-6.
  gnu: Add kcoreaddons-6.
  gnu: Add kdbusaddons-6.
  gnu: Add kdnssd-6.
  gnu: Add kholidays-6.
  gnu: Add ki18n-6.
  gnu: Add kidletime-6.
  gnu: Add kitemviews-6.
  gnu: Add kguiaddons-6.
  gnu: Add kplotting-6.
  gnu: Add kwidgetsaddons-6.
  gnu: Add kconfig-6.
  gnu: Add kitemmodels-6.
  gnu: Add ksyntaxhighlighting-6.
  gnu: Add karchive-6.
  gnu: Add kcalendarcore-6.
  gnu: Add kcompletion-6.
  gnu: Add kpty-6.
  gnu: Add kwindowsystem-6.
  gnu: Add networkmanager-qt-6.
  gnu: Add oxygen-icons-6.
  gnu: Add prison-6.
  gnu: Add solid-6.
  gnu: Add sonnet-6.
  gnu: Add threadweaver-6.
  gnu: Add kcolorscheme.
  gnu: Add kdoctools-6.
  gnu: Add kcontacts-6.
  gnu: Add kcrash-6.
  gnu: Add knotifications-6.
  gnu: Add kpackage-6.
  gnu: Add kunitconversion-6.
  gnu: Add syndication-6.
  gnu: polkit-qt: Update to 0.200.0.
  gnu: Add polkit-qt6.
  gnu: Add kauth-6.
  gnu: Add kjobwidgets-6.
  gnu: qca: Update to 2.3.8.
  gnu: Add qca-qt6.
  gnu: pulseaudio-qt: Built with qt6.
  gnu: Add kglobalaccel-6.
  gnu: Add kconfigwidgets-6.
  gnu: Add kiconthemes-6.
  gnu: Add kservice-6.
  gnu: phonon: Remove unneed phase.
  gnu: phonon: Enable qt6.
  gnu: Add kwallet-6.
  gnu: Add ktextwidgets-6.
  gnu: Add kxmlgui-6.
  gnu: qtbase: propagate libxkbcommon.
  gnu: Add kirigami-6.
  gnu: Add qqc2-desktop-style-6.
  gnu: Add modemmanager-qt-6.
  gnu: libavif: Update to 1.0.4.
  gnu: libraw: Update to 0.21.2.
  gnu: Add kimageformats-6.
  gnu: Add ksvg.
  gnu: Add kbookmarks-6.
  gnu: Add kdesu-6.
  gnu: Add kded-6.

 gnu/packages/image.scm          |    6 +-
 gnu/packages/kde-frameworks.scm | 2215 +++++++++++++++++++++++++------
 gnu/packages/kde.scm            |   12 +-
 gnu/packages/photo.scm          |    5 +-
 gnu/packages/polkit.scm         |   40 +-
 gnu/packages/qt.scm             |    7 +-
 6 files changed, 1834 insertions(+), 451 deletions(-)


base-commit: cd557e2d1c83839dd587016279900d31f053efc8
-- 
2.41.0

[bug#70395] [PATCH kde-team 01/63] gnu: extra-cmake-modules: Update to 6.1.0.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 6.1.0.
[arguments]<#:phases>: Adjust fix-test phase.

Change-Id: I5d712887197d089377492ccd1a45bedaac64e151
---
 gnu/packages/kde-frameworks.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 95c0f95e8c..7be9f160a2 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -103,7 +103,7 @@ (define-module (gnu packages kde-frameworks)
 (define-public extra-cmake-modules
   (package
     (name "extra-cmake-modules")
-    (version "6.0.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -112,7 +112,7 @@ (define-public extra-cmake-modules
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "030dyw4krnq8hcp0dsqb15zxb7x7r8c33lbdgmmia5xpkpqjp693"))))
+                "1gc8cgc9fzxz6bszwxnr913fjgxwnjam2pz39a6wzrh713qfvjbn"))))
     (build-system cmake-build-system)
     (native-inputs
      ;; Add test dependency, except on armhf where building it is too
@@ -160,12 +160,12 @@ (define-public extra-cmake-modules
                  "set(ECM_MKSPECS_INSTALL_DIR lib/qt${QT_MAJOR_VERSION}/mkspecs/modules"))))
           ;; Work around for the failed test KDEFetchTranslations.
           ;; It complains that the cmake project name is not
-          ;; "frameworks/extra-cmake-modules".
+          ;; ".*/extra-cmake-modules".
           ;; TODO: Fix it upstream.
           (add-after 'unpack 'fix-test
             (lambda _
               (substitute* "tests/KDEFetchTranslations/CMakeLists.txt"
-                (("frameworks/extra-cmake-modules") "extra-cmake-modules"))))
+                (("\\.\\*/extra-cmake-modules") "extra-cmake-modules"))))
           ;; install and check phase are swapped to prevent install from failing
           ;; after testsuire has run
           (add-after 'install 'check-post-install
-- 
2.41.0

[bug#70395] [PATCH kde-team 02/63] gnu: Add kquickcharts-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kquickcharts-6): New variable.
(kquickcharts): Inherit above.
Change-Id: Ic75e26b296930b95dde243df1383311e9276b180

Change-Id: I383890f11771ce39dfea22ed0a7bb2fead0aec38
---
 gnu/packages/kde-frameworks.scm | 34 ++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 7be9f160a2..e015466b2e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -186,8 +186,32 @@ (define-public extra-cmake-modules
 common build settings used in software produced by the KDE community.")
     (license license:bsd-3)))
 
+(define-public kquickcharts-6
+  (package
+    (name "kquickcharts")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/frameworks/"
+                                  (version-major+minor version)
+                                  "/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1ix4wc37mql6cdkh2i5ddwdr0p72i0l7whphd3zb26qszww5f6vn"))))
+    (build-system qt-build-system)
+    (native-inputs (list extra-cmake-modules glslang pkg-config))
+    (inputs (list qtbase qtdeclarative qtshadertools))
+    (home-page "https://api.kde.org/frameworks/kquickcharts/html/index.html")
+    (synopsis "QtQuick plugin providing high-performance charts")
+    (description
+     "The Quick Charts module provides a set of charts that can be
+used from QtQuick applications for both simple display of data as well as
+continuous display of high-volume data.")
+    (license (list license:lgpl2.1 license:lgpl3))))
+
 (define-public kquickcharts
   (package
+    (inherit kquickcharts-6)
     (name "kquickcharts")
     (version "5.114.0")
     (source (origin
@@ -209,15 +233,7 @@ (define-public kquickcharts
                               (setenv "QT_QPA_PLATFORM" "offscreen")
                               (invoke "ctest")))))))
     (inputs (list qtbase-5 qtdeclarative-5 qtquickcontrols2-5
-                  xorg-server-for-tests))
-    (native-inputs (list extra-cmake-modules glslang pkg-config))
-    (home-page "https://api.kde.org/frameworks/kquickcharts/html/index.html")
-    (synopsis "QtQuick plugin providing high-performance charts")
-    (description
-     "The Quick Charts module provides a set of charts that can be
-used from QtQuick applications for both simple display of data as well as
-continuous display of high-volume data.")
-    (license (list license:lgpl2.1 license:lgpl3))))
+                  xorg-server-for-tests))))
 
 (define-public phonon
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 03/63] gnu: Add attica-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (attica-6): New variable.
(attica): Inherit above.
Change-Id: I9e7fc3dc96b1534c5ec61b0fc483df6918d91d3e

Change-Id: Ie46de95fc47fec4d845f91912daacc5a11c9d7cd
---
 gnu/packages/kde-frameworks.scm | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index e015466b2e..235c07e5f7 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -310,10 +310,10 @@ (define-public phonon-backend-gstreamer
 ;; Tier 1 frameworks depend only on Qt (and possibly a small number of other
 ;; third-party libraries), so can easily be used by an Qt-based project.
 
-(define-public attica
+(define-public attica-6
   (package
     (name "attica")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -322,8 +322,11 @@ (define-public attica
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0gkdsm1vyyyxxyl4rni9s2bdz5w6zphzjl58fddjl899da06hqfq"))))
+                "185mgnnq8lqr3k59b3j73i9kzvcx6q7w70h7g07rsfkmlv4wlgcb"))))
     (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs (list qtbase))
     (arguments
      (list
       #:phases
@@ -333,10 +336,6 @@ (define-public attica
               ;; These tests require network access.
               (substitute* "autotests/CMakeLists.txt"
                 ((".*providertest.cpp") "")))))))
-    (native-inputs
-     (list extra-cmake-modules))
-    (inputs
-     (list qtbase-5))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Open Collaboration Service client library")
     (description "Attica is a Qt library that implements the Open
@@ -351,6 +350,22 @@ (define-public attica
 http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
     (license (list license:lgpl2.1+ license:lgpl3+))))
 
+(define-public attica
+  (package
+    (inherit attica-6)
+    (name "attica")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0gkdsm1vyyyxxyl4rni9s2bdz5w6zphzjl58fddjl899da06hqfq"))))
+    (inputs (list qtbase-5))))
+
 (define-public bluez-qt
   (package
     (name "bluez-qt")
-- 
2.41.0

[bug#70395] [PATCH kde-team 04/63] gnu: Add kcodecs-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kcodecs-6): New variable.
(kcodecs): Inherit above.

Change-Id: I2a3dc714ba3a0756808152318639ad20512a7bc1
---
 gnu/packages/kde-frameworks.scm | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 235c07e5f7..3338924775 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -565,10 +565,10 @@ (define-public kcalendarcore
 and the older vCalendar.")
     (license (list license:lgpl3+ license:bsd-2))))
 
-(define-public kcodecs
+(define-public kcodecs-6
   (package
     (name "kcodecs")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -577,10 +577,10 @@ (define-public kcodecs
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w"))))
+                "05iqhjyrrbjk0qiwpwpkkyhf1yd19s29jyazbhxn3pdjamchgw7i"))))
     (build-system cmake-build-system)
-    (native-inputs (list extra-cmake-modules gperf qttools-5))
-    (inputs (list qtbase-5))
+    (native-inputs (list extra-cmake-modules gperf qttools))
+    (inputs (list qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "String encoding and manipulating library")
     (description "KCodecs provide a collection of methods to manipulate
@@ -597,6 +597,23 @@ (define-public kcodecs
                    license:lgpl2.1 license:lgpl2.1+ license:expat
                    license:lgpl3+ license:mpl1.1))))
 
+(define-public kcodecs
+  (package
+    (inherit kcodecs-6)
+    (name "kcodecs")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w"))))
+    (native-inputs (list extra-cmake-modules gperf qttools-5))
+    (inputs (list qtbase-5))))
+
 (define-public kcolorpicker
   (package
     (name "kcolorpicker")
-- 
2.41.0

[bug#70395] [PATCH kde-team 05/63] gnu: Add kcoreaddons-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kcoreaddons-6): New variable.
(kcoreaddons): Inherit above.

Change-Id: I8544f882c5bf72d963ddc8b2ee53170899891c55
---
 gnu/packages/kde-frameworks.scm | 36 ++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3338924775..24a3b6dc7b 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -700,10 +700,10 @@ (define-public kconfig
                    license:lgpl3+ license:gpl1 ; licende:mit-olif
                    license:bsd-2 license:bsd-3))))
 
-(define-public kcoreaddons
+(define-public kcoreaddons-6
   (package
     (name "kcoreaddons")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -712,13 +712,10 @@ (define-public kcoreaddons
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1wv3s3xsiii96k17nzs2fb0ih2lyg52krf58v44nlk9wfi4wmnqx"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     (list extra-cmake-modules qttools-5 shared-mime-info))
-    ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
-    (inputs
-     (list qtbase-5))
+                "0hrkxa0gq3pp08d7kgfz3z7mhg6v9h2j8c1az0x8mcl34jdfy23n"))))
+    (build-system qt-build-system)
+    (native-inputs (list extra-cmake-modules qttools shared-mime-info))
+    (inputs (list qtbase qtdeclarative))
     (arguments
      (list
       #:phases
@@ -746,6 +743,27 @@ (define-public kcoreaddons
 many more.")
     (license (list license:lgpl2.0+ license:lgpl2.1+))))
 
+(define-public kcoreaddons
+  (package
+    (inherit kcoreaddons-6)
+    (name "kcoreaddons")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1wv3s3xsiii96k17nzs2fb0ih2lyg52krf58v44nlk9wfi4wmnqx"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules qttools-5 shared-mime-info))
+    ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
+    (inputs
+     (list qtbase-5))))
+
 (define-public kdbusaddons
   (package
     (name "kdbusaddons")
-- 
2.41.0

[bug#70395] [PATCH kde-team 06/63] gnu: Add kdbusaddons-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kdbusaddons-6): New variable.
(kdbusaddons): Inherit above.

Change-Id: I4e1a0f5870436f5f08738f77dad7aa5fcd1ad2e9
---
 gnu/packages/kde-frameworks.scm | 43 +++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 24a3b6dc7b..6c12faac80 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -764,8 +764,42 @@ (define-public kcoreaddons
     (inputs
      (list qtbase-5))))
 
+(define-public kdbusaddons-6
+  (package
+    (name "kdbusaddons")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0h9m8s07zilg7gbjb4gf44nn8b6wynxfz1j38nwp7ffa3z5a88xl"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules dbus qttools))
+    (inputs (list libxkbcommon))
+    (arguments
+     (list #:qtbase qtbase
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "dbus-launch" "ctest")))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Convenience classes for DBus")
+    (description "KDBusAddons provides convenience classes on top of QtDBus,
+as well as an API to create KDED modules.")
+    ;; Some source files mention lgpl2.0+, but the included license is
+    ;; the lgpl2.1. Some source files are under non-copyleft licenses.
+    (license license:lgpl2.1+)))
+
 (define-public kdbusaddons
   (package
+    (inherit kdbusaddons-6)
     (name "kdbusaddons")
     (version "5.114.0")
     (source (origin
@@ -800,14 +834,7 @@ (define-public kdbusaddons
                  (lambda* (#:key tests? #:allow-other-keys)
                    (when tests?
                      (setenv "DBUS_FATAL_WARNINGS" "0")
-                     (invoke "dbus-launch" "ctest")))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Convenience classes for DBus")
-    (description "KDBusAddons provides convenience classes on top of QtDBus,
-as well as an API to create KDED modules.")
-    ;; Some source files mention lgpl2.0+, but the included license is
-    ;; the lgpl2.1. Some source files are under non-copyleft licenses.
-    (license license:lgpl2.1+)))
+                     (invoke "dbus-launch" "ctest")))))))))
 
 (define-public kdnssd
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 07/63] gnu: Add kdnssd-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kdnssd-6): New variable.
(kdnssd): Inherit above.

Change-Id: I29e1255a49079167f7edeb46908d62cb5fe5a722
---
 gnu/packages/kde-frameworks.scm | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6c12faac80..42045389e7 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -836,10 +836,10 @@ (define-public kdbusaddons
                      (setenv "DBUS_FATAL_WARNINGS" "0")
                      (invoke "dbus-launch" "ctest")))))))))
 
-(define-public kdnssd
+(define-public kdnssd-6
   (package
     (name "kdnssd")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -848,13 +848,12 @@ (define-public kdnssd
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1zw5rkprr54j05ic8zljk57zahp2v6333slr253r3n1679zqlv64"))))
+                "04mpcwxkncvydhkjrxinv7qvs6yk6106vxa62crysrgjd5x1z61v"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list extra-cmake-modules qttools-5))
-    (inputs
-     (list avahi ; alternativly dnssd could be used
-           qtbase-5))
+     (list extra-cmake-modules qttools))
+    (inputs (list avahi ; alternativly dnssd could be used
+                  qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Network service discovery using Zeroconf")
     (description "KDNSSD is a library for handling the DNS-based Service
@@ -863,6 +862,25 @@ (define-public kdnssd
 infrastructure.")
     (license license:lgpl2.1+)))
 
+(define-public kdnssd
+  (package
+    (inherit kdnssd-6)
+    (name "kdnssd")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1zw5rkprr54j05ic8zljk57zahp2v6333slr253r3n1679zqlv64"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5))
+    (inputs
+     (list avahi qtbase-5))))
+
 (define-public kgraphviewer
   (package
     (name "kgraphviewer")
-- 
2.41.0

[bug#70395] [PATCH kde-team 08/63] gnu: Add kholidays-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kholidays-6): New variable.
(kholidays): Inherit above.

Change-Id: Ic96df5ae5b04e6fdb47c9df127e2a3a1cf428d05
---
 gnu/packages/kde-frameworks.scm | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 42045389e7..be84a1c7df 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -937,29 +937,45 @@ (define-public kguiaddons
 interfaces in the areas of colors, fonts, text, images, keyboard input.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
-(define-public kholidays
+(define-public kholidays-6
   (package
     (name "kholidays")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "mirror://kde/stable/frameworks/"
                     (version-major+minor version) "/"
                     name "-" version ".tar.xz"))
-       (sha256
-        (base32 "19r8dxglz5ll6iyvigsccil3ikvcsnyy5nwcpjvjr1c0brigcjmy"))))
+              (sha256
+               (base32 "02kkp6j7s9qppks9g7akbd1j468pwldvivh235bcsw2pmdciarl3"))))
     (build-system cmake-build-system)
-    (native-inputs
-     (list extra-cmake-modules qttools-5))
-    (inputs
-     (list qtbase-5 qtdeclarative-5))
+    (native-inputs (list extra-cmake-modules qttools))
+    (inputs (list qtbase qtdeclarative))
     (home-page "https://invent.kde.org/frameworks/kholidays")
     (synopsis "Library for regional holiday information")
     (description "This library provides a C++ API that determines holiday and
 other special events for a geographical region.")
     (license license:lgpl2.0+)))
 
+(define-public kholidays
+  (package
+    (inherit kholidays-6)
+    (name "kholidays")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32 "19r8dxglz5ll6iyvigsccil3ikvcsnyy5nwcpjvjr1c0brigcjmy"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5))
+    (inputs
+     (list qtbase-5 qtdeclarative-5))))
+
 (define-public ki18n
   (package
     (name "ki18n")
-- 
2.41.0

[bug#70395] [PATCH kde-team 09/63] gnu: Add ki18n-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (ki18n-6): New variable.
(ki18n): Inherit above.

Change-Id: I6732e56bd4b498b7e10eec55423ceb8cec8daf65
---
 gnu/packages/kde-frameworks.scm | 51 ++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index be84a1c7df..fc0c8983a5 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -976,10 +976,10 @@ (define-public kholidays
     (inputs
      (list qtbase-5 qtdeclarative-5))))
 
-(define-public ki18n
+(define-public ki18n-6
   (package
     (name "ki18n")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -988,23 +988,25 @@ (define-public ki18n
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1yg03awcx5ay6lgbgwv91i0ankrm94z9m0wky4v03gnwnvw8pa0v"))))
+                "0j3na5422k387rizb7139n4f3fd8506lmp3dxamagpn9npqijchn"))))
     (build-system cmake-build-system)
     (propagated-inputs
-     (list gettext-minimal python))
+     (list gettext-minimal))
     (native-inputs
-     (list extra-cmake-modules))
+     (list extra-cmake-modules python-minimal tzdata-for-tests))
     (inputs
-     (list qtbase-5 qtdeclarative-5 qtscript iso-codes))
+     (list qtbase qtdeclarative iso-codes))
     (arguments
-     (list #:phases #~(modify-phases %standard-phases
-                        (replace 'check
-                          (lambda* (#:key tests? #:allow-other-keys)
-                            (when tests?
-                              (setenv "HOME"
-                                      (getcwd))
-                              (invoke "ctest" "-E"
-                               "(kcountrytest|kcountrysubdivisiontest)")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "HOME"
+                        (getcwd))
+                (invoke "ctest" "-E"
+                        "(kcountrytest|kcountrysubdivisiontest)")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Gettext-based UI text internationalization")
     (description "KI18n provides functionality for internationalizing user
@@ -1018,6 +1020,27 @@ (define-public ki18n
 translation scripting.")
     (license license:lgpl2.1+)))
 
+(define-public ki18n
+  (package
+    (inherit ki18n-6)
+    (name "ki18n")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1yg03awcx5ay6lgbgwv91i0ankrm94z9m0wky4v03gnwnvw8pa0v"))))
+    (propagated-inputs
+     (list gettext-minimal python))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list qtbase-5 qtdeclarative-5 qtscript iso-codes))))
+
 (define-public kidletime
   (package
     (name "kidletime")
-- 
2.41.0

[bug#70395] [PATCH kde-team 10/63] gnu: Add kidletime-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kidletime-6): New variable.
(kidletime): Inherit above.

Change-Id: I904d5519d3e72852f4e0a5071afddfd6e343b273
---
 gnu/packages/kde-frameworks.scm | 43 ++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index fc0c8983a5..170a4c4e44 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1041,8 +1041,41 @@ (define-public ki18n
     (inputs
      (list qtbase-5 qtdeclarative-5 qtscript iso-codes))))
 
+(define-public kidletime-6
+  (package
+    (name "kidletime")
+    (version "6.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/frameworks/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0fmgbx3n7fjcnbym82h6jbq2rsml9426ga9sxh5m5sfjkw95rn68"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules pkg-config
+           ;; for wayland-scanner
+           wayland))
+    (inputs
+     (list qtbase
+           qtwayland
+           wayland
+           plasma-wayland-protocols
+           wayland-protocols
+           libxkbcommon))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Reporting of idle time of user and system")
+    (description "KIdleTime is a singleton reporting information on idle time.
+It is useful not only for finding out about the current idle time of the PC,
+but also for getting notified upon idle time events, such as custom timeouts,
+or user activity.")
+    (license (list license:gpl2+ license:lgpl2.1+))))
+
 (define-public kidletime
   (package
+    (inherit kidletime-6)
     (name "kidletime")
     (version "5.114.0")
     (source (origin
@@ -1054,19 +1087,11 @@ (define-public kidletime
               (sha256
                (base32
                 "06sc9w54g4n7s5gjkqz08rgcz6v3pr0bdgx3gbjgzass6l4m8w7p"))))
-    (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
      (list libxscrnsaver ; X-Screensaver based poller, fallback mode
-           qtbase-5 qtx11extras))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Reporting of idle time of user and system")
-    (description "KIdleTime is a singleton reporting information on idle time.
-It is useful not only for finding out about the current idle time of the PC,
-but also for getting notified upon idle time events, such as custom timeouts,
-or user activity.")
-    (license (list license:gpl2+ license:lgpl2.1+))))
+           qtbase-5 qtx11extras))))
 
 (define-public kirigami
   ;; Kirigami is listed as tier 1 framework, but optionally includes
-- 
2.41.0

[bug#70395] [PATCH kde-team 11/63] gnu: Add kitemviews-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kitemviews-6): New variable.
(kitemviews): Inherit above.

Change-Id: Ifd038ed9ce377f28f3411da99d30bf428ac9cb12
---
 gnu/packages/kde-frameworks.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 170a4c4e44..374519b979 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1180,10 +1180,10 @@ (define-public kitemmodels
 @end enumerate")
     (license license:lgpl2.1+)))
 
-(define-public kitemviews
+(define-public kitemviews-6
   (package
     (name "kitemviews")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1192,12 +1192,11 @@ (define-public kitemviews
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg"))))
+                "0k8ana91df4gi4ghk5p8kcz7y1f2qvhlz05ib64w6y4jlhm6rs79"))))
     (build-system qt-build-system)
     (native-inputs
-     (list extra-cmake-modules qttools-5))
-    (inputs
-     (list qtbase-5))
+     (list extra-cmake-modules qttools))
+    (arguments (list #:qtbase qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Set of item views extending the Qt model-view framework")
     (description "KItemViews includes a set of views, which can be used with
@@ -1205,6 +1204,24 @@ (define-public kitemviews
 to flat and hierarchical lists.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public kitemviews
+  (package
+    (inherit kitemviews-6)
+    (name "kitemviews")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5))
+    (arguments '())))
+
 (define-public kplotting
   (package
     (name "kplotting")
-- 
2.41.0

[bug#70395] [PATCH kde-team 12/63] gnu: Add kguiaddons-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kguiaddons-6): New variable.
(kguiaddons): Inherit above.

Change-Id: If4f7ab2c09034843dac5f82da3063211c74201bb
---
 gnu/packages/kde-frameworks.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 374519b979..e10427c23c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -909,10 +909,10 @@ (define-public kgraphviewer
 replace the other outdated Graphviz tools.")
     (license license:gpl2+)))
 
-(define-public kguiaddons
+(define-public kguiaddons-6
   (package
     (name "kguiaddons")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -921,22 +921,39 @@ (define-public kguiaddons
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0riya9plcz9c1ndhdbsradssndshbm12705swn7vf7am17n7f947"))))
+                "0lxcwn7g5gkdfa4asfxxh9cxr70j2jsdk68li5rw1kabmr989n08"))))
     (build-system qt-build-system)
     ;; TODO: Build packages for the Python bindings.  Ideally this will be
     ;; done for all versions of python guix supports.  Requires python,
     ;; python-sip, clang-python, libclang.  Requires python-2 in all cases for
     ;; clang-python.
-    (native-inputs
-     (list extra-cmake-modules pkg-config))
+    (native-inputs (list extra-cmake-modules pkg-config))
     (inputs
-     (list qtbase-5 qtwayland-5 qtx11extras plasma-wayland-protocols wayland))
+     (list libxkbcommon qtbase qtwayland plasma-wayland-protocols wayland))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Utilities for graphical user interfaces")
     (description "The KDE GUI addons provide utilities for graphical user
 interfaces in the areas of colors, fonts, text, images, keyboard input.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public kguiaddons
+  (package
+    (inherit kguiaddons-6)
+    (name "kguiaddons")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0riya9plcz9c1ndhdbsradssndshbm12705swn7vf7am17n7f947"))))
+    (native-inputs (list extra-cmake-modules pkg-config))
+    (inputs
+     (list qtbase-5 qtwayland-5 qtx11extras plasma-wayland-protocols wayland))))
+
 (define-public kholidays-6
   (package
     (name "kholidays")
-- 
2.41.0

[bug#70395] [PATCH kde-team 13/63] gnu: Add kplotting-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kplotting-6): New variable.
(kplotting): Inherit above.

Change-Id: I07929866d016d160a8cbe2b9ee21e244ca60edba
---
 gnu/packages/kde-frameworks.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index e10427c23c..fb19220480 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1239,10 +1239,10 @@ (define-public kitemviews
      (list extra-cmake-modules qttools-5))
     (arguments '())))
 
-(define-public kplotting
+(define-public kplotting-6
   (package
     (name "kplotting")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1251,12 +1251,11 @@ (define-public kplotting
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "17x58pplln0plqiyhjpzdiqxngylxq5gkc5gk7b91xzm783x2k0n"))))
+                "1ymifg5yjjag65pqpwhcr3k5isx5fq6dgqlv9aj840xj4nbk28dv"))))
     (build-system qt-build-system)
     (native-inputs
-     (list extra-cmake-modules qttools-5))
-    (inputs
-     (list qtbase-5))
+     (list extra-cmake-modules qttools))
+    (arguments (list #:qtbase qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Data plotting library")
     (description "KPlotWidget is a QWidget-derived class that provides a virtual
@@ -1266,6 +1265,24 @@ (define-public kplotting
 pixel units.")
     (license license:lgpl2.1+)))
 
+(define-public kplotting
+  (package
+    (inherit kplotting-6)
+    (name "kplotting")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "17x58pplln0plqiyhjpzdiqxngylxq5gkc5gk7b91xzm783x2k0n"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5))
+    (arguments '())))
+
 (define-public ksyntaxhighlighting
   (package
     (name "ksyntaxhighlighting")
-- 
2.41.0

[bug#70395] [PATCH kde-team 14/63] gnu: Add kwidgetsaddons-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kwidgetsaddons-6): New variable.
(kwidgetsaddons): Inherit above.

Change-Id: Ic038d61fef6ca173c7cca2ce45dab38702512a95
---
 gnu/packages/kde-frameworks.scm | 50 ++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index fb19220480..f5448b91e8 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1407,10 +1407,10 @@ (define-public kwayland
 represented by a QPoint or a QSize.")
     (license license:lgpl2.1+)))
 
-(define-public kwidgetsaddons
+(define-public kwidgetsaddons-6
   (package
     (name "kwidgetsaddons")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1419,23 +1419,25 @@ (define-public kwidgetsaddons
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n"))))
+                "1kp48sh3lhp5n87avnm2fwzrqqzbinbl3zjmxn6p7snnq9z5s8l1"))))
     (build-system qt-build-system)
     (native-inputs
-     (list extra-cmake-modules qttools-5 xorg-server-for-tests))
-    (inputs
-     (list qtbase-5))
+     (list extra-cmake-modules qttools))
     (arguments
      (list
+      #:qtbase qtbase
       #:phases
       #~(modify-phases %standard-phases
           (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
+            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
               (when tests?
-                (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+                ;; hideLaterShouldHideAfterDelay function time: 300000ms, total time: 300009ms
                 (invoke "ctest" "-E"
-                        "(ksqueezedtextlabelautotest|\
-kwidgetsaddons-kcolumnresizertest)")))))))
+                        "(ktooltipwidgettest)"
+                        "-j"
+                        (if parallel-tests?
+                            (number->string (parallel-job-count))
+                            "1"))))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Large set of desktop widgets")
     (description "Provided are action classes that can be added to toolbars or
@@ -1444,6 +1446,34 @@ (define-public kwidgetsaddons
 configuration pages, message boxes, and password requests.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public kwidgetsaddons
+  (package
+    (inherit kwidgetsaddons-6)
+    (name "kwidgetsaddons")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5 xorg-server-for-tests))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+                (invoke "ctest" "-E"
+                        "(ksqueezedtextlabelautotest|\
+kwidgetsaddons-kcolumnresizertest)")))))))))
+
 (define-public kwindowsystem
   (package
     (name "kwindowsystem")
-- 
2.41.0

[bug#70395] [PATCH kde-team 15/63] gnu: Add kconfig-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kconfig-6): New variable.
(kconfig): Inherit above.

Change-Id: Ib806189b63ce5f9c47cdf44a5fec810f9e99f347
---
 gnu/packages/kde-frameworks.scm | 74 +++++++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index f5448b91e8..768c6b8f00 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -640,10 +640,10 @@ (define-public kcolorpicker
 which can be used to add custom colors to the popup menu.")
     (license license:lgpl3+)))
 
-(define-public kconfig
+(define-public kconfig-6
   (package
     (name "kconfig")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -652,23 +652,31 @@ (define-public kconfig
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2"))))
-    (build-system cmake-build-system)
+                "1xyadln77aa4xn9qh85f5hsvyaf2nm292qiz1ykn0lmcpqjmznig"))))
+    (build-system qt-build-system)
     (native-inputs
-     (list dbus extra-cmake-modules inetutils qttools-5
-           xorg-server-for-tests))
-    (inputs
-     (list qtbase-5 qtdeclarative-5))
+     (list dbus extra-cmake-modules inetutils qttools))
+    (propagated-inputs (list qtdeclarative))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests? ;; kconfigcore-kconfigtest fails inconsistently!!
-               (setenv "HOME" (getcwd))
-               (setenv "QT_QPA_PLATFORM" "offscreen")
-               (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\
-kconfiggui-kstandardshortcutwatchertest)")))))))
+     (list
+      #:qtbase qtbase
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (with-output-to-file "autotests/BLACKLIST"
+                  (lambda _
+                    (for-each
+                     (lambda (name)
+                       (display (string-append "[" name "]\n*\n")))
+                     (list "testNotifyIllegalObjectPath"
+                           "testLocalDeletion"
+                           "testNotify"
+                           "testSignal"
+                           "testDataUpdated"))))
+                (setenv "HOME" (getcwd))
+                (setenv "QT_QPA_PLATFORM" "offscreen")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Kconfiguration settings framework for Qt")
     (description "KConfig provides an advanced configuration system.
@@ -700,6 +708,38 @@ (define-public kconfig
                    license:lgpl3+ license:gpl1 ; licende:mit-olif
                    license:bsd-2 license:bsd-3))))
 
+(define-public kconfig
+  (package
+    (inherit kconfig-6)
+    (name "kconfig")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list dbus extra-cmake-modules inetutils qttools-5
+           xorg-server-for-tests))
+    (inputs
+     (list qtbase-5 qtdeclarative-5))
+    (propagated-inputs '())
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests? ;; kconfigcore-kconfigtest fails inconsistently!!
+                     (setenv "HOME" (getcwd))
+                     (setenv "QT_QPA_PLATFORM" "offscreen")
+                     (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\
+kconfiggui-kstandardshortcutwatchertest)")))))))))
+
 (define-public kcoreaddons-6
   (package
     (name "kcoreaddons")
-- 
2.41.0

[bug#70395] [PATCH kde-team 16/63] gnu: Add kitemmodels-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kitemmodels-6): New variable.
(kitemmodels): Inherit above.

Change-Id: I6532819fe24ef6bf67fb72af4c0ae2e83908ab7f
---
 gnu/packages/kde-frameworks.scm | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 768c6b8f00..4ac8ffa1c6 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1187,10 +1187,10 @@ (define-public kirigami
 of applications that follow the Kirigami Human Interface Guidelines.")
     (license license:lgpl2.1+)))
 
-(define-public kitemmodels
+(define-public kitemmodels-6
   (package
     (name "kitemmodels")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1199,12 +1199,12 @@ (define-public kitemmodels
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1bfmcrbcbrvp2rcaf32vzvarqwp41gn6s4xpf56hnxbwf9kgk1fl"))))
+                "00p3wcsr57mlxx4fka9lvmpf3zsbsl9rbj1ijmn0zw4vyqmd6rsi"))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules))
-    (inputs
-     (list qtbase-5 qtdeclarative-5))
+    (inputs (list qtdeclarative))
+    (arguments (list #:qtbase qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Set of item models extending the Qt model-view framework")
     (description "KItemModels provides the following models:
@@ -1237,6 +1237,26 @@ (define-public kitemmodels
 @end enumerate")
     (license license:lgpl2.1+)))
 
+(define-public kitemmodels
+  (package
+    (inherit kitemmodels-6)
+    (name "kitemmodels")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1bfmcrbcbrvp2rcaf32vzvarqwp41gn6s4xpf56hnxbwf9kgk1fl"))))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list qtdeclarative-5))
+    (arguments '())))
+
 (define-public kitemviews-6
   (package
     (name "kitemviews")
-- 
2.41.0

[bug#70395] [PATCH kde-team 17/63] gnu: Add ksyntaxhighlighting-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (ksyntaxhighlighting-6): New variable.
(ksyntaxhighlighting): Inherit above.

Change-Id: I7c6cfa1f98137a7ee61ea4d7081c9af5da68cbea
---
 gnu/packages/kde-frameworks.scm | 57 ++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 4ac8ffa1c6..bb38fd33ce 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1343,10 +1343,10 @@ (define-public kplotting
      (list extra-cmake-modules qttools-5))
     (arguments '())))
 
-(define-public ksyntaxhighlighting
+(define-public ksyntaxhighlighting-6
   (package
     (name "ksyntaxhighlighting")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1355,27 +1355,25 @@ (define-public ksyntaxhighlighting
                     "syntax-highlighting-" version ".tar.xz"))
               (sha256
                (base32
-                "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63"))))
+                "1dnacxfrr0llsv2zkn55iywrp3lm8xb7w5fn2pb9fghf5c2ljx0y"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list extra-cmake-modules perl qttools-5
-           ;; Optional, for compile-time validation of syntax definition files:
-           qtxmlpatterns))
+     (list extra-cmake-modules perl qttools))
     (inputs
-     (list qtbase-5))
+     (list qtbase qtdeclarative))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'patch-source-shebangs 'unpatch-source-shebang
-           (lambda _
-             ;; revert the patch-shebang phase on scripts which are
-             ;; in fact test data
-             (substitute* '("autotests/input/highlight.sh"
-                            "autotests/folding/highlight.sh.fold")
-               (((which "sh")) " /bin/sh")) ;; space in front!
-             (substitute* '("autotests/input/highlight.pl"
-                            "autotests/folding/highlight.pl.fold")
-               (((which "perl")) "/usr/bin/perl")))))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'patch-source-shebangs 'unpatch-source-shebang
+                 (lambda _
+                   ;; revert the patch-shebang phase on scripts which are
+                   ;; in fact test data
+                   (substitute* '("autotests/input/highlight.sh"
+                                  "autotests/folding/highlight.sh.fold")
+                     (((which "sh")) " /bin/sh")) ;; space in front!
+                   (substitute* '("autotests/input/highlight.pl"
+                                  "autotests/folding/highlight.pl.fold")
+                     (((which "perl")) "/usr/bin/perl")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Syntax highlighting engine for Kate syntax definitions")
     (description "This is a stand-alone implementation of the Kate syntax
@@ -1386,6 +1384,27 @@ (define-public ksyntaxhighlighting
     (properties `((upstream-name . "syntax-highlighting")))
     (license license:lgpl2.1+)))
 
+(define-public ksyntaxhighlighting
+  (package
+    (inherit ksyntaxhighlighting-6)
+    (name "ksyntaxhighlighting")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    "syntax-highlighting-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63"))))
+    (native-inputs
+     (list extra-cmake-modules perl qttools-5
+           ;; Optional, for compile-time validation of syntax definition files:
+           qtxmlpatterns))
+    (inputs
+     (list qtbase-5))))
+
 (define-public plasma-wayland-protocols
   (package
     (name "plasma-wayland-protocols")
-- 
2.41.0

[bug#70395] [PATCH kde-team 18/63] gnu: Add karchive-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (karchive-6): New variable.
(karchive): Inherit above.

Change-Id: Ia8603de96bf0b470ec27e7587af88ecb9a564116
---
 gnu/packages/kde-frameworks.scm | 34 +++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index bb38fd33ce..bab4aaa9ca 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -481,10 +481,10 @@ (define-public kapidox
     ;; This list is taken from http://packaging.neon.kde.org/cgit/
     (license (list license:bsd-2 license:expat))))
 
-(define-public karchive
+(define-public karchive-6
   (package
     (name "karchive")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/frameworks/"
@@ -492,7 +492,7 @@ (define-public karchive
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda"))))
+                "0b7q4qcniwiqhmfhshmfl9x25nkbj85h6xvkplqbb55rrwrp2v2p"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -501,23 +501,41 @@ (define-public karchive
                             (when tests?
                               (invoke "ctest" "-E" "karchivetest")))))))
     (native-inputs
-     (list extra-cmake-modules pkg-config qttools-5))
-    (inputs
-     (list bzip2 qtbase-5 xz zlib `(,zstd "lib")))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Qt 5 addon providing access to numerous types of archives")
+     (list extra-cmake-modules pkg-config qttools))
+    (inputs (list bzip2 qtbase xz zlib `(,zstd "lib")))
+    (synopsis "Qt 6 addon providing access to numerous types of archives")
     (description
      "KArchive provides classes for easy reading, creation and
 manipulation of @code{archive} formats like ZIP and TAR.
 
 It also provides transparent compression and decompression of data, like the
 GZip format, via a subclass of QIODevice.")
+    (home-page "https://community.kde.org/Frameworks")
     ;; The included licenses is are gpl2 and lgpl2.1, but the sources are
     ;; under a variety of licenses.
     ;; This list is taken from http://packaging.neon.kde.org/cgit/
     (license (list license:lgpl2.1 license:lgpl2.1+
                    license:lgpl3+ license:bsd-2))))
 
+(define-public karchive
+  (package
+    (inherit karchive-6)
+    (name "karchive")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/frameworks/"
+                                  (version-major+minor version)
+                                  "/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda"))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config qttools-5))
+    (inputs
+     (list bzip2 qtbase-5 xz zlib `(,zstd "lib")))
+    (synopsis "Qt 5 addon providing access to numerous types of archives")))
+
 (define-public kcalendarcore
   (package
     (name "kcalendarcore")
-- 
2.41.0

[bug#70395] [PATCH kde-team 19/63] gnu: Add kcalendarcore-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kcalendarcore-6): New variable.
(kcalendarcore): Inherit above.

Change-Id: I9382d16f516031e83dfa2a5c8e79aad009dcbbab
---
 gnu/packages/kde-frameworks.scm | 66 ++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index bab4aaa9ca..443307ecc1 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -536,10 +536,10 @@ (define-public karchive
      (list bzip2 qtbase-5 xz zlib `(,zstd "lib")))
     (synopsis "Qt 5 addon providing access to numerous types of archives")))
 
-(define-public kcalendarcore
+(define-public kcalendarcore-6
   (package
     (name "kcalendarcore")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -548,29 +548,33 @@ (define-public kcalendarcore
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0aimda01zqw4fz5ldvz4vh767bi10r00kvm62n89nxhsq46wlk7p"))))
+                "16qkl92cqn5q83pj1hgqmvybnv5pzi1j1q85cz17jsq7lhrfzzqw"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules perl tzdata-for-tests))
-    (inputs
-     (list libical qtbase-5))
+    (inputs (list libical qtbase))
     (arguments
      (list
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'disable-failing-test
-            (lambda _
-              ;; Reported as https://bugs.kde.org/show_bug.cgi?id=484306
-              (substitute* "autotests/CMakeLists.txt"
-                (("testdateserialization")
-                 ""))))
           (add-before 'check 'check-setup
-            (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test
+            (lambda* (#:key inputs #:allow-other-keys)
               (setenv "QT_QPA_PLATFORM" "offscreen")
               (setenv "TZ" "Europe/Prague")
               (setenv "TZDIR"
                       (search-input-directory inputs
-                                              "share/zoneinfo")))))))
+                                              "share/zoneinfo"))))
+          (replace 'check
+            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+              (when tests?
+                ;; alse fail in upstream
+                (invoke "ctest" "-E"
+                        "(testicaltimezones|\
+Compat-AppleICal_1.5.ics|Compat-KOrganizer_3.1a.ics|Compat-Mozilla_1.0.ics)"
+                        "-j"
+                        (if parallel-tests?
+                            (number->string (parallel-job-count))
+                            "1"))))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Library for interfacing with calendars")
     (description "This library provides access to and handling of calendar
@@ -583,6 +587,42 @@ (define-public kcalendarcore
 and the older vCalendar.")
     (license (list license:lgpl3+ license:bsd-2))))
 
+(define-public kcalendarcore
+  (package
+    (inherit kcalendarcore-6)
+    (name "kcalendarcore")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0aimda01zqw4fz5ldvz4vh767bi10r00kvm62n89nxhsq46wlk7p"))))
+    (native-inputs
+     (list extra-cmake-modules perl tzdata-for-tests))
+    (inputs
+     (list libical qtbase-5))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-failing-test
+            (lambda _
+              ;; Reported as https://bugs.kde.org/show_bug.cgi?id=484306
+              (substitute* "autotests/CMakeLists.txt"
+                (("testdateserialization")
+                 ""))))
+          (add-before 'check 'check-setup
+            (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test
+              (setenv "QT_QPA_PLATFORM" "offscreen")
+              (setenv "TZ" "Europe/Prague")
+              (setenv "TZDIR"
+                      (search-input-directory inputs
+                                              "share/zoneinfo")))))))))
+
 (define-public kcodecs-6
   (package
     (name "kcodecs")
-- 
2.41.0

[bug#70395] [PATCH kde-team 20/63] gnu: Add kcompletion-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kcompletion-6): New variable.
(kcompletion): Inherit above.

Change-Id: Id1ba6af3cd5929ce40a45c85252e56005370b1cf
---
 gnu/packages/kde-frameworks.scm | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 443307ecc1..d1a57db53d 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2053,10 +2053,10 @@ (define-public kauth
 utilities.")
     (license license:lgpl2.1+)))
 
-(define-public kcompletion
+(define-public kcompletion-6
   (package
     (name "kcompletion")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2065,12 +2065,13 @@ (define-public kcompletion
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc"))))
+                "1j29hh8w8zv9h0rkm76zhr2f691ns937ix5hifhbx26x3szbxq71"))))
     (build-system qt-build-system)
     (native-inputs
-     (list extra-cmake-modules qttools-5))
+     (list extra-cmake-modules qttools))
     (inputs
-     (list kconfig kwidgetsaddons qtbase-5))
+     (list kcodecs-6 kconfig-6 kwidgetsaddons-6))
+    (arguments (list #:qtbase qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Powerful autocompletion framework and widgets")
     (description "This framework helps implement autocompletion in Qt-based
@@ -2078,6 +2079,26 @@ (define-public kcompletion
 integrated it into your application's other widgets.")
     (license license:lgpl2.1+)))
 
+(define-public kcompletion
+  (package
+    (inherit kcompletion-6)
+    (name "kcompletion")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5))
+    (inputs
+     (list kconfig kwidgetsaddons))
+    (arguments '())))
+
 (define-public kcontacts
   (package
     (name "kcontacts")
-- 
2.41.0

[bug#70395] [PATCH kde-team 21/63] gnu: Add kpty-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kpty-6): New variable.
(kpty): Inherit above.

Change-Id: If3e018e48599db552bce4f1c467c31ba7ae37720
---
 gnu/packages/kde-frameworks.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index d1a57db53d..13253b7a1a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2497,10 +2497,10 @@ (define-public kpackage
 were traditional plugins.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
-(define-public kpty
+(define-public kpty-6
   (package
     (name "kpty")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2509,21 +2509,20 @@ (define-public kpty
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9"))))
+                "1psrryrgkn9fbw81a7zlshwssr175db9kiq40ib77xx61gcnq8nz"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
     (inputs
-     (list kcoreaddons ki18n
-           ;; TODO: utempter, for managing UTMP entries
-           qtbase-5))
+     ;; TODO: utempter, for managing UTMP entries
+     (list kcoreaddons-6 ki18n-6 qtbase))
     (arguments
      (list #:tests? #f ; FIXME: 1/1 tests fail.
            #:phases #~(modify-phases %standard-phases
                         (add-after 'unpack 'patch-tests
                           (lambda _
                             (substitute* "autotests/kptyprocesstest.cpp"
-                              (("/bin/bash")
+                              (("/bin/sh")
                                (which "bash"))))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Interfacing with pseudo terminal devices")
@@ -2532,6 +2531,26 @@ (define-public kpty
 and communicating with them using a pty.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public kpty
+  (package
+    (inherit kpty-6)
+    (name "kpty")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9"))))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list kcoreaddons ki18n
+           qtbase-5))))
+
 (define-public kunitconversion
   (package
     (name "kunitconversion")
-- 
2.41.0

[bug#70395] [PATCH kde-team 22/63] gnu: Add kwindowsystem-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kwindowsystem-6): New variable.
(kwindowsystem): Inherit above.

Change-Id: Ib5c2d5d396ea372ddc0284b24575d33c3a57a4ff
---
 gnu/packages/kde-frameworks.scm | 49 +++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 13253b7a1a..8eb3e138e4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1611,10 +1611,10 @@ (define-public kwidgetsaddons
                         "(ksqueezedtextlabelautotest|\
 kwidgetsaddons-kcolumnresizertest)")))))))))
 
-(define-public kwindowsystem
+(define-public kwindowsystem-6
   (package
     (name "kwindowsystem")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1623,19 +1623,24 @@ (define-public kwindowsystem
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9"))))
+                "15b54bacasg7x3vfky0601vr1n2rjm1v81lga00qp8xahcw581wc"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules
            pkg-config
+           wayland; for wayland-scanner
            dbus ; for the tests
-           openbox ; for the tests
-           qttools-5
+           openbox ; for the test
+           qttools
            xorg-server-for-tests)) ; for the tests
     (inputs
-     (list libxrender
-           qtbase-5
-           qtx11extras
+     (list qtbase
+           qtdeclarative
+           qtwayland
+           wayland-protocols
+           plasma-wayland-protocols
+           libxkbcommon
+           wayland
            xcb-util-keysyms
            xcb-util-wm))
     (arguments
@@ -1668,6 +1673,34 @@ (define-public kwindowsystem
     ;; the lgpl2.1. Some source files are under non-copyleft licenses.
     (license license:lgpl2.1+)))
 
+(define-public kwindowsystem
+  (package
+    (inherit kwindowsystem-6)
+    (name "kwindowsystem")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9"))))
+    (native-inputs
+     (list extra-cmake-modules
+           pkg-config
+           dbus ; for the tests
+           openbox ; for the tests
+           qttools-5
+           xorg-server-for-tests)) ; for the tests
+    (inputs
+     (list libxrender
+           qtbase-5
+           qtx11extras
+           xcb-util-keysyms
+           xcb-util-wm))))
+
 (define-public modemmanager-qt
   (package
     (name "modemmanager-qt")
-- 
2.41.0

[bug#70395] [PATCH kde-team 23/63] gnu: Add networkmanager-qt-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (networkmanager-qt-6): New variable.
(networkmanager-qt): Inherit above.

Change-Id: I7e080b21bae5cbdcbe5dc8ae0e967c32f519123a
---
 gnu/packages/kde-frameworks.scm | 35 +++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 8eb3e138e4..a5adba4bdf 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1737,10 +1737,10 @@ (define-public modemmanager-qt
 messages.")
     (license license:lgpl2.1+)))
 
-(define-public networkmanager-qt
+(define-public networkmanager-qt-6
   (package
     (name "networkmanager-qt")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1749,16 +1749,16 @@ (define-public networkmanager-qt
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n"))))
+                "00nkmdi9pw5y7sxjh1na6vgy9f8x7hl7whf7z3sczbw9z2spjjbf"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules dbus pkg-config))
+    (inputs (list qtbase))
     (propagated-inputs
      ;; Headers contain #include <NetworkManager.h> and
      ;;                 #include <libnm/NetworkManager.h>
-     (list network-manager))
-    (inputs
-     (list qtbase-5))
+     (list network-manager
+           qtdeclarative))
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (replace 'check
@@ -1774,6 +1774,29 @@ (define-public networkmanager-qt
 which are used in DBus communication.")
     (license license:lgpl2.1+)))
 
+(define-public networkmanager-qt
+  (package
+    (inherit networkmanager-qt-6)
+    (name "networkmanager-qt")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n"))))
+    (native-inputs
+     (list extra-cmake-modules dbus pkg-config))
+    (propagated-inputs
+     ;; Headers contain #include <NetworkManager.h> and
+     ;;                 #include <libnm/NetworkManager.h>
+     (list network-manager))
+    (inputs
+     (list qtbase-5))))
+
 (define-public oxygen-icons
   (package
     (name "oxygen-icons")
-- 
2.41.0

[bug#70395] [PATCH kde-team 24/63] gnu: Add oxygen-icons-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (oxygen-icons-6): New variable.
(oxygen-icons): Inherit above.

Change-Id: If070648b73f912bb2eac805081d79d8718eccda4
---
 gnu/packages/kde-frameworks.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index a5adba4bdf..600fa69e3f 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1797,8 +1797,32 @@ (define-public networkmanager-qt
     (inputs
      (list qtbase-5))))
 
+(define-public oxygen-icons-6
+  (package
+    (name "oxygen-icons")
+    (version "6.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/oxygen-icons/"
+                    "/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0x2piq03gj72p5qlhi8zdx3r58va088ysp7lg295vhfwfll1iv18"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules
+           ;; for test
+           fdupes))
+    (inputs (list qtbase))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Oxygen provides the standard icon theme for the KDE desktop")
+    (description "Oxygen icon theme for the KDE desktop")
+    (license license:lgpl3+)))
+
 (define-public oxygen-icons
   (package
+    (inherit oxygen-icons-6)
     (name "oxygen-icons")
     (version "5.112.0")
     (source (origin
@@ -1810,15 +1834,10 @@ (define-public oxygen-icons
               (sha256
                (base32
                 "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a"))))
-    (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules fdupes))
     (inputs
      (list qtbase-5))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Oxygen provides the standard icon theme for the KDE desktop")
-    (description "Oxygen icon theme for the KDE desktop")
-    (license license:lgpl3+)
     (properties '((upstream-name . "oxygen-icons5")))))
 
 (define-public prison
-- 
2.41.0

[bug#70395] [PATCH kde-team 25/63] gnu: Add prison-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (prison-6): New variable.
(prison): Inherit above.

Change-Id: I5735d108fe8572b94cdc5606f74ccb67ed6e13cb
---
 gnu/packages/kde-frameworks.scm | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 600fa69e3f..abeac4b30b 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1840,10 +1840,10 @@ (define-public oxygen-icons
      (list qtbase-5))
     (properties '((upstream-name . "oxygen-icons5")))))
 
-(define-public prison
+(define-public prison-6
   (package
     (name "prison")
-    (version "5.114.0")
+    (version "6.1.0")
     (source
      (origin
        (method url-fetch)
@@ -1851,18 +1851,36 @@ (define-public prison
                            (version-major+minor version) "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "1wbr1lryxmrx65ilq1bhqsdhhikrih977nhpb02fq0cqnvv7v9i7"))))
+        (base32 "1x0y4vsprdlpnfg7g57qcj2j15nv7ga518fcygkm66dgd43p220p"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
     (inputs
-     (list libdmtx qrencode qtbase-5)) ;; TODO: rethink: nix propagates this
+     (list libdmtx zxing-cpp qrencode qtbase qtdeclarative qtmultimedia))
     (home-page "https://api.kde.org/frameworks/prison/html/index.html")
     (synopsis "Barcode generation abstraction layer")
     (description "Prison is a Qt-based barcode abstraction layer/library and
 provides uniform access to generation of barcodes with data.")
     (license license:lgpl2.1+)))
 
+(define-public prison
+  (package
+    (inherit prison-6)
+    (name "prison")
+    (version "5.114.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/frameworks/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1wbr1lryxmrx65ilq1bhqsdhhikrih977nhpb02fq0cqnvv7v9i7"))))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list libdmtx qrencode qtbase-5))))  ;; TODO: rethink: nix propagates this
+
 (define-public pulseaudio-qt
   (package
     (name "pulseaudio-qt")
-- 
2.41.0

[bug#70395] [PATCH kde-team 26/63] gnu: Add solid-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (solid-6): New variable.
(solid): Inherit above.

Change-Id: I7f0f4c51f5f4ec550149664e016a55af19f961b4
---
 gnu/packages/kde-frameworks.scm | 40 +++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index abeac4b30b..97fba6aba4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1943,8 +1943,38 @@ (define-public qqc2-desktop-style
     ;; Mostly LGPL 2+, but many files are dual-licensed
     (license (list license:lgpl2.1+ license:gpl3+))))
 
+(define-public solid-6
+  (package
+    (name "solid")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0qj2z9na884hph0ap9481rqvn06aw3y8nm37wxz02lggb15rhjh7"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list bison dbus extra-cmake-modules flex qttools))
+    ;; TODO: Add runtime-only dependency MediaPlayerInfo
+    (inputs
+     (list `(,util-linux "lib") ;; Optional, for libmount
+           libxkbcommon
+           vulkan-headers
+           qtbase qtdeclarative eudev))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Desktop hardware abstraction")
+    (description "Solid is a device integration framework.  It provides a way of
+querying and interacting with hardware independently of the underlying operating
+system.")
+    (license license:lgpl2.1+)))
+
 (define-public solid
   (package
+    (inherit solid-6)
     (name "solid")
     (version "5.114.0")
     (source (origin
@@ -1956,7 +1986,6 @@ (define-public solid
               (sha256
                (base32
                 "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s"))))
-    (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (replace 'check
@@ -1967,14 +1996,7 @@ (define-public solid
     (native-inputs
      (list bison dbus extra-cmake-modules flex qttools-5))
     (inputs
-     (list qtbase-5 qtdeclarative-5 eudev))
-    ;; TODO: Add runtime-only dependency MediaPlayerInfo
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Desktop hardware abstraction")
-    (description "Solid is a device integration framework.  It provides a way of
-querying and interacting with hardware independently of the underlying operating
-system.")
-    (license license:lgpl2.1+)))
+     (list qtbase-5 qtdeclarative-5 eudev))))
 
 (define-public sonnet
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 27/63] gnu: Add sonnet-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (sonnet-6): New variable.
(sonnet): Inherit above.

Change-Id: I1b84ee1b4c158b35512dd03931d6c08ed32fdb52
---
 gnu/packages/kde-frameworks.scm | 37 ++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 97fba6aba4..cbe9eb7ba1 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1998,10 +1998,10 @@ (define-public solid
     (inputs
      (list qtbase-5 qtdeclarative-5 eudev))))
 
-(define-public sonnet
+(define-public sonnet-6
   (package
     (name "sonnet")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2010,16 +2010,15 @@ (define-public sonnet
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx"))))
+                "1zpbla0d22sd66vgi6kiqsh8mkck6fklllh8pckx0kxc4r4fng61"))))
     (build-system qt-build-system)
+    (arguments (list #:qtbase qtbase))
     (native-inputs
-     (list extra-cmake-modules pkg-config qttools-5))
+     (list extra-cmake-modules pkg-config qttools))
     (inputs
-     (list aspell
-           hunspell
+     (list aspell hunspell
            ;; TODO: hspell (for Hebrew), Voikko (for Finish)
-           qtdeclarative-5
-           qtbase-5))
+           qtdeclarative))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Multi-language spell checker")
     (description "Sonnet is a plugin-based spell checking library for Qt-based
@@ -2027,6 +2026,28 @@ (define-public sonnet
 ASpell and HUNSPELL.")
     (license license:lgpl2.1+)))
 
+(define-public sonnet
+  (package
+    (inherit sonnet-6)
+    (name "sonnet")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx"))))
+    (arguments '())
+    (native-inputs
+     (list extra-cmake-modules pkg-config qttools-5))
+    (inputs
+     (list aspell
+           hunspell
+           qtdeclarative-5))))
+
 (define-public threadweaver
   (package
     (name "threadweaver")
-- 
2.41.0

[bug#70395] [PATCH kde-team 28/63] gnu: Add threadweaver-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (threadweaver-6): New variable.
(threadweaver): Inherit above.

Change-Id: I8bc19051a22465d3ac651678c5164e859a5ed3c8
---
 gnu/packages/kde-frameworks.scm | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index cbe9eb7ba1..be2fd51974 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2048,10 +2048,10 @@ (define-public sonnet
            hunspell
            qtdeclarative-5))))
 
-(define-public threadweaver
+(define-public threadweaver-6
   (package
     (name "threadweaver")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2060,18 +2060,35 @@ (define-public threadweaver
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh"))))
+                "1j4d8m7cy0xps56dq6iq8hpzz024wdqz6i6hrfs7ww31im8db9fx"))))
     (build-system cmake-build-system)
-    (native-inputs
-     (list extra-cmake-modules))
-    (inputs
-     (list qtbase-5))
+    (native-inputs (list extra-cmake-modules))
+    (inputs (list qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Helper for multithreaded programming")
     (description "ThreadWeaver is a helper for multithreaded programming.  It
 uses a job-based interface to queue tasks and execute them in an efficient way.")
     (license license:lgpl2.1+)))
 
+(define-public threadweaver
+  (package
+    (inherit threadweaver-6)
+    (name "threadweaver")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh"))))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list qtbase-5))))
+
 (define-public libkdcraw
   (package
     (name "libkdcraw")
-- 
2.41.0

[bug#70395] [PATCH kde-team 29/63] gnu: Add kcolorscheme.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kcolorscheme): New variable.

Change-Id: I88ab08e681587f9bce1fc5c29ac0dc1e98efd061
---
 gnu/packages/kde-frameworks.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index be2fd51974..3c0121aef2 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -698,6 +698,36 @@ (define-public kcolorpicker
 which can be used to add custom colors to the popup menu.")
     (license license:lgpl3+)))
 
+(define-public kcolorscheme
+  (package
+    (name "kcolorscheme")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+
+              (sha256
+               (base32
+                "0sh3bdy0zpm7w59qbwdyiygs9p1b76001awd0v20fs3079zsh2n3"))))
+    (build-system qt-build-system)
+    (native-inputs (list extra-cmake-modules))
+    (inputs (list kguiaddons-6 ki18n-6
+                  qtdeclarative))
+    (propagated-inputs (list kconfig-6))
+    (arguments (list #:qtbase qtbase))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Classes to read and interact with KColorScheme")
+    (description "This package provide a Classes to read and interact with
+KColorScheme.")
+    (license (list license:cc0
+                   license:lgpl2.0+
+                   license:lgpl2.1
+                   license:bsd-2
+                   license:lgpl3))))
+
 (define-public kconfig-6
   (package
     (name "kconfig")
-- 
2.41.0

[bug#70395] [PATCH kde-team 30/63] gnu: Add kdoctools-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kdoctools-6): New variable.
(kdoctools): Inherit above.

Change-Id: I9d6e4a818318b575e610affba8fbe6039760603c
---
 gnu/packages/kde-frameworks.scm | 58 +++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3c0121aef2..60b4ca1269 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2346,8 +2346,58 @@ (define-public kcrash
 application crashes.")
     (license license:lgpl2.1+)))
 
+(define-public kdoctools-6
+  (package
+    (name "kdoctools")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1dgk1qk66mbrlg3866c1p6g5ghxv0ksqn1kj21bll62jpfnm80i4"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list docbook-xml-4.5
+           docbook-xsl
+           gettext-minimal
+           karchive-6
+           ki18n-6
+           libxml2
+           libxslt
+           perl
+           perl-uri
+           qtbase))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'cmake-find-docbook
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* (find-files "cmake" "\\.cmake$")
+                (("CMAKE_SYSTEM_PREFIX_PATH") "CMAKE_PREFIX_PATH"))
+              (substitute* "cmake/FindDocBookXML4.cmake"
+                (("^.*xml/docbook/schema/dtd.*$")
+                 "xml/dtd/docbook\n"))
+              (substitute* "cmake/FindDocBookXSL.cmake"
+                (("^.*xml/docbook/stylesheet.*$")
+                 (string-append "xml/xsl/docbook-xsl-"
+                                #$(package-version (this-package-input "docbook-xsl"))
+                                "\n"))))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Create documentation from DocBook")
+    (description "Provides tools to generate documentation in various format
+from DocBook files.")
+    (license license:lgpl2.1+)))
+
 (define-public kdoctools
   (package
+    (inherit kdoctools-6)
     (name "kdoctools")
     (version "5.114.0")
     (source (origin
@@ -2359,7 +2409,6 @@ (define-public kdoctools
               (sha256
                (base32
                 "15s58r2zvdckw30x9q9ir8h1i8q2ncfgjn9h4jnmylwm79z3z27v"))))
-    (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
     (inputs
@@ -2396,12 +2445,7 @@ (define-public kdoctools
               (let ((xsl (string-append (assoc-ref outputs "out")
                                         "/share/kf5/kdoctools/customization/xsl/")))
                 (symlink (string-append xsl "pt_br.xml")
-                         (string-append xsl "pt-BR.xml"))))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Create documentation from DocBook")
-    (description "Provides tools to generate documentation in various format
-from DocBook files.")
-    (license license:lgpl2.1+)))
+                         (string-append xsl "pt-BR.xml"))))))))))
 
 (define-public kfilemetadata
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 31/63] gnu: Add kcontacts-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kcontacts-6): New variable.
(kcontacts): Inherit above.

Change-Id: Ifabaa96e327b97a3fcdf114f585ddab47ea70442
---
 gnu/packages/kde-frameworks.scm | 47 +++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 60b4ca1269..5c43df7e89 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2282,8 +2282,46 @@ (define-public kcompletion
      (list kconfig kwidgetsaddons))
     (arguments '())))
 
+(define-public kcontacts-6
+  (package
+    (name "kcontacts")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (patches
+               (search-patches "kcontacts-incorrect-country-name.patch"))
+              (sha256
+               (base32
+                "0ki6hhhh46k8710nj8q19ah9sqnws2c4q8r0j5s4vkq2hddvxl5y"))))
+    (build-system qt-build-system)
+    (native-inputs (list extra-cmake-modules
+                         ;; for test
+                         iso-codes))
+    (inputs (list qtbase qtdeclarative))
+    (propagated-inputs
+     (list ;; As required by KF6ContactsConfig.cmake.
+      kcodecs-6 kconfig-6 kcoreaddons-6 ki18n-6))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _ (setenv "HOME" (getcwd)))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "API for contacts/address book data following the vCard standard")
+    (description "This library provides a vCard data model, vCard
+input/output, contact group management, locale-aware address formatting, and
+localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
+")
+    (license license:lgpl2.1+)))
+
 (define-public kcontacts
   (package
+    (inherit kcontacts-6)
     (name "kcontacts")
     (version "5.114.0")
     (source (origin
@@ -2313,14 +2351,7 @@ (define-public kcontacts
             (lambda _
               (setenv "HOME" (getcwd))
               (system "Xvfb +extension GLX :1 -screen 0 640x480x24 &")
-              (setenv "DISPLAY" ":1"))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "API for contacts/address book data following the vCard standard")
-    (description "This library provides a vCard data model, vCard
-input/output, contact group management, locale-aware address formatting, and
-localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
-")
-    (license license:lgpl2.1+)))
+              (setenv "DISPLAY" ":1"))))))))
 
 (define-public kcrash
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 32/63] gnu: Add kcrash-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kcrash-6): New variable.
(kcrash): Inherit above.

Change-Id: I0cdf1ff49e88bb0a5961fce56897e07096bda7eb
---
 gnu/packages/kde-frameworks.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 5c43df7e89..2fa6084bec 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2353,10 +2353,10 @@ (define-public kcontacts
               (system "Xvfb +extension GLX :1 -screen 0 640x480x24 &")
               (setenv "DISPLAY" ":1"))))))))
 
-(define-public kcrash
+(define-public kcrash-6
   (package
     (name "kcrash")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2365,18 +2365,37 @@ (define-public kcrash
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1"))))
+                "1vbrcj0gh3536mwcn39jf496jh5x3vapkgg6grxn8bvwfvlq4zvj"))))
     (build-system qt-build-system)
-    (native-inputs
-     (list extra-cmake-modules))
-    (inputs
-     (list kcoreaddons kwindowsystem qtbase-5 qtx11extras))
+    (native-inputs (list extra-cmake-modules))
+    (inputs (list kcoreaddons-6 kwindowsystem-6))
+    (arguments (list #:qtbase qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Graceful handling of application crashes")
     (description "KCrash provides support for intercepting and handling
 application crashes.")
     (license license:lgpl2.1+)))
 
+(define-public kcrash
+  (package
+    (inherit kcrash-6)
+    (name "kcrash")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1"))))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list kcoreaddons kwindowsystem qtx11extras))
+    (arguments '())))
+
 (define-public kdoctools-6
   (package
     (name "kdoctools")
-- 
2.41.0

[bug#70395] [PATCH kde-team 33/63] gnu: Add knotifications-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (knotifications-6): New variable.
(knotifications): Inherit above.

Change-Id: Ic4ab3e86754095f8746e835f71e1a586c2d3b882
---
 gnu/packages/kde-frameworks.scm | 38 +++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 2fa6084bec..5801e14a06 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2663,8 +2663,37 @@ (define-public kjobwidgets
 asynchronous jobs.")
     (license license:lgpl2.1+)))
 
+(define-public knotifications-6
+  (package
+    (name "knotifications")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1azwmj47735cz5lrvbba7hq7iv3w0d7a60q23d70klfjq55nzwq2"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules pkg-config qttools))
+    (propagated-inputs (list qtdeclarative))
+    (inputs
+     (list kconfig-6
+           kcoreaddons-6
+           libcanberra
+           qtbase))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Desktop notifications")
+    (description "KNotification is used to notify the user of an event.  It
+covers feedback and persistent events.")
+    (license license:lgpl2.1+)))
+
 (define-public knotifications
   (package
+    (inherit knotifications-6)
     (name "knotifications")
     (version "5.114.0")
     (source (origin
@@ -2676,7 +2705,6 @@ (define-public knotifications
               (sha256
                (base32
                 "0cjd5ml9hyzprjgmrc132cmp7g9hnl0h5swlxw2ifqnxxyfkg72b"))))
-    (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules dbus pkg-config qttools-5))
     (inputs
@@ -2691,6 +2719,7 @@ (define-public knotifications
            qtbase-5
            qtspeech-5
            qtx11extras))
+    (propagated-inputs '())
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (replace 'check
@@ -2699,12 +2728,7 @@ (define-public knotifications
                               (setenv "HOME"
                                       (getcwd))
                               (setenv "DBUS_FATAL_WARNINGS" "0")
-                              (invoke "dbus-launch" "ctest")))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Desktop notifications")
-    (description "KNotification is used to notify the user of an event.  It
-covers feedback and persistent events.")
-    (license license:lgpl2.1+)))
+                              (invoke "dbus-launch" "ctest")))))))))
 
 (define-public kpackage
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 34/63] gnu: Add kpackage-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kpackage-6): New variable.
(kpackage): Inherit above.

Change-Id: Ie0a0c6a5ad24280b386f5480f8fb0761950b157d
---
 gnu/packages/kde-frameworks.scm | 58 ++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 5801e14a06..1cc402c8f9 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2730,8 +2730,56 @@ (define-public knotifications
                               (setenv "DBUS_FATAL_WARNINGS" "0")
                               (invoke "dbus-launch" "ctest")))))))))
 
+(define-public kpackage-6
+  (package
+    (name "kpackage")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1bsjdc8m31yj7ahxx8fdazhrgcchwlqyxvfvmkws903584mr2xgd"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules))
+    (propagated-inputs (list kcoreaddons-6))
+    (inputs
+     (list karchive-6
+           kconfig-6
+           kdoctools-6
+           ki18n-6
+           qtbase))
+    (arguments
+     (list
+      ;; The `plasma-querytest' test is known to fail when tests are run in parallel:
+      ;; <https://sources.debian.org/src/kpackage/5.107.0-1/debian/changelog/#L92>
+      #:parallel-tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* "src/kpackage/package.cpp"
+                (("bool externalPaths = false;")
+                 "bool externalPaths = true;"))
+              (substitute* '("src/kpackage/packageloader.cpp")
+                (("QDirIterator::Subdirectories")
+                 "QDirIterator::Subdirectories | QDirIterator::FollowSymlinks"))))
+          (add-before 'check 'check-setup
+            (lambda _ (setenv "HOME" (getcwd)))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Installation and loading of additional content as packages")
+    (description "The Package framework lets the user install and load packages
+of non binary content such as scripted extensions or graphic assets, as if they
+were traditional plugins.")
+    (license (list license:gpl2+ license:lgpl2.1+))))
+
 (define-public kpackage
   (package
+    (inherit kpackage-6)
     (name "kpackage")
     (version "5.114.0")
     (source (origin
@@ -2743,7 +2791,6 @@ (define-public kpackage
               (sha256
                (base32
                 "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d"))))
-    (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
     (inputs
@@ -2753,6 +2800,7 @@ (define-public kpackage
            kdoctools
            ki18n
            qtbase-5))
+    (propagated-inputs '())
     (arguments
      (list
       #:phases
@@ -2790,13 +2838,7 @@ (define-public kpackage
                  ""))))
           (add-before 'check 'check-setup
             (lambda _
-              (setenv "HOME" (getcwd)))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Installation and loading of additional content as packages")
-    (description "The Package framework lets the user install and load packages
-of non binary content such as scripted extensions or graphic assets, as if they
-were traditional plugins.")
-    (license (list license:gpl2+ license:lgpl2.1+))))
+              (setenv "HOME" (getcwd)))))))))
 
 (define-public kpty-6
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 35/63] gnu: Add kunitconversion-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kunitconversion-6): New variable.
(kunitconversion): Inherit above.

Change-Id: I60b013d30961e8270fa8e33bb327f87a3d3fdb54
---
 gnu/packages/kde-frameworks.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1cc402c8f9..1b1aa1ad7c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2894,10 +2894,10 @@ (define-public kpty
      (list kcoreaddons ki18n
            qtbase-5))))
 
-(define-public kunitconversion
+(define-public kunitconversion-6
   (package
     (name "kunitconversion")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2906,13 +2906,13 @@ (define-public kunitconversion
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n"))))
+                "1v1inf8f6dk45qiyba3rk5pgrm5h7h0m3h6f3jrl6f8vskrfcvfz"))))
     (build-system cmake-build-system)
-    (arguments `(#:tests? #f)) ;; Requires network.
     (native-inputs
      (list extra-cmake-modules))
     (inputs
-     (list ki18n qtbase-5))
+     (list ki18n-6 qtbase))
+    (arguments `(#:tests? #f)) ;; Requires network.
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Converting physical units")
     (description "KUnitConversion provides functions to convert values in
@@ -2921,6 +2921,25 @@ (define-public kunitconversion
 gallons).")
     (license license:lgpl2.1+)))
 
+(define-public kunitconversion
+  (package
+    (inherit kunitconversion-6)
+    (name "kunitconversion")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n"))))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list ki18n qtbase-5))))
+
 (define-public syndication
   (package
     (name "syndication")
-- 
2.41.0

[bug#70395] [PATCH kde-team 36/63] gnu: Add syndication-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (syndication-6): New variable.
(syndication): Inherit above.

Change-Id: Ic1c97ced5ce2083ba09212787bed59295531ed81
---
 gnu/packages/kde-frameworks.scm | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1b1aa1ad7c..089ed0f4c3 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2940,10 +2940,10 @@ (define-public kunitconversion
     (inputs
      (list ki18n qtbase-5))))
 
-(define-public syndication
+(define-public syndication-6
   (package
     (name "syndication")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2952,12 +2952,12 @@ (define-public syndication
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7"))))
+                "10wn5z1xqjs9bfy37f6ilr0j3z3rgcs91dp7iccc291h5r53km89"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules))
     (inputs
-     (list kcodecs qtbase-5))
+     (list kcodecs-6 qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "RSS/Atom parser library")
     (description "@code{syndication} supports RSS (0.9/1.0, 0.91..2.0) and
@@ -2966,6 +2966,24 @@ (define-public syndication
 between feed formats.")
     (license license:lgpl2.1+)))
 
+(define-public syndication
+  (package
+    (inherit syndication-6)
+    (name "syndication")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7"))))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list kcodecs qtbase-5))))
 
 ;; Tier 3
 ;;
-- 
2.41.0

[bug#70395] [PATCH kde-team 37/63] gnu: polkit-qt: Update to 0.200.0.

[Zheng Junjie]

* gnu/packages/polkit.scm (polkit-qt): Update to 0.200.0.
[propagated-inputs]: Remove it.
[inputs]: Add qtbase-5.
[arguments]<#:configure-flags>: Update.
[properties]: Set upstream-name.

Change-Id: I69373dc3858fad3160be31a2ebd39a5f52c95294
---
 gnu/packages/polkit.scm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 337d9b9a73..5f23ed88f3 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -171,30 +171,29 @@ (define-public polkit
 (define-public polkit-qt
   (package
     (name "polkit-qt")
-    (version "1-0.114.0")
+    (version "0.200.0")
     (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "mirror://kde/stable/polkit-qt-1/"
-                   "polkit-qt-" version ".tar.xz"))
-             (sha256
-              (base32
-               "0zlhwgkqn8g0rkjc7c5n7fbhyyl4jcv0rg5zlbzrb0l88ljg5c1f"))))
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/polkit-qt-1/"
+                    name "-1-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1yvp2s72fgpn5kf1a2ldy0givlmz0z4i1fsh6ylpcard0qf62fsx"))))
     (build-system cmake-build-system)
     (inputs
-     (list polkit))
-    (propagated-inputs
-     (list qtbase-5))
+     (list qtbase-5 polkit))
     (native-inputs
      (list pkg-config))
     (arguments
-     `(#:configure-flags (list (string-append "-DCMAKE_INSTALL_RPATH="
-                                              (assoc-ref %outputs "out")
-                                              "/lib:"
-                                              (assoc-ref %outputs "out")
-                                              "/lib64"))
-       #:tests? #f)) ; there is a test subdirectory, but no test target
+     (list #:configure-flags
+           #~(list (string-append
+                    "-DQT_MAJOR_VERSION="
+                    #$(version-major
+                       (package-version (this-package-input "qtbase")))))
+           #:tests? #f)) ; there is a test subdirectory, but no test target
     (home-page "https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/")
+    (properties `((upstream-name . "polkit-qt-1")))
     (synopsis "Qt frontend to the polkit library")
     (description "Polkit-qt is a library that lets developers use the
 PolicyKit API through a Qt-styled API.  It is mainly a wrapper around
-- 
2.41.0

[bug#70395] [PATCH kde-team 38/63] gnu: Add polkit-qt6.

[Zheng Junjie]

* gnu/packages/polkit.scm (polkit-qt6): New variable.

Change-Id: I6207a1de39dbe9fd0aed164975f47149930667e0
---
 gnu/packages/polkit.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 5f23ed88f3..58a8a236f7 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -201,6 +201,13 @@ (define-public polkit-qt
 easily with PolicyKit.")
     (license lgpl2.0+)))
 
+(define-public polkit-qt6
+  (package
+    (inherit polkit-qt)
+    (name "polkit-qt6")
+    (inputs (modify-inputs (package-inputs polkit-qt)
+              (replace "qtbase" qtbase)))))
+
 (define-public polkit-gnome
   (package
     (name "polkit-gnome")
-- 
2.41.0

[bug#70395] [PATCH kde-team 39/63] gnu: Add kauth-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kauth-6): New variable.
(kauth): Inherit above.

Change-Id: I145f0aef7fa115b71084b8f295f67d9ccdfe55cb
---
 gnu/packages/kde-frameworks.scm | 36 +++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 089ed0f4c3..02d2d0f1d0 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2191,10 +2191,10 @@ (define-public kactivities
     ;; triple licensed
     (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+))))
 
-(define-public kauth
+(define-public kauth-6
   (package
     (name "kauth")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2203,12 +2203,13 @@ (define-public kauth
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir"))))
+                "12zhjawv4z5b36kgbahz0hlb06wr772vcw5kkb69hl4041081rs7"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list dbus extra-cmake-modules qttools-5))
+     (list dbus extra-cmake-modules qttools))
+    (propagated-inputs (list kcoreaddons-6))
     (inputs
-     (list kcoreaddons polkit-qt qtbase-5))
+     (list kwindowsystem-6 polkit-qt6 qtbase))
     (arguments
      (list
       #:phases
@@ -2217,7 +2218,9 @@ (define-public kauth
             (lambda _
               ;; Make packages using kauth put their policy files and helpers
               ;; into their own prefix.
-              (substitute* "KF5AuthConfig.cmake.in"
+              (substitute* #$(string-append "KF" (version-major
+                                                  (package-version this-package))
+                                   "AuthConfig.cmake.in")
                 (("@KAUTH_POLICY_FILES_INSTALL_DIR@")
                  "${KDE_INSTALL_DATADIR}/polkit-1/actions")
                 (("@KAUTH_HELPER_INSTALL_DIR@")
@@ -2236,6 +2239,27 @@ (define-public kauth
 utilities.")
     (license license:lgpl2.1+)))
 
+(define-public kauth
+  (package
+    (inherit kauth-6)
+    (name "kauth")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list dbus extra-cmake-modules qttools-5))
+    (inputs
+     (list kcoreaddons polkit-qt qtbase-5))
+    (propagated-inputs '())))
+
 (define-public kcompletion-6
   (package
     (name "kcompletion")
-- 
2.41.0

[bug#70395] [PATCH kde-team 40/63] gnu: Add kjobwidgets-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kjobwidgets-6): New variable.
(kjobwidgets): Inherit above.

Change-Id: I313118b71ec232f7e1e8f71e5db59e718c75ba76
---
 gnu/packages/kde-frameworks.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 02d2d0f1d0..9f9e26d550 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2663,10 +2663,10 @@ (define-public kimageformats
 formats.")
     (license license:lgpl2.1+)))
 
-(define-public kjobwidgets
+(define-public kjobwidgets-6
   (package
     (name "kjobwidgets")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2675,18 +2675,37 @@ (define-public kjobwidgets
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8"))))
+                "1f7xaij2amax4pwy15bb83dwzjvhsdd4hr4mb9h7lliqifsdsydc"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list extra-cmake-modules qttools-5))
+     (list extra-cmake-modules qttools))
     (inputs
-     (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras))
+     (list libxkbcommon kcoreaddons-6 knotifications-6 kwidgetsaddons-6 qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Widgets for showing progress of asynchronous jobs")
     (description "KJobWIdgets provides widgets for showing progress of
 asynchronous jobs.")
     (license license:lgpl2.1+)))
 
+(define-public kjobwidgets
+  (package
+    (inherit kjobwidgets-6)
+    (name "kjobwidgets")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5))
+    (inputs
+     (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras))))
+
 (define-public knotifications-6
   (package
     (name "knotifications")
-- 
2.41.0

[bug#70395] [PATCH kde-team 41/63] gnu: qca: Update to 2.3.8.

[Zheng Junjie]

* gnu/packages/kde.scm (qca): Update to 2.3.8.

Change-Id: Id0f1e58f67eb432eb907c7e67ed35ddfbb4686a5
---
 gnu/packages/kde.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 38992150c7..e27318463b 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -936,14 +936,14 @@ (define-public libkomparediff2
 (define-public qca
   (package
     (name "qca")
-    (version "2.3.7")
+    (version "2.3.8")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "mirror://kde/stable/qca/" version
                             "/qca-" version ".tar.xz"))
         (sha256
-         (base32 "0hrzmzvzsgzn4nvplgg2wmxaql7fjvi3rcqgwgimnzb8ahxk9qpy"))))
+         (base32 "0r42d9wqj0pwp4qw1lzy41yvphqc70s639lbj0flc0h2dal9qxa8"))))
     (build-system cmake-build-system)
     (native-inputs
      (list pkg-config))
-- 
2.41.0

[bug#70395] [PATCH kde-team 42/63] gnu: Add qca-qt6.

[Zheng Junjie]

* gnu/packages/kde.scm (qca-qt6): New variable.

Change-Id: Id27ce0239c2eebfa572d8d10b895244b6e96ba8b
---
 gnu/packages/kde.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index e27318463b..111c37acf5 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -957,6 +957,14 @@ (define-public qca
 cards.")
     (license license:lgpl2.1+)))
 
+(define-public qca-qt6
+  (package
+    (inherit qca)
+    (name "qca-qt6")
+    (arguments (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON")))
+    (inputs
+     (list openssl qtbase qt5compat))))
+
 (define-public kommit
   (package
     (name "kommit")
-- 
2.41.0

[bug#70395] [PATCH kde-team 43/63] gnu: pulseaudio-qt: Built with qt6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (pulseaudio-qt)[arguments]: set
configure-flags.
[inputs]: Replace qtbase-5 with qtbase, Replace qtdeclarative-5 with
qtdeclarative.

Change-Id: I084c3b3a4dc60be0f042af4a9f4657ac86e281d9
---
 gnu/packages/kde-frameworks.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9f9e26d550..df167c6095 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1923,10 +1923,11 @@ (define-public pulseaudio-qt
                (base32
                 "0rfh1qawf2bxh26p5xr03z2zizpnfw8k9ycwhmmqac11rx765jnq"))))
     (build-system cmake-build-system)
+    (arguments (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON")))
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
-     (list glib pulseaudio qtdeclarative-5 qtbase-5))
+     (list glib pulseaudio qtdeclarative qtbase))
     (home-page "https://invent.kde.org/libraries/pulseaudio-qt/")
     (synopsis "Qt bindings for PulseAudio")
     (description
-- 
2.41.0

[bug#70395] [PATCH kde-team 44/63] gnu: Add kglobalaccel-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kglobalaccel-6): New variable.
(kglobalaccel): Inherit above.

Change-Id: I85205691fdac39dca094fbe833abf6eebd4cc36a
---
 gnu/packages/kde-frameworks.scm | 41 ++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index df167c6095..42d352056f 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3450,8 +3450,40 @@ (define-public kemoticons
     ;; dual licensed, image files are licensed under cc-by-sa4.0
     (license (list license:gpl2+ license:lgpl2.1+ license:cc-by-sa4.0))))
 
+(define-public kglobalaccel-6
+  (package
+    (name "kglobalaccel")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1wk45z9r6387p54sgqmqyddsni30hbiqihlxb22ybswfi39i6nw8"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules pkg-config qttools))
+    (inputs
+     (list kconfig-6
+           kcrash-6
+           kcoreaddons-6
+           kdbusaddons-6
+           kwindowsystem-6
+           qtdeclarative))
+    (arguments (list #:qtbase qtbase))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Global desktop keyboard shortcuts")
+    (description "KGlobalAccel allows you to have global accelerators that are
+independent of the focused window.  Unlike regular shortcuts, the application's
+window does not need focus for them to be activated.")
+    (license license:lgpl2.1+)))
+
 (define-public kglobalaccel
   (package
+    (inherit kglobalaccel-6)
     (name "kglobalaccel")
     (version "5.114.0")
     (source (origin
@@ -3463,7 +3495,6 @@ (define-public kglobalaccel
               (sha256
                (base32
                 "19mmav055fnzyl760fyhf0pdvaidd5i1h04l2hcnpin4p1jnpfap"))))
-    (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config qttools-5))
     (inputs
@@ -3472,16 +3503,10 @@ (define-public kglobalaccel
            kcoreaddons
            kdbusaddons
            kwindowsystem
-           qtbase-5
            qtx11extras
            qtdeclarative-5
            xcb-util-keysyms))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Global desktop keyboard shortcuts")
-    (description "KGlobalAccel allows you to have global accelerators that are
-independent of the focused window.  Unlike regular shortcuts, the application's
-window does not need focus for them to be activated.")
-    (license license:lgpl2.1+)))
+    (arguments '())))
 
 (define-public kiconthemes
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 45/63] gnu: Add kconfigwidgets-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kconfigwidgets-6): New variable.
(kconfigwidgets): Inherit above.

Change-Id: I9d3b4c68f0a11c74f0d1c7c41eb615eb2c1600a2
---
 gnu/packages/kde-frameworks.scm | 63 +++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 42d352056f..a2fb4883a3 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3214,10 +3214,10 @@ (define-public kcmutils
 KCModules can be created with the KConfigWidgets framework.")
     (license license:lgpl2.1+)))
 
-(define-public kconfigwidgets
+(define-public kconfigwidgets-6
   (package
     (name "kconfigwidgets")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3226,21 +3226,21 @@ (define-public kconfigwidgets
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj"))))
+                "0wfiz6frwmvbjfz30ci2iilzxr1rww7i74mbjigg1xkgg4p2n98b"))))
     (build-system qt-build-system)
     (propagated-inputs
-     (list kauth kcodecs kconfig kwidgetsaddons))
+     (list kcodecs-6 kconfig-6 kcolorscheme kwidgetsaddons-6))
     (native-inputs
-     (list extra-cmake-modules kdoctools qttools-5))
+     (list extra-cmake-modules kdoctools-6 qttools))
     (inputs
-     (list kcoreaddons
-           kguiaddons
-           ki18n
+     (list kcoreaddons-6
+           kguiaddons-6
+           ki18n-6
            ;; todo: PythonModuleGeneration
-           qtbase-5
-           qttools-5))
+           qtdeclarative))
     (arguments
      (list
+      #:qtbase qtbase
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch
@@ -3254,7 +3254,8 @@ (define-public kconfigwidgets
               (when tests?
                 (setenv "HOME"
                         (getcwd))
-                (invoke "ctest" "-E" "kstandardactiontest")))))))
+                (invoke "ctest" "-E" "(kstandardactiontest|\
+klanguagenametest)")))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Widgets for configuration dialogs")
     (description "KConfigWidgets provides easy-to-use classes to create
@@ -3263,6 +3264,46 @@ (define-public kconfigwidgets
     ;; dual licensed
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public kconfigwidgets
+  (package
+    (inherit kconfigwidgets-6)
+    (name "kconfigwidgets")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj"))))
+    (propagated-inputs
+     (list kauth kcodecs kconfig kwidgetsaddons))
+    (native-inputs
+     (list extra-cmake-modules kdoctools qttools-5))
+    (inputs
+     (list kcoreaddons
+           kguiaddons
+           ;; todo: PythonModuleGeneration
+           ki18n))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* "src/khelpclient.cpp"
+                ;; make QDirIterator follow symlinks
+                (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b)
+                 (string-append a " | QDirIterator::FollowSymlinks" b)))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "HOME"
+                        (getcwd))
+                (invoke "ctest" "-E" "kstandardactiontest")))))))))
+
 (define-public kdeclarative
   (package
     (name "kdeclarative")
-- 
2.41.0

[bug#70395] [PATCH kde-team 46/63] gnu: Add kiconthemes-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kiconthemes-6): New variable.
(kiconthemes): Inherit above.

Change-Id: Ic2220b4a5c110db3b843b69bdc102f589a721f2e
---
 gnu/packages/kde-frameworks.scm | 53 +++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index a2fb4883a3..3e22b54c3c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3549,8 +3549,54 @@ (define-public kglobalaccel
            xcb-util-keysyms))
     (arguments '())))
 
+(define-public kiconthemes-6
+  (package
+    (name "kiconthemes")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "00il1hqwkr64gw8s427j7yh0likij3qhhl155ip7k5213mq7gkkr"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules qttools shared-mime-info))
+    (inputs
+     (list libxkbcommon
+           karchive-6
+           kauth-6
+           kcodecs-6
+           kcolorscheme
+           kcoreaddons-6
+           kconfig-6
+           kconfigwidgets-6
+           ki18n-6
+           kitemviews-6
+           kwidgetsaddons-6
+           qtbase
+           qtdeclarative
+           qtsvg))
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'check 'check-setup
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (setenv "HOME" (getcwd))
+                   ;; make Qt render "offscreen", required for tests
+                   (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Icon GUI utilities")
+    (description "This library contains classes to improve the handling of icons
+in applications using the KDE Frameworks.")
+    (license license:lgpl2.1+)))
+
 (define-public kiconthemes
   (package
+    (inherit kiconthemes-6)
     (name "kiconthemes")
     (version "5.114.0")
     (source (origin
@@ -3589,12 +3635,7 @@ (define-public kiconthemes
                                           "/share"))
                    (setenv "HOME" (getcwd))
                    ;; make Qt render "offscreen", required for tests
-                   (setenv "QT_QPA_PLATFORM" "offscreen"))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Icon GUI utilities")
-    (description "This library contains classes to improve the handling of icons
-in applications using the KDE Frameworks.")
-    (license license:lgpl2.1+)))
+                   (setenv "QT_QPA_PLATFORM" "offscreen"))))))))
 
 (define-public kinit
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 47/63] gnu: Add kservice-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kservice-6): New variable.
(kservice): Inherit above.

Change-Id: I5fe5002627aa0b11b570cc2bbcd9d5380121ecba
---
 gnu/packages/kde-frameworks.scm | 68 ++++++++++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3e22b54c3c..261dc45f11 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -4072,8 +4072,66 @@ (define-public krunner
 typed.")
     (license license:lgpl2.1+)))
 
+(define-public kservice-6
+  (package
+    (name "kservice")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "10g7bj5ks5dbrjbd4ky71jdz54k7s6h91y3n124mayf4wbyyfbpf"))))
+    (build-system cmake-build-system)
+    (propagated-inputs
+     (list kconfig-6 kcoreaddons-6 kdoctools-6))
+    (native-inputs
+     (list bison extra-cmake-modules flex shared-mime-info))
+    (inputs
+     (list kcrash-6 kdbusaddons-6 kdoctools-6 ki18n-6 qtbase qtdeclarative))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and
+            ;; "no-canonicalize-path".
+            (lambda _
+              (substitute* "src/sycoca/kbuildsycoca.cpp"
+                ;; make QDirIterator follow symlinks
+                (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b)
+                 (string-append a " | QDirIterator::FollowSymlinks" b)))
+              (substitute* "src/sycoca/vfolder_menu.cpp"
+                ;; Normalize path, but don't resolve symlinks (taken from
+                ;; NixOS)
+                (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);")
+                 "QString resolved = QDir::cleanPath(dir);"))))
+          (add-before 'check 'check-setup
+            (lambda _
+              (with-output-to-file "autotests/BLACKLIST"
+                (lambda _
+                  (for-each
+                   (lambda (name) (display (string-append "[" name "]\n*\n")))
+                   (list "extraFileInFutureShouldRebuildSycocaOnce"
+                         "testNonReadableSycoca"))))
+              (setenv "XDG_RUNTIME_DIR" (getcwd))
+              (setenv "HOME" (getcwd))
+              ;; Make Qt render "offscreen", required for tests
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Plugin framework for desktop services")
+    (description "KService provides a plugin framework for handling desktop
+services.  Services can be applications or libraries.  They can be bound to MIME
+types or handled by application specific code.")
+    ;; triple licensed
+    (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+))))
+
 (define-public kservice
   (package
+    (inherit kservice-6)
     (name "kservice")
     (version "5.114.0")
     (source (origin
@@ -4085,7 +4143,6 @@ (define-public kservice
               (sha256
                (base32
                 "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca"))))
-    (build-system cmake-build-system)
     (propagated-inputs
      (list kconfig kcoreaddons kdoctools))
     (native-inputs
@@ -4114,14 +4171,7 @@ (define-public kservice
                (setenv "HOME" (getcwd))
                (setenv "QT_QPA_PLATFORM" "offscreen")
                ;; Disable failing tests.
-               (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)")))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Plugin framework for desktop services")
-    (description "KService provides a plugin framework for handling desktop
-services.  Services can be applications or libraries.  They can be bound to MIME
-types or handled by application specific code.")
-    ;; triple licensed
-    (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+))))
+               (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)")))))))))
 
 (define-public ktexteditor
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 48/63] gnu: phonon: Remove unneed phase.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (phonon)[arguments]: Remvoe patch-installdir
phase.

Change-Id: Ib52ba09ab76cf6c6f55d15d8e7b03c710f8d562b
---
 gnu/packages/kde-frameworks.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 261dc45f11..ea4845a1c4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -255,17 +255,8 @@ (define-public phonon
     (inputs (list glib qtbase-5 pulseaudio))
     (arguments
      (list #:configure-flags
-           #~'("-DCMAKE_CXX_FLAGS=-fPIC"
-               "-DPHONON_BUILD_QT6=OFF") ;KDE is still using Qt 5
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'install 'patch-installdir
-                 (lambda* (#:key inputs outputs #:allow-other-keys)
-                   (let ((regex (string-append "(INSTALL DESTINATION \")"
-                                               #$(this-package-input "qtbase"))))
-                     (substitute* "cmake_install.cmake"
-                       ((regex all dest)
-                        (string-append dest #$output)))))))))
+           #~(list "-DCMAKE_CXX_FLAGS=-fPIC"
+                   "-DPHONON_BUILD_QT6=OFF"))) ;KDE is still using Qt 5
     (home-page "https://community.kde.org/Phonon")
     (synopsis "KDE's multimedia library")
     (description "KDE's multimedia library.")
-- 
2.41.0

[bug#70395] [PATCH kde-team 49/63] gnu: phonon: Enable qt6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (phonon)[arguments]: Remove
"-DPHONON_BUILD_QT6=OFF".
[native-inputs]: Replace qttools-5 with qttools.
[inputs]: Add qtbase, qt5compat.

Change-Id: I6da2d8ff0a6f3341b556ad18d9ff49988fee2261
---
 gnu/packages/kde-frameworks.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ea4845a1c4..7927bf3e47 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -251,12 +251,11 @@ (define-public phonon
     (build-system cmake-build-system)
     (native-inputs
      ;; TODO: Add building the super experimental QML support
-     (list appstream extra-cmake-modules pkg-config qttools-5))
-    (inputs (list glib qtbase-5 pulseaudio))
+     (list appstream extra-cmake-modules pkg-config qttools))
+    (inputs (list qtbase qt5compat glib qtbase-5 pulseaudio))
     (arguments
      (list #:configure-flags
-           #~(list "-DCMAKE_CXX_FLAGS=-fPIC"
-                   "-DPHONON_BUILD_QT6=OFF"))) ;KDE is still using Qt 5
+           #~(list "-DCMAKE_CXX_FLAGS=-fPIC")))
     (home-page "https://community.kde.org/Phonon")
     (synopsis "KDE's multimedia library")
     (description "KDE's multimedia library.")
-- 
2.41.0

[bug#70395] [PATCH kde-team 50/63] gnu: Add kwallet-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kwallet-6): New variable.
(kwallet): Inherit above.

Change-Id: I12216ad70cc09b35ab0240f8e83808948c9a2985
---
 gnu/packages/kde-frameworks.scm | 69 +++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 7927bf3e47..b77c12a613 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -4278,10 +4278,10 @@ (define-public ktextwidgets
     ;; dual licensed
     (license (list license:lgpl2.0+ license:lgpl2.1+))))
 
-(define-public kwallet
+(define-public kwallet-6
   (package
     (name "kwallet")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -4290,16 +4290,59 @@ (define-public kwallet
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36"))))
+                "04s6p1sl24dd85c4n2rxj3z5kf3gc8lx5a4k1x73lr77vyxsv4ng"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases
-       #~(modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests? ;; Seems to require network.
-               (invoke "ctest" "-E"
-                       "(fdo_secrets_test)")))))))
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests? ;; Seems to require network.
+                     (invoke "ctest" "-E"
+                             "(fdo_secrets_test)")))))))
+    (native-inputs
+     (list extra-cmake-modules kdoctools-6))
+    (inputs
+     (list gpgme
+           kauth-6
+           kcodecs-6
+           kconfig-6
+           kconfigwidgets-6
+           kcoreaddons-6
+           kdbusaddons-6
+           kdoctools-6
+           kiconthemes-6
+           ki18n-6
+           knotifications-6
+           kservice-6
+           kwidgetsaddons-6
+           kwindowsystem-6
+           libgcrypt
+           phonon
+           qgpgme
+           qca-qt6
+           qtbase))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Safe desktop-wide storage for passwords")
+    (description "This framework contains an interface to KWallet, a safe
+desktop-wide storage for passwords and the kwalletd daemon used to safely store
+the passwords on KDE work spaces.")
+    (license license:lgpl2.1+)))
+
+(define-public kwallet
+  (package
+    (inherit kwallet-6)
+    (name "kwallet")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36"))))
     (native-inputs
      (list extra-cmake-modules kdoctools))
     (inputs
@@ -4321,13 +4364,7 @@ (define-public kwallet
            phonon
            qgpgme
            qca
-           qtbase-5))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Safe desktop-wide storage for passwords")
-    (description "This framework contains an interface to KWallet, a safe
-desktop-wide storage for passwords and the kwalletd daemon used to safely store
-the passwords on KDE work spaces.")
-    (license license:lgpl2.1+)))
+           qtbase-5))))
 
 (define-public kxmlgui
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 51/63] gnu: Add ktextwidgets-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (ktextwidgets-6): New variable.
(ktextwidgets): Inherit above.
Change-Id: I79ae2650ef8e2acb824daf53ee88c7872d0b00c3

Change-Id: I1f7264746724dc6c03f7bc4f8979768c39e42c9a
---
 gnu/packages/kde-frameworks.scm | 48 +++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b77c12a613..6e67976f57 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -4240,8 +4240,47 @@ (define-public ktexteditor
     ;; triple licensed
     (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+))))
 
+(define-public ktextwidgets-6
+  (package
+    (name "ktextwidgets")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0lv5ddsgzqawbhh718va2plcnfw2pb61v3iypwbwq2cj3ir49kbj"))))
+    (build-system qt-build-system)
+    (propagated-inputs
+     (list ki18n-6 sonnet-6))
+    (native-inputs
+     (list extra-cmake-modules qttools))
+    (inputs
+     (list kauth-6
+           kcodecs-6
+           kcompletion-6
+           kconfig-6
+           kconfigwidgets-6
+           kcoreaddons-6
+           kiconthemes-6
+           kservice-6
+           kwidgetsaddons-6
+           kwindowsystem-6
+           qtbase
+           qtspeech))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Text editing widgets")
+    (description "KTextWidgets provides widgets for displaying and editing text.
+It supports rich text as well as plain text.")
+    ;; dual licensed
+    (license (list license:lgpl2.0+ license:lgpl2.1+))))
+
 (define-public ktextwidgets
   (package
+    (inherit ktextwidgets-6)
     (name "ktextwidgets")
     (version "5.114.0")
     (source (origin
@@ -4253,7 +4292,6 @@ (define-public ktextwidgets
               (sha256
                (base32
                 "0w1wwyd3fy351rmkhf3i55is5031j2zxvswm0b1sb3pd159v888v"))))
-    (build-system qt-build-system)
     (propagated-inputs
      (list ki18n sonnet))
     (native-inputs
@@ -4270,13 +4308,7 @@ (define-public ktextwidgets
            kwidgetsaddons
            kwindowsystem
            qtbase-5
-           qtspeech-5))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Text editing widgets")
-    (description "KTextWidgets provides widgets for displaying and editing text.
-It supports rich text as well as plain text.")
-    ;; dual licensed
-    (license (list license:lgpl2.0+ license:lgpl2.1+))))
+           qtspeech-5))))
 
 (define-public kwallet-6
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 52/63] gnu: Add kxmlgui-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kxmlgui-6): New variable.
(kxmlgui): Inherit above.

Change-Id: I4c52a7aed827af15b8ec358266caa4e765da9dae
---
 gnu/packages/kde-frameworks.scm | 83 ++++++++++++++++++++++++++-------
 1 file changed, 67 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6e67976f57..5cdfe68589 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -4398,8 +4398,68 @@ (define-public kwallet
            qca
            qtbase-5))))
 
+(define-public kxmlgui-6
+  (package
+    (name "kxmlgui")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "03fgqr6c9v9icjr4dyni9gqw4dhhidf2k0sm7bhirg6amlma0nw2"))))
+    (build-system cmake-build-system)
+    (propagated-inputs
+     (list kconfig-6 kconfigwidgets-6))
+    (native-inputs
+     (list extra-cmake-modules qttools))
+    (inputs
+     (list attica-6
+           kauth-6
+           kcodecs-6
+           kcolorscheme
+           kcoreaddons-6
+           kglobalaccel-6
+           kguiaddons-6
+           kiconthemes-6
+           kitemviews-6
+           ki18n-6
+           ktextwidgets-6
+           kwidgetsaddons-6
+           kwindowsystem-6
+           qtbase
+           qtdeclarative
+           sonnet-6))
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'check 'check-setup
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (with-output-to-file "autotests/BLACKLIST"
+                     (lambda _
+                       (for-each
+                        (lambda (name)
+                          (display (string-append "[" name "]\n*\n")))
+                        (list "testSpecificApplicationLanguageQLocale"
+                              "testToolButtonStyleNoXmlGui"
+                              "testToolButtonStyleXmlGui"))))
+                   (setenv "HOME" (getcwd))
+                   (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Framework for managing menu and toolbar actions")
+    (description "KXMLGUI provides a framework for managing menu and toolbar
+actions in an abstract way.  The actions are configured through a XML description
+and hooks in the application code.  The framework supports merging of multiple
+descriptions for integrating actions from plugins.")
+    ;; dual licensed
+    (license (list license:gpl2+ license:lgpl2.1+))))
+
 (define-public kxmlgui
   (package
+    (inherit kxmlgui-6)
     (name "kxmlgui")
     (version "5.114.0")
     (source (origin
@@ -4411,7 +4471,6 @@ (define-public kxmlgui
               (sha256
                (base32
                 "0gvjf32ssc0r0bdpb1912ldsr5rjls8vrscwy5gm9g5gw504hmmr"))))
-    (build-system cmake-build-system)
     (propagated-inputs
      (list kconfig kconfigwidgets))
     (native-inputs
@@ -4433,21 +4492,13 @@ (define-public kxmlgui
            sonnet))
     (arguments
      (list #:phases
-       #~(modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (setenv "HOME" (getcwd))
-               (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail
-               (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)")))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Framework for managing menu and toolbar actions")
-    (description "KXMLGUI provides a framework for managing menu and toolbar
-actions in an abstract way.  The actions are configured through a XML description
-and hooks in the application code.  The framework supports merging of multiple
-descriptions for integrating actions from plugins.")
-    ;; dual licensed
-    (license (list license:gpl2+ license:lgpl2.1+))))
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (setenv "HOME" (getcwd))
+                     (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail
+                     (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)")))))))))
 
 (define-public kxmlrpcclient
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 53/63] gnu: qtbase: propagate libxkbcommon.

[Zheng Junjie]

* gnu/packages/qt.scm (qtbase)[propagated-inputs]: prepend libxkbcommon.
[inputs]: Remove libxkbcommon-1.5.

Change-Id: I1bea99e4580242bb6e83cf43129ab49935ef79d3
---
 gnu/packages/qt.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 13af841455..fa1e016178 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1083,6 +1083,10 @@ (define-public qtbase
        (prepend tzdata-for-tests
                 wayland-protocols
                 xvfb-run)))
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs qtbase-5)
+       ;; Qt6::GuiPrivate require XKB::XKB
+       (prepend libxkbcommon)))
     (inputs
      (modify-inputs (package-inputs qtbase-5)
        (prepend at-spi2-core
@@ -1095,7 +1099,8 @@ (define-public qtbase
                 libxcb
                 libxext
                 xcb-util-cursor
-                `(,zstd "lib"))))
+                `(,zstd "lib"))
+       (delete "libxkbcommon")))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
-- 
2.41.0

[bug#70395] [PATCH kde-team 54/63] gnu: Add kirigami-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kirigami-6): New variable.
(kirigami): Inherit above.

Change-Id: Ie66574fecd1a40209f3ad55af1f63f841bfe27b0
---
 gnu/packages/kde-frameworks.scm | 39 ++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 5cdfe68589..897a866aaf 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1228,10 +1228,40 @@ (define-public kidletime
      (list libxscrnsaver ; X-Screensaver based poller, fallback mode
            qtbase-5 qtx11extras))))
 
+(define-public kirigami-6
+  (package
+    (name "kirigami")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    "kirigami-" version ".tar.xz"))
+              (sha256
+               (base32
+                "15kic2j2sq623pvm9sz5nigqwqvq6znhy0wwaxx89y3cdcc3hm1a"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules qttools))
+    (inputs
+     (list kwindowsystem-6
+           qtshadertools
+           qtbase
+           qtdeclarative
+           qtsvg))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "QtQuick components for mobile user interfaces")
+    (description "Kirigami is a set of high level QtQuick components looking
+and feeling well on both mobile and desktop devices.  They ease the creation
+of applications that follow the Kirigami Human Interface Guidelines.")
+    (license license:lgpl2.1+)))
+
 (define-public kirigami
   ;; Kirigami is listed as tier 1 framework, but optionally includes
   ;; plasma-framework which is tier 3.
   (package
+    (inherit kirigami-6)
     (name "kirigami")
     (version "5.114.0")
     (source (origin
@@ -1243,8 +1273,6 @@ (define-public kirigami
               (sha256
                (base32
                 "1bd232gs4394fa3aq31mjqrn8f3vjsghx7817szi7ryvnn6fnqkw"))))
-    (properties `((upstream-name . "kirigami2")))
-    (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules qttools-5))
     (inputs
@@ -1258,12 +1286,7 @@ (define-public kirigami
            qtsvg-5
            ;; Run-time dependency
            qtgraphicaleffects))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "QtQuick components for mobile user interfaces")
-    (description "Kirigami is a set of high level QtQuick components looking
-and feeling well on both mobile and desktop devices.  They ease the creation
-of applications that follow the Kirigami Human Interface Guidelines.")
-    (license license:lgpl2.1+)))
+    (properties `((upstream-name . "kirigami2")))))
 
 (define-public kitemmodels-6
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 55/63] gnu: Add qqc2-desktop-style-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (qqc2-desktop-style-6): New variable.
(qqc2-desktop-style): Inherit above.

Change-Id: Ibdb333a620bedd637e7c0369f053e14e0114cad7
---
 gnu/packages/kde-frameworks.scm | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 897a866aaf..35fe5a0004 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1952,8 +1952,50 @@ (define-public pulseaudio-qt
     ;; "any later version accepted by the membership of KDE e.V".
     (license (list license:lgpl2.1 license:lgpl3))))
 
+(define-public qqc2-desktop-style-6
+  (package
+    (name "qqc2-desktop-style")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1n922qg0kj7czykflkrjzxg7wfsaa3ybgj3xgqswm7hnz6y9l7g9"))))
+    (build-system qt-build-system)
+    (arguments
+     (list
+      #:qtbase qtbase
+      #:phases #~(modify-phases %standard-phases
+                   (replace 'check
+                     (lambda* (#:key tests? #:allow-other-keys)
+                       (when tests?
+                         (invoke "dbus-launch" "ctest"
+                                 "--rerun-failed" "--output-on-failure")))))))
+    (native-inputs
+     (list extra-cmake-modules dbus pkg-config qttools))
+    (inputs
+     (list kauth-6
+           kconfig-6 ; optional
+           kcoreaddons-6
+           kiconthemes-6 ; optional
+           kirigami-6
+           qtdeclarative
+           sonnet-6)) ; optional
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "QtQuickControls2 style that integrates with the desktop")
+    (description "This is a style for QtQuickControls2 which is using
+QWidget's QStyle to paint the controls in order to give it a native look and
+feel.")
+    ;; Mostly LGPL 2+, but many files are dual-licensed
+    (license (list license:lgpl2.1+ license:gpl3+))))
+
 (define-public qqc2-desktop-style
   (package
+    (inherit qqc2-desktop-style-6)
     (name "qqc2-desktop-style")
     (version "5.114.0")
     (source (origin
@@ -1966,6 +2008,7 @@ (define-public qqc2-desktop-style
                (base32
                 "1y5g91vybjvhwmzpfwrc70q5j7jxf5b972f9fh2vzb930jir6c8g"))))
     (build-system cmake-build-system)
+    (arguments '())
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
-- 
2.41.0

[bug#70395] [PATCH kde-team 56/63] gnu: Add modemmanager-qt-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (modemmanager-qt-6): New variable.
(modemmanager-qt): Inherit above.

Change-Id: I3e873ee7702962475470dc3c327370dcfc8b5776
---
 gnu/packages/kde-frameworks.scm | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 35fe5a0004..c50404c991 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1744,10 +1744,10 @@ (define-public kwindowsystem
            xcb-util-keysyms
            xcb-util-wm))))
 
-(define-public modemmanager-qt
+(define-public modemmanager-qt-6
   (package
     (name "modemmanager-qt")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1756,7 +1756,7 @@ (define-public modemmanager-qt
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "16jqhmcpsffl9a7c0bb4hwjy3bw5rakdsnc5n6y8djc6237jl9pi"))))
+                "0w29bzmqb3fl7kws4lm9wrl76aw4y67783y6sij8l341ppsswfw5"))))
     (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules dbus pkg-config))
@@ -1764,7 +1764,7 @@ (define-public modemmanager-qt
      ;; Headers contain #include <ModemManager/ModemManager.h>
      (list modem-manager))
     (inputs
-     (list qtbase-5))
+     (list qtbase))
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (replace 'check
@@ -1780,6 +1780,29 @@ (define-public modemmanager-qt
 messages.")
     (license license:lgpl2.1+)))
 
+(define-public modemmanager-qt
+  (package
+    (inherit modemmanager-qt-6)
+    (name "modemmanager-qt")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "16jqhmcpsffl9a7c0bb4hwjy3bw5rakdsnc5n6y8djc6237jl9pi"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules dbus pkg-config))
+    (propagated-inputs
+     ;; Headers contain #include <ModemManager/ModemManager.h>
+     (list modem-manager))
+    (inputs
+     (list qtbase-5))))
+
 (define-public networkmanager-qt-6
   (package
     (name "networkmanager-qt")
-- 
2.41.0

[bug#70395] [PATCH kde-team 57/63] gnu: libavif: Update to 1.0.4.

[Zheng Junjie]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1467 bytes --]

* gnu/packages/image.scm (libavif): Update to 1.0.4.

Change-Id: Ia7df45def24d548ee5d2ab28d9554df6e0c7aa22
---
 gnu/packages/image.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index fae45363ad..392a043cbd 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -35,7 +35,7 @@
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024 chris <chris@bumblehead.com>
@@ -2457,7 +2457,7 @@ (define-public icoutils
 (define-public libavif
   (package
     (name "libavif")
-    (version "0.11.1")
+    (version "1.0.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2466,7 +2466,7 @@ (define-public libavif
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "02zmb62g0yx6rfz4w1isyzfrckv5i7dzyz26rp2mspbx9w6v8j4r"))))
+                "0k72q7yvfdn92wkslyifw14319nm981a8r3kd84i4ylxmrkgi0zm"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

[bug#70395] [PATCH kde-team 58/63] gnu: libraw: Update to 0.21.2.

[Zheng Junjie]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1309 bytes --]

* gnu/packages/photo.scm (libraw): Update to 0.21.2.

Change-Id: I0d2932395feffed323a47db1d954d4bbf14ef128
---
 gnu/packages/photo.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 1018d2e801..3281ee18a4 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -186,14 +187,14 @@ (define-public rapid-photo-downloader
 (define-public libraw
   (package
     (name "libraw")
-    (version "0.20.0")
+    (version "0.21.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.libraw.org/data/LibRaw-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"))))
+                "00sbscniqrwj341gyvzkgcidfkmscgxx05s4dsplp186680qhwpy"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
-- 
2.41.0

[bug#70395] [PATCH kde-team 59/63] gnu: Add kimageformats-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kimageformats-6): New variable.
(kimageformats): Inherit above.

Change-Id: I1766a88c87b1a5c1ce5656d10d2044d090d9586c
---
 gnu/packages/kde-frameworks.scm | 61 ++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index c50404c991..b49a23f022 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2689,8 +2689,53 @@ (define-public kimageannotator
     (description "This library provides tools to annotate images.")
     (license license:lgpl3+)))
 
+(define-public kimageformats-6
+  (package
+    (name "kimageformats")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0pn9zjx18jmbdbpdskchwy0vi9clra4jls6d3dz6bjdli82zlcxh"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules pkg-config))
+    (inputs
+     (list karchive-6 ; for Krita and OpenRaster images
+           openexr ; for OpenEXR high dynamic-range images
+           qtbase
+           libjxl
+           libraw
+           libavif
+           ;; see https://bugs.kde.org/show_bug.cgi?id=468288,
+           ;; kimageformats-read-psd test need QTiffPlugin
+           qtimageformats
+           ;; FIXME: make openexr propagate two package
+           imath zlib))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              ;; make Qt render "offscreen", required for tests
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Plugins to allow QImage to support extra file formats")
+    (description "This framework provides additional image format plugins for
+QtGui.  As such it is not required for the compilation of any other software,
+but may be a runtime requirement for Qt-based software to support certain image
+formats.")
+    (license license:lgpl2.1+)))
+
 (define-public kimageformats
   (package
+    (inherit kimageformats-6)
     (name "kimageformats")
     (version "5.114.0")
     (source (origin
@@ -2708,7 +2753,8 @@ (define-public kimageformats
     (inputs
      (list karchive ; for Krita and OpenRaster images
            openexr-2 ; for OpenEXR high dynamic-range images
-           qtbase-5))
+           qtbase-5
+           qtimageformats-5))
     (arguments
      (list
       #:phases
@@ -2716,18 +2762,7 @@ (define-public kimageformats
           (add-before 'check 'check-setup
             (lambda _
               ;; make Qt render "offscreen", required for tests
-              (setenv "QT_QPA_PLATFORM" "offscreen")
-              (setenv "QT_PLUGIN_PATH"
-                      (string-append (getcwd) "/bin:"
-                                     (getenv "QT_PLUGIN_PATH")))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (setenv "HOME"
-                        (getcwd))
-                ;; FIXME: I guess kde's qt no this fail.
-                ;; see https://invent.kde.org/frameworks/kimageformats/-/jobs/1046283
-                (invoke "ctest" "-E" "kimageformats-read-psd")))))
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))
       ;; FIXME: The header files of ilmbase (propagated by openexr) are not
       ;; found when included by the header files of openexr, and an explicit
       ;; flag needs to be set.
-- 
2.41.0

[bug#70395] [PATCH kde-team 60/63] gnu: Add ksvg.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (ksvg): New variable.

Change-Id: Ia3cf9d73db7876e5fc6568dc7a487b7f968b6b3b
---
 gnu/packages/kde-frameworks.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b49a23f022..b36c05d19d 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1444,6 +1444,39 @@ (define-public kplotting
      (list extra-cmake-modules qttools-5))
     (arguments '())))
 
+(define-public ksvg
+  (package
+    (name "ksvg")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0pvb3fvzxc3niny9cqwvbvpkgj4x1r62pkd3c0cpd3b7r0g8wsi8"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules qttools))
+    (inputs
+     (list
+      qtdeclarative
+      qtsvg
+      karchive-6
+      kconfig-6
+      kcolorscheme
+      kcoreaddons-6
+      kguiaddons-6
+      kirigami-6))
+    (arguments (list #:qtbase qtbase))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Components for handling SVGs")
+    (description "A library for rendering SVG-based themes with stylesheet
+re-coloring and on-disk caching.")
+    (license license:lgpl2.1+)))
+
 (define-public ksyntaxhighlighting-6
   (package
     (name "ksyntaxhighlighting")
-- 
2.41.0

[bug#70395] [PATCH kde-team 61/63] gnu: Add kbookmarks-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kbookmarks-6): New variable.
(kbookmarks): Inherit above.

Change-Id: Ic6da85eb1dd714c843f6878f208435765ec88b65
---
 gnu/packages/kde-frameworks.scm | 61 +++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b36c05d19d..875f9df88e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3259,8 +3259,53 @@ (define-public kactivities-stats
     ;; triple licensed
     (license (list license:lgpl2.0+ license:lgpl2.1+ license:lgpl3+))))
 
+(define-public kbookmarks-6
+  (package
+    (name "kbookmarks")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0is75mhvfahay0xbbckwsa7jwlf4j6c7gdxl6i4fiqy12wr5cqxp"))))
+    (build-system cmake-build-system)
+    (propagated-inputs
+     (list kwidgetsaddons-6))
+    (native-inputs
+     (list extra-cmake-modules qttools))
+    (inputs
+     (list kauth-6
+           kcodecs-6
+           kconfig-6
+           kconfigwidgets-6
+           kcoreaddons-6
+           kiconthemes-6
+           kcolorscheme
+           kxmlgui-6
+           qtdeclarative
+           qtbase))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "HOME" (getcwd))
+              ;; make Qt render "offscreen", required for tests
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Bookmarks management library")
+    (description "KBookmarks lets you access and manipulate bookmarks stored
+using the XBEL format.")
+    (license license:lgpl2.1+)))
+
 (define-public kbookmarks
   (package
+    (inherit kbookmarks-6)
     (name "kbookmarks")
     (version "5.114.0")
     (source (origin
@@ -3272,7 +3317,6 @@ (define-public kbookmarks
               (sha256
                (base32
                 "06lnsyjhh80mdcqjww40glinmrjydbmkhv27a267vf34r7kam9rc"))))
-    (build-system cmake-build-system)
     (propagated-inputs
      (list kwidgetsaddons))
     (native-inputs
@@ -3285,20 +3329,7 @@ (define-public kbookmarks
            kcoreaddons
            kiconthemes
            kxmlgui
-           qtbase-5))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             (setenv "HOME" (getcwd))
-             ;; make Qt render "offscreen", required for tests
-             (setenv "QT_QPA_PLATFORM" "offscreen"))))))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Bookmarks management library")
-    (description "KBookmarks lets you access and manipulate bookmarks stored
-using the XBEL format.")
-    (license license:lgpl2.1+)))
+           qtbase-5))))
 
 (define-public kcmutils
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 62/63] gnu: Add kdesu-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kdesu-6): New variable.
(kdesu): Inherit above.

Change-Id: I74f948875022b71bcdc54aa31ca4613e24ebfdff
---
 gnu/packages/kde-frameworks.scm | 38 +++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 875f9df88e..84222a495d 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3606,10 +3606,10 @@ (define-public kdesignerplugin
 ini-style description files.")
     (license license:lgpl2.1+)))
 
-(define-public kdesu
+(define-public kdesu-6
   (package
     (name "kdesu")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3618,14 +3618,17 @@ (define-public kdesu
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr"))))
-    (build-system cmake-build-system)
+                "0zl2p9319r8q85p3j64w7p7nmjh53z6fha8kkgf3fdfdikh9g8x6"))))
+    (build-system qt-build-system)
     (propagated-inputs
-     (list kpty))
+     (list kpty-6))
     (native-inputs
      (list extra-cmake-modules))
     (inputs
-     (list kconfig kcoreaddons ki18n kservice qtbase-5))
+     (list kconfig-6 kcoreaddons-6 ki18n-6 kservice-6))
+    (arguments (list
+                #:tests? #f ;; FIXME: kdesutest test fail.
+                #:qtbase qtbase))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "User interface for running shell commands with root privileges")
     (description "KDESU provides functionality for building GUI front ends for
@@ -3633,6 +3636,29 @@ (define-public kdesu
 with su and ssh respectively.")
     (license license:lgpl2.1+)))
 
+(define-public kdesu
+  (package
+    (inherit kdesu-6)
+    (name "kdesu")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr"))))
+    (build-system cmake-build-system)
+    (propagated-inputs
+     (list kpty))
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list kconfig kcoreaddons ki18n kservice qtbase-5))
+    (arguments '())))
+
 (define-public kemoticons
   (package
     (name "kemoticons")
-- 
2.41.0

[bug#70395] [PATCH kde-team 63/63] gnu: Add kded-6.

[Zheng Junjie]

* gnu/packages/kde-frameworks.scm (kded-6): New variable.
(kded): Inherit above.

Change-Id: Ib35f76394754e778caa165e379fe75d45488da86
---
 gnu/packages/kde-frameworks.scm | 43 ++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 84222a495d..ee9c63c6cf 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3545,8 +3545,41 @@ (define-public kdeclarative
     ;; dual licensed
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public kded-6
+  (package
+    (name "kded")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "18cv25xyhs5b31mvh3k6vvzm163893ra6nvfjbd1jp4r6vr0x3di"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules kdoctools-6))
+    (inputs
+     (list kconfig-6
+           kcoreaddons-6
+           kcrash-6
+           kdbusaddons-6
+           kdoctools-6
+           kservice-6
+           qtbase))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Central daemon of KDE work spaces")
+    (description "KDED stands for KDE Daemon.  KDED runs in the background and
+performs a number of small tasks.  Some of these tasks are built in, others are
+started on demand.")
+    ;; dual licensed
+    (license (list license:lgpl2.0+ license:lgpl2.1+))))
+
 (define-public kded
   (package
+    (inherit kded-6)
     (name "kded")
     (version "5.114.0")
     (source (origin
@@ -3558,7 +3591,6 @@ (define-public kded
               (sha256
                (base32
                 "00n4isc4ahii0ldrg761lkmnq27kmrfqs9zkmpvmgbg57259mvc3"))))
-    (build-system cmake-build-system)
     (native-inputs
      (list extra-cmake-modules kdoctools))
     (inputs
@@ -3568,14 +3600,7 @@ (define-public kded
            kdbusaddons
            kdoctools
            kservice
-           qtbase-5))
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Central daemon of KDE work spaces")
-    (description "KDED stands for KDE Daemon.  KDED runs in the background and
-performs a number of small tasks.  Some of these tasks are built in, others are
-started on demand.")
-    ;; dual licensed
-    (license (list license:lgpl2.0+ license:lgpl2.1+))))
+           qtbase-5))))
 
 (define-public kdesignerplugin
   (package
-- 
2.41.0

[bug#70395] [PATCH kde-team 53/63] gnu: qtbase: propagate libxkbcommon.

[Maxim Cournoyer]

Hello Zheng,

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> * gnu/packages/qt.scm (qtbase)[propagated-inputs]: prepend libxkbcommon.
> [inputs]: Remove libxkbcommon-1.5.
>
> Change-Id: I1bea99e4580242bb6e83cf43129ab49935ef79d3
> ---
>  gnu/packages/qt.scm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index 13af841455..fa1e016178 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -1083,6 +1083,10 @@ (define-public qtbase
>         (prepend tzdata-for-tests
>                  wayland-protocols
>                  xvfb-run)))
> +    (propagated-inputs
> +     (modify-inputs (package-propagated-inputs qtbase-5)
> +       ;; Qt6::GuiPrivate require XKB::XKB

Could you be more explicit here?  This is a CMake imported target
dependency?  Can't XKB be patched in the CMake files to avoid having to
propagate it?  Propagation is best avoided unless it's not technically
possible to do so.

> +       (prepend libxkbcommon)))
>      (inputs
>       (modify-inputs (package-inputs qtbase-5)
>         (prepend at-spi2-core
> @@ -1095,7 +1099,8 @@ (define-public qtbase
>                  libxcb
>                  libxext
>                  xcb-util-cursor
> -                `(,zstd "lib"))))
> +                `(,zstd "lib"))
> +       (delete "libxkbcommon")))

I've noticed the annoyance of having to add libxkbcommon to seemingly
every Qt 6 package, so I'm happy this will get resolved.

-- 
Thanks,
Maxim