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>
This commit is contained in:
Ludovic Courtès 2025-01-04 18:51:17 +01:00
parent 4593303db7
commit f5fa65b3e9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 20 additions and 33 deletions

View file

@ -468,19 +468,6 @@ instead. This way bug fixes or improvements can be done at a central place
and every application benefits from this.") and every application benefits from this.")
(license license:lgpl2.1+))) (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 (define-public qgpgme
(package (package
(inherit gpgme) (inherit gpgme)
@ -510,9 +497,9 @@ QGpgME was originally developed as part of libkleo and incorporated into
gpgpme starting with version 1.7.") gpgpme starting with version 1.7.")
(license license:gpl2+))) ;; Note: this differs from gpgme (license license:gpl2+))) ;; Note: this differs from gpgme
(define-public qgpgme-qt6-1.23 (define-public qgpgme-qt6
(package (package
(inherit gpgme-1.23) (inherit gpgme)
(name "qgpgme-qt6") (name "qgpgme-qt6")
(arguments (arguments
`(#:phases `(#:phases
@ -525,12 +512,12 @@ gpgpme starting with version 1.7.")
(symlink (string-append gpgme "/lib/libgpgme.la") (symlink (string-append gpgme "/lib/libgpgme.la")
"src/libgpgme.la")) "src/libgpgme.la"))
(chdir "lang/qt")))))) (chdir "lang/qt"))))))
(propagated-inputs (list gpgme-1.23)) ;required by QGpgmeConfig.cmake (propagated-inputs (list gpgme)) ;required by QGpgmeConfig.cmake
(native-inputs (native-inputs
(modify-inputs (package-native-inputs gpgme-1.23) (modify-inputs (package-native-inputs gpgme)
(prepend pkg-config))) (prepend pkg-config)))
(inputs (inputs
(modify-inputs (package-inputs gpgme-1.23) (modify-inputs (package-inputs gpgme)
(prepend qtbase))) (prepend qtbase)))
(synopsis "Qt API bindings for gpgme") (synopsis "Qt API bindings for gpgme")
(description "QGpgme provides a very high level Qt API around GpgMEpp.") (description "QGpgme provides a very high level Qt API around GpgMEpp.")

View file

@ -526,7 +526,7 @@ information.")
akonadi-mime akonadi-mime
akonadi-search akonadi-search
boost boost
gpgme-1.23 gpgme
grantleetheme grantleetheme
kcalendarcore kcalendarcore
kcmutils kcmutils
@ -551,7 +551,7 @@ information.")
libkleo libkleo
breeze-icons ; default icon set, required for tests breeze-icons ; default icon set, required for tests
prison prison
qgpgme-qt6-1.23)) qgpgme-qt6))
(arguments (list #:qtbase qtbase)) (arguments (list #:qtbase qtbase))
(home-page "https://kontact.kde.org/components/kaddressbook/") (home-page "https://kontact.kde.org/components/kaddressbook/")
(synopsis "Address Book application to manage your contacts") (synopsis "Address Book application to manage your contacts")
@ -879,7 +879,7 @@ package.")
akonadi-contacts akonadi-contacts
boost boost
breeze-icons ;; default icon set breeze-icons ;; default icon set
gpgme-1.23 gpgme
grantleetheme grantleetheme
karchive karchive
kcodecs kcodecs
@ -1104,7 +1104,7 @@ protocol for querying and modifying directory services running over TCP/IP.")
kdoctools)) kdoctools))
(inputs (inputs
(list boost (list boost
gpgme-1.23 gpgme
kcmutils kcmutils
kcodecs kcodecs
kconfig kconfig
@ -1127,7 +1127,7 @@ protocol for querying and modifying directory services running over TCP/IP.")
libkleo libkleo
mimetreeparser mimetreeparser
breeze-icons ;; default icon set breeze-icons ;; default icon set
qgpgme-qt6-1.23)) qgpgme-qt6))
(arguments (arguments
(list #:qtbase qtbase (list #:qtbase qtbase
#:phases #:phases
@ -1164,7 +1164,7 @@ and retrieving certificates from LDAP servers.")
akonadi-mime akonadi-mime
akonadi-search akonadi-search
boost boost
gpgme-1.23 gpgme
grantleetheme grantleetheme
kaddressbook kaddressbook
kbookmarks kbookmarks
@ -1214,7 +1214,7 @@ and retrieving certificates from LDAP servers.")
libkleo libkleo
libksieve libksieve
breeze-icons ; default icon set, required for tests breeze-icons ; default icon set, required for tests
qgpgme-qt6-1.23 qgpgme-qt6
qtdeclarative qtdeclarative
qtkeychain-qt6 qtkeychain-qt6
qtwebchannel qtwebchannel
@ -1514,7 +1514,7 @@ using a Qt/KMime C++ API.")
akonadi-notes akonadi-notes
akonadi-search akonadi-search
boost boost
gpgme-1.23 gpgme
grantleetheme grantleetheme
karchive karchive
kcalendarcore kcalendarcore
@ -1547,7 +1547,7 @@ using a Qt/KMime C++ API.")
kxmlgui kxmlgui
libgravatar libgravatar
qca-qt6 qca-qt6
qgpgme-qt6-1.23 qgpgme-qt6
qtdeclarative qtdeclarative
qtwebchannel qtwebchannel
qtwebengine qtwebengine
@ -2157,7 +2157,7 @@ various Google services.")
(list extra-cmake-modules kdoctools qttools)) (list extra-cmake-modules kdoctools qttools))
(inputs (inputs
(list boost (list boost
gpgme-1.23 gpgme
kcodecs kcodecs
kcompletion kcompletion
kconfig kconfig
@ -2169,9 +2169,9 @@ various Google services.")
kwidgetsaddons kwidgetsaddons
kwindowsystem kwindowsystem
kpimtextedit kpimtextedit
qgpgme-qt6-1.23)) qgpgme-qt6))
(propagated-inputs (propagated-inputs
(list gpgme-1.23 qgpgme-qt6-1.23)) (list gpgme qgpgme-qt6))
(arguments (arguments
(list (list
#:qtbase qtbase #:qtbase qtbase

View file

@ -2440,7 +2440,7 @@ PulseAudio.")
libplasma libplasma
oath-toolkit oath-toolkit
plasma5support plasma5support
qgpgme-qt6-1.23 qgpgme-qt6
qtdeclarative)) qtdeclarative))
(arguments (list #:qtbase qtbase (arguments (list #:qtbase qtbase
#:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) #:configure-flags #~(list "-DQT_MAJOR_VERSION=6")))

View file

@ -224,7 +224,7 @@ This package contains GUI widgets for baloo.")
bash-minimal bash-minimal
boost boost
breeze-icons breeze-icons
gpgme-1.23 gpgme
grantleetheme grantleetheme
kcmutils kcmutils
kcontacts kcontacts
@ -246,7 +246,7 @@ This package contains GUI widgets for baloo.")
kuserfeedback kuserfeedback
libkdepim libkdepim
libkleo libkleo
qgpgme-qt6-1.23 qgpgme-qt6
qtdeclarative qtdeclarative
qtwebchannel qtwebchannel
qtwebengine qtwebengine