From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH] gnu: gmime: Remove gpg to gpg2 patch. Date: Mon, 25 Jul 2016 11:47:51 +0000 Message-ID: <878twqj5w8.fsf@we.make.ritual.n0.is> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bReMf-00089v-4B for guix-devel@gnu.org; Mon, 25 Jul 2016 07:48:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bReMd-0002fL-Vr for guix-devel@gnu.org; Mon, 25 Jul 2016 07:48:05 -0400 Received: from mithlond.libertad.in-berlin.de ([2001:67c:1400:2490::1]:56745 helo=beleriand.n0.is) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bReMd-0002ed-H7 for guix-devel@gnu.org; Mon, 25 Jul 2016 07:48:03 -0400 Received: by beleriand.n0.is (OpenSMTPD) with ESMTPSA id acb1b505 TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO for ; Mon, 25 Jul 2016 11:47:59 +0000 (UTC) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable gmime building broke with gpg@2.1 --build-gpg2-as-gpg or what it was. This fixes it. Please also fix the typo in the commit message ("peviously"). From=203bc7d2c8d94da0a81ecc16b2e12791f9ed466c95 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 25 Jul 2016 11:38:37 +0000 Subject: [PATCH] gnu: gmime: Remove gpg to gpg2 patch. * gnu/packages/mail.scm (gmime)[arguments]: Remove the patch which peviously changed gpg to gpg2 in 'patch-paths-in-tests phase. =2D-- gnu/packages/mail.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 9214b73..f7a7623 100644 =2D-- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -15,6 +15,7 @@ ;;; Copyright =C2=A9 2016 Lukas Gradl ;;; Copyright =C2=A9 2016 Alex Kost ;;; Copyright =C2=A9 2016 Troy Sankey +;;; Copyright =C2=A9 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -240,14 +241,14 @@ operating systems.") 'unpack 'patch-paths-in-tests (lambda _ ;; The test programs run several programs using 'system' with =2D ;; hard-coded paths. Here we patch them all. We also chang= e "gpg" =2D ;; to "gpg2". We use ISO-8859-1 here because test-iconv.c c= ontains + ;; hard-coded paths. Here we patch them all. + ;; We use ISO-8859-1 here because test-iconv.c contains ;; raw byte sequences in several different encodings. (with-fluids ((%default-port-encoding #f)) (substitute* (find-files "tests" "\\.c$") (("(system *\\(\")(/[^ ]*)" all pre prog-path) (let* ((base (basename prog-path)) =2D (prog (which (if (string=3D? base "gpg") "gpg2" = base)))) + (prog (which base))) (string-append pre (or prog (error "not found: " base))))))= )))))) (home-page "http://spruce.sourceforge.net/gmime/") =2D-=20 2.9.1 =2D-=20 =E2=99=A5=E2=92=B6 ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJXlfxoAAoJEAKilhUMIBgje6MP/1giw3eqocRSwzXEtaFLKHZC xzXA2/H7F5t8fChXwCm9ZOvBd6H5J75flI4QCQFDVnekHm0hl8l+qqApeVc8eREv Cb/GdQn7kvB4jicHFuGManjPYduexeuq9Iro1MWgQQtEJPRHHKw0pwreeKhrY+hp HUsblthk7OLyJY3LcEsCEjjOnbWWXo6QW5YaA4ivXMI8tOPC9Rurn38OR9yMKxAB t3xGPPBq2dNh3xO5iDv33ZHu2Ig5GgLTrr2krbzaST953n/ufOckPs560WZ5fnWX OHo0mshipg7v2N8UDh1cm+uoesPSvybfyPGNn1ii59vW4mpPD3GMKZcE6XiCGcsz /54LMDnFr9KOghYjhDzKysudZekwhdoVYCNavyMirGh2R6s2k3nXI8Rx2/M7yQUq HI3BgODZIKdYUoEnHpGbaPejdU6wc3AX7JfPEzryHclgU4Id3nvNRHh0pTj3Dnhq MyBYEk4AoVlzCnNVciV0PcK7M37zA7XCrIV19VwhoQ+MA/ue12ojrgd78h9YSo6z 2Y8h+KKVyuY+2+sFBgvIlKlqkJ1Tj6BvtgH6e53mQd5+fmnOk9c/RgEoP3elHa59 OwFR3NdGzzC+42+1AZOrQZkjGoTjB/FObdcHwb4vInVHxD1Weg20tCA9TJWD0DKh rEr1ciivyk9fuV2eEXGg =cvqA -----END PGP SIGNATURE----- --=-=-=--