Update pinentry to 0.9.6
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 22 Sep 2015 13:58:23 +0000 (15:58 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 22 Sep 2015 13:59:55 +0000 (15:59 +0200)
* packages/packages.current (pinentry): Update
* src/Makefile.am (gpg4win_pkg_pinentry_configure): Remove
  obsolete configure parameters.
* src/inst-pinentry.nsi, src/uninst-pinentry.nsi: New name
  for pinentry-qt4.

packages/packages.current
src/Makefile.am
src/inst-pinentry.nsi
src/uninst-pinentry.nsi

index b99f678..aad7592 100644 (file)
@@ -288,8 +288,8 @@ chk  20439f65b8d94ec79523c45ad72418670ca9d5eb
 
 # last changed: 2015-06-23
 # by: ah
 
 # last changed: 2015-06-23
 # by: ah
-file pinentry/pinentry-0.9.4.tar.bz2
-chk  0c47f0ddea4631bcba01ebbeca8bffe0bf43e440
+file pinentry/pinentry-0.9.6.tar.bz2
+chk  296992d7b26ba2a517b093ccae26bc00b88b3bb5
 
 # last changed: 2015-08-26
 # by: ah
 
 # last changed: 2015-08-26
 # by: ah
index 2f9ed72..441356d 100644 (file)
@@ -194,18 +194,12 @@ gpg4win_pkg_libpng_configure = HAVE_SOLARIS_LD_FALSE=yes CPPFLAGS=\"-I$(idir)/in
 # --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
 # --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 \
-  --enable-pinentry-qt4-clipboard
-else
-pinentry_enable_disable= --disable-pinentry-qt --disable-pinentry-qt4
+pinentry_enable_disable= --enable-pinentry-qt
 endif
 gpg4win_pkg_pinentry_configure = \
   $(pinentry_enable_disable) \
 endif
 gpg4win_pkg_pinentry_configure = \
   $(pinentry_enable_disable) \
-  --disable-pinentry-gtk \
   --enable-pinentry-gtk2 \
   --enable-pinentry-gtk2 \
-  --with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
-  CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib \
-  CXXFLAGS=-static-libstdc++
+  CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
 #  --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)
 
 # The LDFLAGS is needed for -lintl for glib.  The QT4 variables work
 #  --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)
 
 # The LDFLAGS is needed for -lintl for glib.  The QT4 variables work
index 954ca86..238cc56 100644 (file)
@@ -43,7 +43,7 @@ Section "-Pinentry" SEC_pinentry
 
 !ifndef GPG4WIN_LIGHT
 !ifdef HAVE_PKG_QT
 
 !ifndef GPG4WIN_LIGHT
 !ifdef HAVE_PKG_QT
-  File "${prefix}/bin/pinentry-qt4.exe"
+  File "${prefix}/bin/pinentry-qt.exe"
 
   # If Qt is installed (usually by selecting kleopatra), we want
   # the Qt pinentry as well.  Otherwise punt to gtk pinentry,
 
   # If Qt is installed (usually by selecting kleopatra), we want
   # the Qt pinentry as well.  Otherwise punt to gtk pinentry,
@@ -51,7 +51,7 @@ Section "-Pinentry" SEC_pinentry
   !insertmacro SectionFlagIsSet ${SEC_qt} \
                 ${SF_SELECTED} inst_pinentry_have_qt inst_pinentry_skip_qt
   inst_pinentry_have_qt:
   !insertmacro SectionFlagIsSet ${SEC_qt} \
                 ${SF_SELECTED} inst_pinentry_have_qt inst_pinentry_skip_qt
   inst_pinentry_have_qt:
-  File /oname=pinentry.exe "${prefix}/bin/pinentry-qt4.exe"
+  File /oname=pinentry.exe "${prefix}/bin/pinentry-qt.exe"
   Goto inst_pinentry_done
   inst_pinentry_skip_qt:
 !endif
   Goto inst_pinentry_done
   inst_pinentry_skip_qt:
 !endif
index 5cc2b10..785b3af 100644 (file)
@@ -33,7 +33,7 @@ Section "-un.pinentry"
 !else
   Delete "$INSTDIR\pinentry-w32.exe"
   Delete "$INSTDIR\pinentry-gtk-2.exe"
 !else
   Delete "$INSTDIR\pinentry-w32.exe"
   Delete "$INSTDIR\pinentry-gtk-2.exe"
-  Delete "$INSTDIR\pinentry-qt4.exe"
+  Delete "$INSTDIR\pinentry-qt.exe"
   Delete "$INSTDIR\pinentry.exe"
 
   RMDir "$INSTDIR"
   Delete "$INSTDIR\pinentry.exe"
 
   RMDir "$INSTDIR"