~ruther/guix-local

d21acaccfc0ea99595448ea7696c17c9787dc100 — Andreas Enge 2 months ago c217af2
gnu: qgpgme-qt6: Rename to qgpgme.

* gnu/packages/gnupg.scm (qgpgme-qt6): Rename to...
(qgpgme): ...this.
[name]: Change to qgpgme.
* gnu/packages/kde-frameworks.scm (kwallet),
* gnu/packages/kde-internet.scm (kget),
* gnu/packages/kde-pim.scm (akregator, kaddressbook, kleopatra, kmail,
kmailcommon, kmessagelib, libkleo),
* gnu/packages/kde-plasma.scm (plasma-pass),
* gnu/packages/kde-utils.scm (isoimagewriter): Rename inputs.

Fixes: guix/guix#3879
Change-Id: Ib089ea049639b7214e76ddbbd9b76c3404aa09c7
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
M gnu/packages/gnupg.scm => gnu/packages/gnupg.scm +2 -2
@@ 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

M gnu/packages/kde-frameworks.scm => gnu/packages/kde-frameworks.scm +1 -1
@@ 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")

M gnu/packages/kde-internet.scm => gnu/packages/kde-internet.scm +1 -1
@@ 291,7 291,7 @@ Qt-based XMPP library QXmpp.")
           libgcrypt
           libktorrent
           libmms
           qgpgme-qt6
           qgpgme
           qca-qt6
           qtwayland))
    (arguments

M gnu/packages/kde-pim.scm => gnu/packages/kde-pim.scm +8 -8
@@ 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

M gnu/packages/kde-plasma.scm => gnu/packages/kde-plasma.scm +1 -1
@@ 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.

M gnu/packages/kde-utils.scm => gnu/packages/kde-utils.scm +1 -1
@@ 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")