From patchwork Thu Mar 30 21:48:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48827 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 08A9217280; Thu, 30 Mar 2023 22:49:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 31FDB171ED for ; Thu, 30 Mar 2023 22:49:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08o-00085T-2Z; Thu, 30 Mar 2023 17:49:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pi08m-00084Y-Gf for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pi08m-0003Is-8d for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pi08m-0000lX-4V for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62553] [PATCH core-updates 5/6] gnu: Remove gpgme-1.18 and qgpgme-1.18. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 21:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62553@debbugs.gnu.org Received: via spool by 62553-submit@debbugs.gnu.org id=B62553.16802129182875 (code B ref 62553); Thu, 30 Mar 2023 21:49:04 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:38 +0000 Received: from localhost ([127.0.0.1]:59649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08M-0000kD-0I for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:38 -0400 Received: from jpoiret.xyz ([206.189.101.64]:33060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08C-0000jD-TB for 62553@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:29 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3DEFD185320; Thu, 30 Mar 2023 21:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n/uco8lz+ho5foARGGdVf3ccSNizj4mq9pOBzpVrCcc=; b=D7jYqnoeZ4VJmS40R4Qu4pQxgiNjTkAGlNubxdf9D8TKFZ3yenPr25Vu3PtbQ3Ts9m8vm8 WLsP9US9qcgAgHaAOGvxcvE/R2P44KPM0u1bY8bTRZ8vpWLqVL+sBmfnjbOYLRM8t82YEp nRzROsuILCPHkcwgraP+in/qPWCkVu0nsQzxN7RQaJRGNZjYwStikX+8zsUo1jaWh+fKEs zbDF3C1twiEe32rC+Rs8LbEwt1+ZlGIp4+KrBwE/YsjtvDLQDXHEaVtszQSeg2lOvVX5zC or45D1vVSP/1BkoOdk1bKt+XGgNtC6OIfM2MzCJq9cy8yIBYLBV4Nqe11mjYYw== Date: Thu, 30 Mar 2023 23:48:17 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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