[PATCH] Add pinentry-gnome3

[PATCH] Add pinentry-gnome3

[Christopher Baines]

This adds pinentry-gnome3, which provides a better pinentry for those using
Gnome 3. Also, this updates the descriptions for some pinentry packages, and
adds it to the propagated-inputs of the gnome package.

[PATCH 1/3] gnu: gnupg: Remove gpg2 from pinentry description
[PATCH 2/3] gnu: Add pinentry-gnome3.
[PATCH 3/3] gnu: gnome: Add pinentry-gnome3 to gnome

[PATCH 1/3] gnu: gnupg: Remove gpg2 from pinentry description

[Christopher Baines]

* gnu/package/gnupg.scm (pinentry-tty, pinentry-gtk2, pinentry-qt)
[description]: The default in Guix is gpg, so only use this.
---
 gnu/packages/gnupg.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 38a1dc9..b4b4f75 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -622,7 +622,7 @@ including tools for signing keys, keyring analysis, and party preparation.
     (synopsis "GnuPG's interface to passphrase input")
     (description
      "Pinentry provides a console that allows users to enter a passphrase when
-@code{gpg} or @code{gpg2} is run and needs it.")
+@code{gpg} is run and needs it.")
     (license license:gpl2+)))
 
 (define-public pinentry-gtk2
@@ -635,7 +635,7 @@ including tools for signing keys, keyring analysis, and party preparation.
        ,@(package-inputs pinentry-tty)))
     (description
      "Pinentry provides a console and a GTK+ GUI that allows users to enter a
-passphrase when @code{gpg} or @code{gpg2} is run and needs it.")))
+passphrase when @code{gpg} is run and needs it.")))
 
 (define-public pinentry-qt
   (package
@@ -648,7 +648,7 @@ passphrase when @code{gpg} or @code{gpg2} is run and needs it.")))
      `(#:configure-flags '("CXXFLAGS=-std=gnu++11")))
   (description
    "Pinentry provides a console and a Qt GUI that allows users to enter a
-passphrase when @code{gpg} or @code{gpg2} is run and needs it.")))
+passphrase when @code{gpg} is run and needs it.")))
 
 (define-public pinentry
   (package (inherit pinentry-gtk2)
-- 
2.10.1

[PATCH 2/3] gnu: Add pinentry-gnome3.

[Christopher Baines]

* gnu/packages/gnupg.scm (pinentry-gnome3): New variable.
---
 gnu/packages/gnupg.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index b4b4f75..b80e39b 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -637,6 +637,22 @@ including tools for signing keys, keyring analysis, and party preparation.
      "Pinentry provides a console and a GTK+ GUI that allows users to enter a
 passphrase when @code{gpg} is run and needs it.")))
 
+(define-public pinentry-gnome3
+  (package
+    (inherit pinentry-tty)
+    (name "pinentry-gnome3")
+    (inputs
+     `(("gtk+" ,gtk+-2)
+       ("gcr" ,gcr)
+       ("glib" ,glib)
+       ,@(package-inputs pinentry-tty)))
+    (arguments
+     `(#:configure-flags '("--enable-pinentry-gnome3")))
+    (description
+     "Pinentry provides a console and a GUI designed for use with Gnome 3 that
+allows users to enter a passphrase when required by @code{gpg} or other
+software.")))
+
 (define-public pinentry-qt
   (package
     (inherit pinentry-tty)
-- 
2.10.1

[PATCH 3/3] gnu: gnome: Add pinentry-gnome3 to gnome

[Christopher Baines]

* gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add
pinentry-gnome3.
---
 gnu/packages/gnome.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e33f744..2b75781 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5055,6 +5055,7 @@ software that do not provide their own configuration interface.")
        ("gvfs"                      ,gvfs)
        ("hicolor-icon-theme"        ,hicolor-icon-theme)
        ("nautilus"                  ,nautilus)
+       ("pinentry-gnome3"           ,pinentry-gnome3)
        ("pulseaudio"                ,pulseaudio)
        ("shared-mime-info"          ,shared-mime-info)
        ("totem"                     ,totem)
-- 
2.10.1

Re: [PATCH] Add pinentry-gnome3

[Ludovic Courtès]

Christopher Baines <mail@cbaines.net> skribis:

> This adds pinentry-gnome3, which provides a better pinentry for those using
> Gnome 3. Also, this updates the descriptions for some pinentry packages, and
> adds it to the propagated-inputs of the gnome package.
>
> [PATCH 1/3] gnu: gnupg: Remove gpg2 from pinentry description
> [PATCH 2/3] gnu: Add pinentry-gnome3.
> [PATCH 3/3] gnu: gnome: Add pinentry-gnome3 to gnome

Applied all 3 patches, thanks!

Ludo’.