diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 11d495258c1..ecb018159a0 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -495,10 +495,10 @@ 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 +(define-public qgpgme (package (inherit gpgme) - (name "qgpgme-qt6") + (name "qgpgme") (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e6770ab6f64..00ef3093675 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -4531,7 +4531,7 @@ to separate the structure of documents from the data they contain.") libgcrypt libsecret phonon - qgpgme-qt6 + qgpgme qca-qt6 qtbase)) (home-page "https://community.kde.org/Frameworks") diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 1b45c31e70c..ce2a1e2c826 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -291,7 +291,7 @@ Qt-based XMPP library QXmpp.") libgcrypt libktorrent libmms - qgpgme-qt6 + qgpgme qca-qt6 qtwayland)) (arguments diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a241b8a55c3..07fdfa963d0 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -598,7 +598,7 @@ PIM data into Akonadi for use in KDE PIM applications.") kuserfeedback libkdepim libkleo - qgpgme-qt6 + qgpgme qtdeclarative qtwayland qtwebchannel @@ -799,7 +799,7 @@ information.") libkleo breeze-icons ; default icon set, required for tests prison - qgpgme-qt6 + qgpgme qtwayland)) (arguments (list #:qtbase qtbase @@ -1553,7 +1553,7 @@ protocol for querying and modifying directory services running over TCP/IP.") libkleo mimetreeparser breeze-icons ;; default icon set - qgpgme-qt6 + qgpgme qtwayland)) (arguments (list #:qtbase qtbase @@ -1641,7 +1641,7 @@ and retrieving certificates from LDAP servers.") libkleo libksieve breeze-icons ; default icon set, required for tests - qgpgme-qt6 + qgpgme qtdeclarative qtkeychain-qt6 qtwayland @@ -1796,7 +1796,7 @@ KMail.") libkleo libxslt phonon - qgpgme-qt6 + qgpgme qtmultimedia qtwebchannel qtwebengine)) @@ -1983,7 +1983,7 @@ using a Qt/KMime C++ API.") openssl libgravatar qca-qt6 - qgpgme-qt6 + qgpgme qtdeclarative qtwebchannel qtwebengine @@ -2544,9 +2544,9 @@ various Google services.") kwidgetsaddons kwindowsystem kpimtextedit - qgpgme-qt6)) + qgpgme)) (propagated-inputs - (list gpgme qgpgme-qt6)) + (list gpgme qgpgme)) (arguments (list #:qtbase qtbase diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index fe8c945b20a..86b3f5315a1 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -2561,7 +2561,7 @@ PulseAudio.") (inputs (list ki18n kitemmodels kwindowsystem kio oath-toolkit plasma5support - qgpgme-qt6)) + qgpgme)) (propagated-inputs ;; QML modules need to be propagated so that QML files can find them in ;; $QML_IMPORT_PATH. diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index d03e46c4aaa..85325e50cd1 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -353,7 +353,7 @@ your computer.") kcrash solid kwidgetsaddons - qgpgme-qt6)) + qgpgme)) (arguments (list #:qtbase qtbase #:tests? #f)) (home-page "https://invent.kde.org/utilities/isoimagewriter")