From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kI+MJtcDJmR0sQAASxT56A (envelope-from ) for ; Thu, 30 Mar 2023 23:49:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mMxRJtcDJmQHpwAAauVa8A (envelope-from ) for ; Thu, 30 Mar 2023 23:49:11 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5CCAC13F06 for ; Thu, 30 Mar 2023 23:49:10 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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 From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680212951; a=rsa-sha256; cv=none; b=cJLUXQLuIeUnpa3LzSPGifEpfxSDRxWisKKdlqjV3bpkfHph47RpzrsFJe+ZsgiNCg/ty7 IK0QhpD83L8OTmaYDF0AJ8ELpxhf1zw5rpOd3TM6eioRK7ohegoGjVhrHZNHaQ75fJY7+l +/jnZ/udRnZnRCJTP0C6adiaucSeWe/WE1I2c7cHRJ61O1w/DKbNFkggBJa4s8r+QScbF3 A1bpyNu/La07kTyVbDi9oarxRcRqRHKnLFMDblrdFuW5fov6EY1tVQwQ69zHDRFeouLlir QnCig31a+7PsV1T+LlW7/1YzFr2cdOmXlkiH2U0SO3ybHxsLYZE5yRBvXI6DCw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=D7jYqnoe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680212951; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=n/uco8lz+ho5foARGGdVf3ccSNizj4mq9pOBzpVrCcc=; b=caSYik4rXofOxPZhXSwCqV+nTqB8byOsBE2Qi0JiyYSD51nGi6ROoPJYc2HnKMDSi3/hqS zRcL0aL3A1D4BSrc/cNs3Lar7GLRGCPmbIeAp4sPotCBsYJAYnZYZxM2Ow6n0GHoJ2tkyT C9TJzBAqvhlt2H807MrdNfSlRFnwkDnmbNaSN3Ab9cCOW8olpVBnKtwr1/iyll2yJUNASA SRVuJ2vOH8nuW440IQOSNeAFpGNhE+Czyj1tMFPAGUKeX5Sz0+NLINMrsZ5Ce0rRzd2reN dDq/YjCOWAlZT9Q4sx5c4Z76OmrbBWU3cu8+0Nl7tsoAIgjz7P7OYb353iEjHw== X-Migadu-Spam-Score: -2.22 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=D7jYqnoe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Spam-Score: -2.22 X-Migadu-Queue-Id: 5CCAC13F06 X-TUID: dWCqiU5E/Dqq * 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