diff options
author | Ludovic Courtès <ludo@gnu.org> | 2025-01-04 18:51:17 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2025-01-14 14:11:42 +0100 |
commit | f5fa65b3e99e02dcc371e9989c8b54fecc6c06c0 (patch) | |
tree | e35ce443c9556c513e7641252fb02668f1b7d961 /gnu | |
parent | 4593303db71f7f42795d7bbb847501f4731b34f2 (diff) |
gnu: gpgme: Remove 1.23 and update KDE users.
* gnu/packages/gnupg.scm (gpgme-1.23): Remove.
(qgpgme-qt6-1.23): Rename to…
(qgpgme-qt6): … this, and inherit from ‘gpgme’.
* gnu/packages/kde-pim.scm (kaddressbook, kgpg)
(kleopatra, kmail, kmessagelib, libkleo): Update accordingly.
* gnu/packages/kde-plasma.scm (plasma-pass): Likewise.
* gnu/packages/kde.scm (akregator): Likewise.
Change-Id: Ib79b26026a84533da1054da90a5b991dbdaf8a2e
Suggested-by: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/gnupg.scm | 23 | ||||
-rw-r--r-- | gnu/packages/kde-pim.scm | 24 | ||||
-rw-r--r-- | gnu/packages/kde-plasma.scm | 2 | ||||
-rw-r--r-- | gnu/packages/kde.scm | 4 |
4 files changed, 20 insertions, 33 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2fa92ea222..aa8b5e4892 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -468,19 +468,6 @@ instead. This way bug fixes or improvements can be done at a central place and every application benefits from this.") (license license:lgpl2.1+))) -(define-public gpgme-1.23 - (hidden-package - (package - (inherit gpgme) - (name "gpgme") - (version "1.23.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2")) - (sha256 - (base32 "092jrqdmdggjhl0swpvci8cscdcx0hbbr897an0vdk1wyfqyi6cl"))))))) - (define-public qgpgme (package (inherit gpgme) @@ -510,9 +497,9 @@ QGpgME was originally developed as part of libkleo and incorporated into gpgpme starting with version 1.7.") (license license:gpl2+))) ;; Note: this differs from gpgme -(define-public qgpgme-qt6-1.23 +(define-public qgpgme-qt6 (package - (inherit gpgme-1.23) + (inherit gpgme) (name "qgpgme-qt6") (arguments `(#:phases @@ -525,12 +512,12 @@ gpgpme starting with version 1.7.") (symlink (string-append gpgme "/lib/libgpgme.la") "src/libgpgme.la")) (chdir "lang/qt")))))) - (propagated-inputs (list gpgme-1.23)) ;required by QGpgmeConfig.cmake + (propagated-inputs (list gpgme)) ;required by QGpgmeConfig.cmake (native-inputs - (modify-inputs (package-native-inputs gpgme-1.23) + (modify-inputs (package-native-inputs gpgme) (prepend pkg-config))) (inputs - (modify-inputs (package-inputs gpgme-1.23) + (modify-inputs (package-inputs gpgme) (prepend qtbase))) (synopsis "Qt API bindings for gpgme") (description "QGpgme provides a very high level Qt API around GpgMEpp.") diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 5d546b7d4c..00a3397b5d 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -526,7 +526,7 @@ information.") akonadi-mime akonadi-search boost - gpgme-1.23 + gpgme grantleetheme kcalendarcore kcmutils @@ -551,7 +551,7 @@ information.") libkleo breeze-icons ; default icon set, required for tests prison - qgpgme-qt6-1.23)) + qgpgme-qt6)) (arguments (list #:qtbase qtbase)) (home-page "https://kontact.kde.org/components/kaddressbook/") (synopsis "Address Book application to manage your contacts") @@ -879,7 +879,7 @@ package.") akonadi-contacts boost breeze-icons ;; default icon set - gpgme-1.23 + gpgme grantleetheme karchive kcodecs @@ -1104,7 +1104,7 @@ protocol for querying and modifying directory services running over TCP/IP.") kdoctools)) (inputs (list boost - gpgme-1.23 + gpgme kcmutils kcodecs kconfig @@ -1127,7 +1127,7 @@ protocol for querying and modifying directory services running over TCP/IP.") libkleo mimetreeparser breeze-icons ;; default icon set - qgpgme-qt6-1.23)) + qgpgme-qt6)) (arguments (list #:qtbase qtbase #:phases @@ -1164,7 +1164,7 @@ and retrieving certificates from LDAP servers.") akonadi-mime akonadi-search boost - gpgme-1.23 + gpgme grantleetheme kaddressbook kbookmarks @@ -1214,7 +1214,7 @@ and retrieving certificates from LDAP servers.") libkleo libksieve breeze-icons ; default icon set, required for tests - qgpgme-qt6-1.23 + qgpgme-qt6 qtdeclarative qtkeychain-qt6 qtwebchannel @@ -1514,7 +1514,7 @@ using a Qt/KMime C++ API.") akonadi-notes akonadi-search boost - gpgme-1.23 + gpgme grantleetheme karchive kcalendarcore @@ -1547,7 +1547,7 @@ using a Qt/KMime C++ API.") kxmlgui libgravatar qca-qt6 - qgpgme-qt6-1.23 + qgpgme-qt6 qtdeclarative qtwebchannel qtwebengine @@ -2157,7 +2157,7 @@ various Google services.") (list extra-cmake-modules kdoctools qttools)) (inputs (list boost - gpgme-1.23 + gpgme kcodecs kcompletion kconfig @@ -2169,9 +2169,9 @@ various Google services.") kwidgetsaddons kwindowsystem kpimtextedit - qgpgme-qt6-1.23)) + qgpgme-qt6)) (propagated-inputs - (list gpgme-1.23 qgpgme-qt6-1.23)) + (list gpgme qgpgme-qt6)) (arguments (list #:qtbase qtbase diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 817126f3e1..cfbb106697 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -2440,7 +2440,7 @@ PulseAudio.") libplasma oath-toolkit plasma5support - qgpgme-qt6-1.23 + qgpgme-qt6 qtdeclarative)) (arguments (list #:qtbase qtbase #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 62e43c6afd..30e79dc59f 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -224,7 +224,7 @@ This package contains GUI widgets for baloo.") bash-minimal boost breeze-icons - gpgme-1.23 + gpgme grantleetheme kcmutils kcontacts @@ -246,7 +246,7 @@ This package contains GUI widgets for baloo.") kuserfeedback libkdepim libkleo - qgpgme-qt6-1.23 + qgpgme-qt6 qtdeclarative qtwebchannel qtwebengine |