~ruther/guix-local: gnu: qca, qca-qt6: Move to kde-frameworks.scm.

18 files changed, 35 insertions(+), 133 deletions(-)

M gnu/local.mk
M gnu/packages/geo.scm
M gnu/packages/irc.scm
M gnu/packages/kde-education.scm
M gnu/packages/kde-frameworks.scm
M gnu/packages/kde-games.scm
M gnu/packages/kde-graphics.scm
M gnu/packages/kde-internet.scm
M gnu/packages/kde-office.scm
M gnu/packages/kde-pim.scm
M gnu/packages/kde-plasma.scm
M gnu/packages/kde-systemtools.scm
M gnu/packages/kde-utils.scm
D gnu/packages/kde.scm
M gnu/packages/messaging.scm
M gnu/packages/web.scm
M gnu/services/desktop.scm
M po/packages/POTFILES.in

M gnu/local.mk => gnu/local.mk +0 -1

@@ 403,7 403,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/julia-xyz.scm			\
   %D%/packages/jupyter.scm			\
   %D%/packages/kawa.scm				\
-  %D%/packages/kde.scm				\
   %D%/packages/kde-education.scm		\
   %D%/packages/kde-frameworks.scm		\
   %D%/packages/kde-games.scm			\

M gnu/packages/geo.scm => gnu/packages/geo.scm +1 -1

@@ 118,7 118,7 @@
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages java)
-  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)

M gnu/packages/irc.scm => gnu/packages/irc.scm +0 -1

@@ 92,7 92,6 @@
   #:use-module (gnu packages messaging)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages openldap)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-internet)
   #:use-module (gnu packages password-utils)

M gnu/packages/kde-education.scm => gnu/packages/kde-education.scm +0 -1

@@ 34,7 34,6 @@
   #:use-module (gnu packages geo)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gps)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-multimedia)
   #:use-module (gnu packages kde-plasma)

M gnu/packages/kde-frameworks.scm => gnu/packages/kde-frameworks.scm +32 -1

@@ 71,7 71,6 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages kerberos)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages kde-multimedia)
   #:use-module (gnu packages kde-plasma)


@@ 357,6 356,38 @@ accessibility clients such as screen readers.")
     (inputs (modify-inputs (package-inputs libqaccessibilityclient)
               (replace "qtbase" qtbase-5)))))
 
+(define-public qca
+  (package
+    (name "qca")
+    (version "2.3.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/qca/" version
+                            "/qca-" version ".tar.xz"))
+        (sha256
+         (base32 "0kkf8wyc7slii86danfl4cx59yhcyc363ydiwapnnyyxihlxamf5"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list openssl qtbase-5))
+    (home-page "https://userbase.kde.org/QCA")
+    (synopsis "Libraries for the Qt Cryptographic Architecture")
+    (description "The Qt Cryptographic Architecture (QCA) provides a
+straightforward and cross-platform API for a range of cryptographic features,
+including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart
+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))))
+
 
 ;; Tier 1
 ;;

M gnu/packages/kde-games.scm => gnu/packages/kde-games.scm +0 -1

@@ 36,7 36,6 @@
   #:use-module (gnu packages games)
   #:use-module (gnu packages gl)
   #:use-module ((gnu packages freedesktop) #:select (shared-mime-info))
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-multimedia)
   #:use-module (gnu packages kde-plasma)

M gnu/packages/kde-graphics.scm => gnu/packages/kde-graphics.scm +0 -1

@@ 52,7 52,6 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages image-processing)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-education)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-pim)

M gnu/packages/kde-internet.scm => gnu/packages/kde-internet.scm +0 -1

@@ 42,7 42,6 @@
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages kde-multimedia)

M gnu/packages/kde-office.scm => gnu/packages/kde-office.scm +0 -1

@@ 35,7 35,6 @@
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages hunspell)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-graphics)

M gnu/packages/kde-pim.scm => gnu/packages/kde-pim.scm +0 -1

@@ 48,7 48,6 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-multimedia)
   #:use-module (gnu packages kde-plasma)

M gnu/packages/kde-plasma.scm => gnu/packages/kde-plasma.scm +0 -1

@@ 63,7 63,6 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages iso-codes)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-internet)

M gnu/packages/kde-systemtools.scm => gnu/packages/kde-systemtools.scm +0 -1

@@ 37,7 37,6 @@
   #:use-module (gnu packages cryptsetup)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-plasma)
   #:use-module (gnu packages linux)

M gnu/packages/kde-utils.scm => gnu/packages/kde-utils.scm +0 -1

@@ 48,7 48,6 @@
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-multimedia)
   #:use-module (gnu packages kde-pim)

D gnu/packages/kde.scm => gnu/packages/kde.scm +0 -116

@@ 1,116 0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2019-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
-;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org>
-;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
-;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2018, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
-;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
-;;; Copyright © 2020-2025 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
-;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
-;;; Copyright © 2021, 2022, 2023, 2024, 2025 Vinicius Monego <monego@posteo.net>
-;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
-;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2023 Mehmet Tekman <mtekman89@gmail.com>
-;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net>
-;;; Copyright © 2025 Sughosha <sughosha@disroot.org>
-;;; Copyright © 2025 Junker <dk@junkeria.club>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages kde)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system qt)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix utils)
-  #:use-module (guix packages)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages audio)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages bash)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages check)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages ghostscript)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages graphics)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages kde-frameworks)
-  #:use-module (gnu packages kde-graphics)
-  #:use-module (gnu packages kde-multimedia)
-  #:use-module (gnu packages kde-pim)
-  #:use-module (gnu packages kde-plasma)
-  ;; Including this module breaks the build.
-  ;#:use-module ((gnu packages kde-systemtools) #:select (dolphin))
-  #:use-module (gnu packages pdf)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages qt)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages video)
-  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg))
-
-(define-public qca
-  (package
-    (name "qca")
-    (version "2.3.9")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "mirror://kde/stable/qca/" version
-                            "/qca-" version ".tar.xz"))
-        (sha256
-         (base32 "0kkf8wyc7slii86danfl4cx59yhcyc363ydiwapnnyyxihlxamf5"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list openssl qtbase-5))
-    (home-page "https://userbase.kde.org/QCA")
-    (synopsis "Libraries for the Qt Cryptographic Architecture")
-    (description "The Qt Cryptographic Architecture (QCA) provides a
-straightforward and cross-platform API for a range of cryptographic features,
-including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart
-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))))

M gnu/packages/messaging.scm => gnu/packages/messaging.scm +1 -1

@@ 111,7 111,7 @@
   #:use-module (gnu packages hunspell)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages less)
   #:use-module (gnu packages libcanberra)

M gnu/packages/web.scm => gnu/packages/web.scm +1 -1

@@ 174,7 174,7 @@
   #:use-module (gnu packages java)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages imagemagick)
-  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libbsd)
   #:use-module (gnu packages libevent)

M gnu/services/desktop.scm => gnu/services/desktop.scm +0 -1

@@ 63,7 63,6 @@
   #:use-module (gnu packages cups)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gnome)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-plasma)
   #:use-module (gnu packages pulseaudio)

M po/packages/POTFILES.in => po/packages/POTFILES.in +0 -1

@@ 225,7 225,6 @@ gnu/packages/kde-internet.scm
 gnu/packages/kde-multimedia.scm
 gnu/packages/kde-pim.scm
 gnu/packages/kde-plasma.scm
-gnu/packages/kde.scm
 gnu/packages/kerberos.scm
 gnu/packages/kodi.scm
 gnu/packages/language.scm