[PATCH] gnu: Add libgpg-error as propagated inputs to gnupg, gpgme, and pinentry

[PATCH] gnu: Add libgpg-error as propagated inputs to gnupg, gpgme, and pinentry

[Mark H Weaver]

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

This patch is actually a prerequisite to the "Add gmime" patch.  I could
have added 'libgpg-error' as another input to 'gmime', but this seemed
the more proper solution.

What do you think?

    Mark


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg, gpgme, and pinentry --]
[-- Type: text/x-patch, Size: 2052 bytes --]

From e6ddaf74f30ee5d6c8d76a3ae9cacdb14eb060c5 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 18 Feb 2014 22:06:34 -0500
Subject: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg,
 gpgme, and pinentry.

* gnu/packages/gnupg.scm (gnupg, gpgme, pinentry): Make 'libgpg-error'
  a propagated input.
---
 gnu/packages/gnupg.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 499b200..cadcda8 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -181,12 +181,13 @@ specifications are building blocks of S/MIME and TLS.")
        (base32
         "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3"))))
     (build-system gnu-build-system)
+    (propagated-inputs
+     `(("libgpg-error" ,libgpg-error)))
     (inputs
      `(("bzip2" ,guix:bzip2)
        ("curl" ,curl)
        ("libassuan" ,libassuan)
        ("libgcrypt" ,libgcrypt)
-       ("libgpg-error" ,libgpg-error)
        ("libksba" ,libksba)
        ("pth" ,pth)
        ("openldap" ,openldap)
@@ -226,10 +227,11 @@ components), libgpg-error (centralized GnuPG error values), and libskba
        (base32
         "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d"))))
     (build-system gnu-build-system)
+    (propagated-inputs
+     `(("libgpg-error" ,libgpg-error)))
     (inputs
      `(("gnupg" ,gnupg)
-       ("libassuan" ,libassuan)
-       ("libgpg-error" ,libgpg-error)))
+       ("libassuan" ,libassuan)))
     (home-page "http://www.gnupg.org/related_software/gpgme/")
     (synopsis "library providing simplified access to GnuPG functionality")
     (description
@@ -411,6 +413,8 @@ including tools for signing keys, keyring analysis, and party preparation.
                (base32
                 "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn"))))
     (build-system gnu-build-system)
+    (propagated-inputs
+     `(("libgpg-error" ,libgpg-error)))
     (inputs
      `(("ncurses" ,ncurses)
        ("gtk+" ,gtk+-2)
-- 
1.8.4

Re: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg, gpgme, and pinentry

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> From e6ddaf74f30ee5d6c8d76a3ae9cacdb14eb060c5 Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Tue, 18 Feb 2014 22:06:34 -0500
> Subject: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg,
>  gpgme, and pinentry.
>
> * gnu/packages/gnupg.scm (gnupg, gpgme, pinentry): Make 'libgpg-error'
>   a propagated input.

This makes sense for GPGME, because it’s a library and its headers may
refer to the libgpg-error headers.

But what about GnuPG and Pinentry?  These are normally just end-user
programs, right?

Also, please write a one-line rationale for the propagation as a
comment.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg, gpgme, and pinentry

[Mark H Weaver]

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

ludo@gnu.org (Ludovic Courtès) writes:

> Mark H Weaver <mhw@netris.org> skribis:
>
>> From e6ddaf74f30ee5d6c8d76a3ae9cacdb14eb060c5 Mon Sep 17 00:00:00 2001
>> From: Mark H Weaver <mhw@netris.org>
>> Date: Tue, 18 Feb 2014 22:06:34 -0500
>> Subject: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg,
>>  gpgme, and pinentry.
>>
>> * gnu/packages/gnupg.scm (gnupg, gpgme, pinentry): Make 'libgpg-error'
>>   a propagated input.
>
> This makes sense for GPGME, because it’s a library and its headers may
> refer to the libgpg-error headers.
>
> But what about GnuPG and Pinentry?  These are normally just end-user
> programs, right?

Indeed, my mistake.

> Also, please write a one-line rationale for the propagation as a
> comment.

Good idea.  Here's an updated patch.

    Thanks,
      Mark



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: gpgme: Make 'libgpg-error' a propagated input --]
[-- Type: text/x-patch, Size: 1195 bytes --]

From 68640c3c09c6c9ddcaae8d50754f0876b273d42a Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 19 Feb 2014 19:20:53 -0500
Subject: [PATCH] gnu: gpgme: Make 'libgpg-error' a propagated input.

* gnu/packages/gnupg.scm (gpgme): Make 'libgpg-error' a propagated input.
---
 gnu/packages/gnupg.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 499b200..85ce076 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -226,10 +226,12 @@ components), libgpg-error (centralized GnuPG error values), and libskba
        (base32
         "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d"))))
     (build-system gnu-build-system)
+    (propagated-inputs
+     ;; Needs to be propagated because gpgme.h includes gpg-error.h.
+     `(("libgpg-error" ,libgpg-error)))
     (inputs
      `(("gnupg" ,gnupg)
-       ("libassuan" ,libassuan)
-       ("libgpg-error" ,libgpg-error)))
+       ("libassuan" ,libassuan)))
     (home-page "http://www.gnupg.org/related_software/gpgme/")
     (synopsis "library providing simplified access to GnuPG functionality")
     (description
-- 
1.8.4

Re: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg, gpgme, and pinentry

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Mark H Weaver <mhw@netris.org> skribis:
>>
>>> From e6ddaf74f30ee5d6c8d76a3ae9cacdb14eb060c5 Mon Sep 17 00:00:00 2001
>>> From: Mark H Weaver <mhw@netris.org>
>>> Date: Tue, 18 Feb 2014 22:06:34 -0500
>>> Subject: [PATCH] gnu: Add libgpg-error as propagated inputs to gnupg,
>>>  gpgme, and pinentry.
>>>
>>> * gnu/packages/gnupg.scm (gnupg, gpgme, pinentry): Make 'libgpg-error'
>>>   a propagated input.
>>
>> This makes sense for GPGME, because it’s a library and its headers may
>> refer to the libgpg-error headers.
>>
>> But what about GnuPG and Pinentry?  These are normally just end-user
>> programs, right?
>
> Indeed, my mistake.

OK.

> From 68640c3c09c6c9ddcaae8d50754f0876b273d42a Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Wed, 19 Feb 2014 19:20:53 -0500
> Subject: [PATCH] gnu: gpgme: Make 'libgpg-error' a propagated input.
>
> * gnu/packages/gnupg.scm (gpgme): Make 'libgpg-error' a propagated input.

OK to push.

Thanks!
Ludo’.