[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-127-g42c2f86

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  42c2f86cb450782bda1dd626e86b57e095cad20f (commit)
       via  f5081e7ba1f12ba09fb31ed61d9f7b58c932aa4e (commit)
       via  458e026efd808ad3d34cb885aab3c4e6b23d75f8 (commit)
      from  a86a6bf78f837601be00e5767a463b58c1f98707 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 42c2f86cb450782bda1dd626e86b57e095cad20f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Apr 26 17:53:55 2013 +0200

    Update pinentry to version 0.8.3.

diff --git a/packages/packages.current b/packages/packages.current
index 7bfcf7b..cfd4041 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -380,10 +380,9 @@ chk  4dafebee7b0c7adde2b27473faca7236851cf472
 file dirmngr/dirmngr-1.1.1.tar.bz2
 chk  e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
 
-# checked: 2012-03-28 wk - updated
-#          2012-12-07 wk - can't update to 0.8.2 due to MOC problems.
-file pinentry/pinentry-0.8.1.tar.gz
-chk  84a6940175b552a8562b4014f4661dec3ff10165
+# checked: 2013-04-26 wk
+file pinentry/pinentry-0.8.3.tar.gz
+chk  fc0efe5d375568f90ddbb23ee68e173411a49d4a
 
 # checked: 2012-03-28 wk
 file scute/scute-1.4.0.tar.bz2

commit f5081e7ba1f12ba09fb31ed61d9f7b58c932aa4e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Apr 26 12:39:31 2013 +0200

    Force building pinentry-qt4 for a full installer.
    
    * src/Makefile.am (pinentry_enable_disable): New.

diff --git a/src/Makefile.am b/src/Makefile.am
index f9cb9dd..f4b1439 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -226,11 +226,16 @@ gpg4win_pkg_gnupg2_configure = \
 # We would like to use --with-libiconv-prefix and
 # --with-libintl-prefix, but these don't work with the cheesy
 # non-"libfoo.la" versions of iconv and gettext that we are using.
+if BUILD_FULL_INSTALLER
+pinentry_enable_disable= --disable-pinentry-qt --enable-pinentry-qt4
+else
+pinentry_enable_disable= --disable-pinentry-qt --disable-pinentry-qt4
+endif
 gpg4win_pkg_pinentry_configure = \
+  $(pinentry_enable_disable) \
   --disable-pinentry-gtk \
   --enable-pinentry-gtk2 \
   --with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
-  --disable-pinentry-qt \
   CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
 #  --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)
 

commit 458e026efd808ad3d34cb885aab3c4e6b23d75f8
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Apr 26 12:34:21 2013 +0200

    Temporary disable packages using curl.

diff --git a/configure.ac b/configure.ac
index 094aab6..d82357d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,7 +300,7 @@ GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
 GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
 GPG4WIN_SPKG([pinentry], [libiconv gtk+])
 GPG4WIN_SPKG([gpgme], [libgpg-error gnupg2 glib])
-GPG4WIN_SPKG([curl], [zlib gnutls])
+#GPG4WIN_SPKG([curl], [zlib gnutls])
 GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
                         w32pth zlib bzip2 adns pinentry])
 GPG4WIN_SPKG([pthreads-w32])
@@ -319,9 +319,9 @@ GPG4WIN_SPKG([crypt])
 GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
                             gpgme pthreads-w32 crypt regex libetpan gnutls])
 GPG4WIN_SPKG([notification_plugin], [claws-mail])
-GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
-GPG4WIN_SPKG([vcalendar], [curl claws-mail])
-GPG4WIN_SPKG([rssyl], [curl claws-mail])
+#GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
+#GPG4WIN_SPKG([vcalendar], [curl claws-mail])
+#GPG4WIN_SPKG([rssyl], [curl claws-mail])
 GPG4WIN_SPKG([tnef_parse], [claws-mail])
 GPG4WIN_SPKG([attachwarner], [claws-mail])
 GPG4WIN_SPKG([bsfilter_plugin], [claws-mail])

-----------------------------------------------------------------------

Summary of changes:
 configure.ac              |    8 ++++----
 packages/packages.current |    7 +++----
 src/Makefile.am           |    7 ++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org