From c987080c8872ee99b72789692cc3b406a9dbd6f5 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 7 Oct 2025 14:50:12 +0530 Subject: [PATCH] gnu: qca, qca-qt6: Move to kde-frameworks.scm. * gnu/packages/kde.scm: Remove file. * gnu/local.mk: Deregister it. * po/packages/POTFILES.in: Ditto. * gnu/packages/kde-frameworks.scm (qca): New variable. (qca-qt6): Ditto. * gnu/packages/geo.scm: Replace (gnu packages kde) with (gnu packages kde-frameworks). * gnu/packages/messaging.scm: Ditto. * gnu/packages/web.scm: Ditto. * gnu/packages/irc.scm: Remove reference to (gnu packages kde) module. * gnu/packages/kde-education.scm: Ditto. * gnu/packages/kde-games.scm: Ditto. * gnu/packages/kde-graphics.scm: Ditto. * gnu/packages/kde-internet.scm: Ditto. * gnu/packages/kde-office.scm: Ditto. * gnu/packages/kde-pim.scm: Ditto. * gnu/packages/kde-plasma.scm: Ditto. * gnu/packages/kde-systemtools.scm: Ditto. * gnu/packages/kde-utils.scm: Ditto. * gnu/services/desktop.scm: Ditto. Change-Id: Ib632bc46588a2400c61fd549389001ff367c0d66 --- gnu/local.mk | 1 - gnu/packages/geo.scm | 2 +- gnu/packages/irc.scm | 1 - gnu/packages/kde-education.scm | 1 - gnu/packages/kde-frameworks.scm | 33 ++++++++- gnu/packages/kde-games.scm | 1 - gnu/packages/kde-graphics.scm | 1 - gnu/packages/kde-internet.scm | 1 - gnu/packages/kde-office.scm | 1 - gnu/packages/kde-pim.scm | 1 - gnu/packages/kde-plasma.scm | 1 - gnu/packages/kde-systemtools.scm | 1 - gnu/packages/kde-utils.scm | 1 - gnu/packages/kde.scm | 116 ------------------------------- gnu/packages/messaging.scm | 2 +- gnu/packages/web.scm | 2 +- gnu/services/desktop.scm | 1 - po/packages/POTFILES.in | 1 - 18 files changed, 35 insertions(+), 133 deletions(-) delete mode 100644 gnu/packages/kde.scm diff --git a/gnu/local.mk b/gnu/local.mk index b3d00de1a2852acc130e34503e7b36fec88a284c..6f29186ea1be3765a7dd6bd950b10d6ef665a714 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -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 \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 791182325c4f86c952729253ca51086fe9afc0c9..36d1ec1d4908bd7483e9e42da67890a54e13fd12 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -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) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 407ff5c9c6998a7937bc530add544170f60feff7..a54656e4406b1c3f6e2d41d830ff18c7d4abea3d 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -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) diff --git a/gnu/packages/kde-education.scm b/gnu/packages/kde-education.scm index 5765c35bf5425863c4b7a315764e691b24c2e4d1..d59bc3c93d261553606247b1491e61c5fdcc540b 100644 --- a/gnu/packages/kde-education.scm +++ b/gnu/packages/kde-education.scm @@ -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) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ed42c8a62291fb1ec16620c073dcbcebd003747e..22c72388365d762c74e7c5a8f5f486c465e06db2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -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 ;; diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 442e09bedfb3f19a92ee9ef5f46d9e73bb299319..2e3ce025790754dff9e587e371d4bb7904c2e4d2 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -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) diff --git a/gnu/packages/kde-graphics.scm b/gnu/packages/kde-graphics.scm index 5a6e1f9089c2101dc969dfcc30d7cc948c68d0e5..ab9d9274079feffa129cfb9affeb5001e765ba91 100644 --- a/gnu/packages/kde-graphics.scm +++ b/gnu/packages/kde-graphics.scm @@ -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) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 12a5ddac67c8e9cdeaa4ae08537dbaa454838480..074fad3c45c3dd73925a76a25542456e274d4f22 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -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) diff --git a/gnu/packages/kde-office.scm b/gnu/packages/kde-office.scm index 0e421109f20ef7a07688959d9d5b215ac388c85a..7eb7da7175bfd28bda008fd57ab9ddb2ce633bec 100644 --- a/gnu/packages/kde-office.scm +++ b/gnu/packages/kde-office.scm @@ -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) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 007bbdb8f8614998061be75f4d5809055607ecec..6a4732f72c2d98f18f08b9054e0b6007b1d753f0 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -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) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 8b85218945dea0624f28b9e3fbca55b55148511c..b7e87cace0c33f88b2230376552ef1eb966d35ca 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -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) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 47240c7bc7c1f96469ef027f856714ee14cf1eca..8d3b3c8d49a3482cc5c3c07f45ecdb1cd40b0916 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -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) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index a8cae518ede874328f20f6c93df5c46a74d89423..b17bf826f95c13979196b7707782f9bfcc8c39bc 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -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) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm deleted file mode 100644 index 6b01cd75c7e8d72810b8c2d416ca668d9b61d72f..0000000000000000000000000000000000000000 --- a/gnu/packages/kde.scm +++ /dev/null @@ -1,116 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2019-2021, 2023 Efraim Flashner -;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017 Thomas Danckaert -;;; Copyright © 2017, 2018 Mark Meyer -;;; Copyright © 2017–2021 Tobias Geerinckx-Rice -;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2019 Nicolas Goaziou -;;; Copyright © 2018, 2019, 2020 Hartmut Goebel -;;; Copyright © 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020, 2021, 2022 Michael Rohleder -;;; Copyright © 2020 Prafulla Giri -;;; Copyright © 2020-2025 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2021 Alexandros Theodotou -;;; Copyright © 2021 la snesne -;;; Copyright © 2021, 2022, 2023, 2024, 2025 Vinicius Monego -;;; Copyright © 2022 Brendan Tildesley -;;; Copyright © 2022 Petr Hodina -;;; Copyright © 2023 Mehmet Tekman -;;; Copyright © 2024 Remco van 't Veer -;;; Copyright © 2025 Sughosha -;;; Copyright © 2025 Junker -;;; -;;; 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 . - -(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)))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 16ed53317fe42bd8679078710326868f58eb63a0..842fa5bc0496391c93bfd230ddd5f39cd4e69867 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -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) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bd5d67f2d7b29af8359da85b453578b087f009ba..b916ea3ecc1913d3fab6cb089b124dac899c0d37 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -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) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 1fff153a4008be30cc382e63391b97a35d5ec193..b879522e700a8582562f2104e40bb7f250e423f6 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -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) diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 8efd8a9e781ce6e86c1c6888b324303853d275e5..a472c95746d392a6a41a5b2211b1fddc0e744ee6 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -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