From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: Josselin Poiret <dev@jpoiret.xyz>
Cc: 62553@debbugs.gnu.org
Subject: [bug#62553] [PATCH core-updates 5/6] gnu: Remove gpgme-1.18 and qgpgme-1.18.
Date: Thu, 30 Mar 2023 23:48:17 +0200 [thread overview]
Message-ID: <d7db00f985dba8634fe00cb5d02d31dee4813e39.1680212316.git.dev@jpoiret.xyz> (raw)
In-Reply-To: <cover.1680212316.git.dev@jpoiret.xyz>
* gnu/packages/gnupg.scm (gpgme-1.18, qgpgme-1.18): Remove.
* gnu/packages/kde-pim.sm (kleopatra, kmail): Refer to gpgme and qgpgme instead.
---
gnu/packages/gnupg.scm | 23 -----------------------
gnu/packages/kde-pim.scm | 8 ++++----
2 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 42013f1b94..49d29ed9bd 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -416,19 +416,6 @@ (define-public gpgme
(properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/gpgme")))))
-;; TODO: Merge with gpgme in the next rebuild cycle.
-(define-public gpgme-1.18
- (package
- (inherit gpgme)
- (version "1.18.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnupg/gpgme/gpgme-"
- version ".tar.bz2"))
- (sha256
- (base32
- "17hfigfnq6xz45b5xrp299f68b5mwx0aysd51sx5v4nf8yp4w79n"))))))
-
(define-public qgpgme
(package
(inherit gpgme)
@@ -457,16 +444,6 @@ (define-public qgpgme
gpgpme starting with version 1.7.")
(license license:gpl2+))) ;; Note: this differs from gpgme
-;; TODO: Merge with qgpgme in the next rebuild cycle.
-(define-public qgpgme-1.18
- (package
- (inherit qgpgme)
- (version (package-version gpgme-1.18))
- (source (package-source gpgme-1.18))
- (inputs
- (modify-inputs (package-inputs qgpgme)
- (replace "gpgme" gpgme-1.18)))))
-
(define-public guile-gcrypt
(package
(name "guile-gcrypt")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 19066fd289..6f3cbf2999 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1139,7 +1139,7 @@ (define-public kleopatra
kdoctools))
(inputs
(list boost
- gpgme-1.18
+ gpgme
kcmutils
kcodecs
kconfig
@@ -1159,7 +1159,7 @@ (define-public kleopatra
libassuan
libkleo
breeze-icons ;; default icon set
- qgpgme-1.18
+ qgpgme
qtbase-5))
(arguments
`(#:phases
@@ -1196,7 +1196,7 @@ (define-public kmail
akonadi-mime
akonadi-search
boost
- gpgme-1.18
+ gpgme
grantlee
grantleetheme
kbookmarks
@@ -1243,7 +1243,7 @@ (define-public kmail
libkleo
libksieve
breeze-icons ; default icon set, required for tests
- qgpgme-1.18
+ qgpgme
qtbase-5
qtdeclarative-5
qtkeychain
--
2.39.2
next prev parent reply other threads:[~2023-03-30 21:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 21:44 [bug#62553] [PATCH core-updates 0/6] Various fixes to packages Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 1/6] gnu: Replace all uses of atk by at-spi2-core Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 2/6] gnu: atkmm: Update to 2.36.2 Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 3/6] gnu: atk: Deprecate in favor of at-spi2-core Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 4/6] gnu: gpgme: Propagate libassuan Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` Josselin Poiret via Guix-patches via [this message]
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 6/6] gnu: zsh: Patch failing test that uses egrep Josselin Poiret via Guix-patches via
2023-03-31 14:57 ` bug#62553: [PATCH core-updates 0/6] Various fixes to packages Guillaume Le Vaillant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d7db00f985dba8634fe00cb5d02d31dee4813e39.1680212316.git.dev@jpoiret.xyz \
--to=guix-patches@gnu.org \
--cc=62553@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).