[PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[ng0]

[-- Attachment #1: Type: text/plain, Size: 2264 bytes --]

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 3bc7d2c8d94da0a81ecc16b2e12791f9ed466c95 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
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.
---
 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
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; 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
-            ;; hard-coded paths.  Here we patch them all.  We also change "gpg"
-            ;; to "gpg2".  We use ISO-8859-1 here because test-iconv.c contains
+            ;; 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))
-                        (prog (which (if (string=? base "gpg") "gpg2" base))))
+                        (prog (which base)))
                    (string-append pre
                                   (or prog (error "not found: " base))))))))))))
     (home-page "http://spruce.sourceforge.net/gmime/")
-- 
2.9.1


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]

Re: [PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[Leo Famulari]

On Mon, Jul 25, 2016 at 11:47:51AM +0000, ng0 wrote:
>              (with-fluids ((%default-port-encoding #f))
>                (substitute* (find-files "tests" "\\.c$")
>                  (("(system *\\(\")(/[^ ]*)" all pre prog-path)
>                   (let* ((base (basename prog-path))
> -                        (prog (which (if (string=? base "gpg") "gpg2" base))))
> +                        (prog (which base)))
>                     (string-append pre
>                                    (or prog (error "not found: " base))))))))))))

I can confirm this fixes the build failure. But, I don't fully
understand the code that was changed. Can somebody double-check it?

Re: [PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Mon, Jul 25, 2016 at 11:47:51AM +0000, ng0 wrote:
>>              (with-fluids ((%default-port-encoding #f))
>>                (substitute* (find-files "tests" "\\.c$")
>>                  (("(system *\\(\")(/[^ ]*)" all pre prog-path)
>>                   (let* ((base (basename prog-path))
>> -                        (prog (which (if (string=? base "gpg") "gpg2" base))))
>> +                        (prog (which base)))
>>                     (string-append pre
>>                                    (or prog (error "not found: " base))))))))))))
>
> I can confirm this fixes the build failure. But, I don't fully
> understand the code that was changed. Can somebody double-check it?

LGTM.  The comment above this hunk should also be changed.

Thanks,
Ludo’.

Re: [PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[Andreas Enge]

Hello,

speaking of gmime and gpg, in the latest evaluation of master on hydra:
   http://hydra.gnu.org/eval/109021
gnupg@2.1 fails its tests on i686:
   http://hydra.gnu.org/build/1315032

Maybe someone involved in the recent gnupg changes could have a look?

I understand that the gmime failure is solved by the patch under
discussion; if not, please also have a look :-)

Andreas

Re: [PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[Leo Famulari]

On Tue, Jul 26, 2016 at 04:35:28PM +0200, Andreas Enge wrote:
> Hello,
> 
> speaking of gmime and gpg, in the latest evaluation of master on hydra:
>    http://hydra.gnu.org/eval/109021
> gnupg@2.1 fails its tests on i686:
>    http://hydra.gnu.org/build/1315032
> 
> Maybe someone involved in the recent gnupg changes could have a look?
> 
> I understand that the gmime failure is solved by the patch under
> discussion; if not, please also have a look :-)

I'm confused — that gnupg@2.1 build looks like it succeeded. I read the
log of the test suite and didn't see any failures that were ignored.

Re: [PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[Andreas Enge]

On Tue, Jul 26, 2016 at 07:59:32PM -0400, Leo Famulari wrote:
> I'm confused — that gnupg@2.1 build looks like it succeeded. I read the
> log of the test suite and didn't see any failures that were ignored.

It built successfully a few hours after my report. Maybe someone restarted
it, and it was only a transient failure. Thanks for checking!

Andreas

Re: [PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[Mark H Weaver]

Leo Famulari <leo@famulari.name> writes:

> On Mon, Jul 25, 2016 at 11:47:51AM +0000, ng0 wrote:
>>              (with-fluids ((%default-port-encoding #f))
>>                (substitute* (find-files "tests" "\\.c$")
>>                  (("(system *\\(\")(/[^ ]*)" all pre prog-path)
>>                   (let* ((base (basename prog-path))
>> -                        (prog (which (if (string=? base "gpg") "gpg2" base))))
>> +                        (prog (which base)))
>>                     (string-append pre
>>                                    (or prog (error "not found: " base))))))))))))
>
> I can confirm this fixes the build failure. But, I don't fully
> understand the code that was changed. Can somebody double-check it?

The patch looks good to me.

     Thanks!
       Mark

Re: [PATCH] gnu: gmime: Remove gpg to gpg2 patch.

[Leo Famulari]

On Mon, Jul 25, 2016 at 11:47:51AM +0000, ng0 wrote:
> 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.

Thanks, pushed as ae83dcf6ba9687b7ff123fdd4a81eb952b7b7801 !