[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.6-17-ge4df7a2
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Sep 22 16:33:25 CEST 2015
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 e4df7a2fee61cca8328c662411e7b54ce9e39ab2 (commit)
via 03550750d4f581515b0349889ff8d1894943f3a6 (commit)
from 4c93ede23cc5eac77076ba62d7e773c06834f9c6 (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 e4df7a2fee61cca8328c662411e7b54ce9e39ab2
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Sep 22 15:58:23 2015 +0200
Update pinentry to 0.9.6
* 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.
diff --git a/packages/packages.current b/packages/packages.current
index b99f678..aad7592 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -288,8 +288,8 @@ chk 20439f65b8d94ec79523c45ad72418670ca9d5eb
# 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
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f9ed72..441356d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
-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) \
- --disable-pinentry-gtk \
--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
diff --git a/src/inst-pinentry.nsi b/src/inst-pinentry.nsi
index 954ca86..238cc56 100644
--- a/src/inst-pinentry.nsi
+++ b/src/inst-pinentry.nsi
@@ -43,7 +43,7 @@ Section "-Pinentry" SEC_pinentry
!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,
@@ -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:
- 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
diff --git a/src/uninst-pinentry.nsi b/src/uninst-pinentry.nsi
index 5cc2b10..785b3af 100644
--- a/src/uninst-pinentry.nsi
+++ b/src/uninst-pinentry.nsi
@@ -33,7 +33,7 @@ Section "-un.pinentry"
!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"
commit 03550750d4f581515b0349889ff8d1894943f3a6
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Sep 22 15:51:09 2015 +0200
Fix runtime libraries find and installation
* m4/gpg4win.m4(GPG4WIN_RUNTIME_LIBRARY): New. Helper for runtime
libraries. Searches more locations.
* configure.ac: Use above and add libwinpthread-1.dll dependency
* src/inst-gpg4win.nsi: Install libwinpthread-1.dll. Move runtime
libs from pub to top level install dir.
* src/uninst-gpg4win.nsi: Uninstall runtime libs from their
new location.
--
This also fixes the problem that libraries were not reported as
missing when no other missing tools were found missing.
diff --git a/configure.ac b/configure.ac
index f6a2b81..2bef226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -257,55 +257,10 @@ for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
fi
done
-# GpgOL and GpgEx need the runtime libaries
-# The default path should probably be more generic
-changequote(,)dnl
-gcc_major_minor=$($CC --version \
- | awk 'NR==1 {split($NF,a,"."); print a[1] "." a[2]}')
-changequote([,])dnl
-
-libgcc_dll=no
-AC_ARG_WITH([libgcc_s_sjlj-1-dll],
- AC_HELP_STRING([--with-libgcc_s_sjlj-1-dll=FILE],
- [use the libgcc_s_sjlj-1 DLL]),
- [libgcc_dll=$withval])
-
-if test "$libgcc_dll" = "no"; then
- file="/usr/lib/gcc/$host/$gcc_major_minor/libgcc_s_sjlj-1.dll"
- if test -r "$file"; then
- libgcc_dll="$file"
- fi
-fi
-if test "$libgcc_dll" = "no"; then
- missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
-else
- if test -r "$libgcc_dll"; then
- cp $libgcc_dll src/libgcc_s_sjlj-1.dll-x
- else
- missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
- fi
-fi
-
-libstdcpp_dll=no
-AC_ARG_WITH([libstdc++-6-dll],
- AC_HELP_STRING([--with-libstdc++-6-dll=FILE],
- [use the libstd++-6 DLL]),
- [libstdcpp_dll=$withval])
-if test "$libstdcpp_dll" = "no"; then
- file="/usr/lib/gcc/$host/$gcc_major_minor/libstdc++-6.dll"
- if test -r "$file"; then
- libstdcpp_dll="$file"
- fi
-fi
-if test "$libstdcpp_dll" = "no"; then
- missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
-else
- if test -r "$libstdcpp_dll"; then
- cp $libstdcpp_dll src/libstdc++-6.dll-x
- else
- missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
- fi
-fi
+# Additional runtime libraries from mingw.
+GPG4WIN_RUNTIME_LIBRARY(libgcc_s_sjlj-1)
+GPG4WIN_RUNTIME_LIBRARY(libstdc++-6)
+GPG4WIN_RUNTIME_LIBRARY(libwinpthread-1)
AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
diff --git a/m4/gpg4win.m4 b/m4/gpg4win.m4
index 7aa451b..279e2d6 100644
--- a/m4/gpg4win.m4
+++ b/m4/gpg4win.m4
@@ -726,3 +726,39 @@ AC_DEFUN([GPG4WIN_BPKG_BINSRC],
[$4])
])
+# Add a runtime library argument 1 should be the dll
+# name without the .dll suffix
+AC_DEFUN([GPG4WIN_RUNTIME_LIBRARY],
+[
+ dll_path="no"
+ AC_ARG_WITH([$1],
+ AS_HELP_STRING([--with-$1-dll[=FILE]],
+ [include FILE as runtime dependency for the installer.]),
+ [dll_path=$withval])
+
+ if test "$dll_path" = "no"; then
+ changequote(,)
+ gcc_major_minor=$($CC --version \
+ | awk 'NR==1 {split($NF,a,"."); print a[1] "." a[2]}')
+ changequote([,])
+ guesses="/usr/lib/gcc/$host/$gcc_major_minor/$1.dll
+ /usr/$host/lib/$1.dll
+ /usr/lib/gcc/$host/${gcc_major_minor}-win32/$1.dll"
+
+ for file in $guesses; do
+ if test -r "$file"; then
+ dll_path="$file"
+ break
+ fi
+ done
+ fi
+
+ if test "$dll_path" = "no"; then
+ AC_MSG_ERROR(can not find the runtime library $1.dll in the default locations.
+ Use the --with-$1 option to set the path directly.
+ )
+ fi
+ AC_MSG_NOTICE(Using $dll_path to provide $1)
+ $CP "$dll_path" src/$1.dll-x
+ $STRIP src/$1.dll-x
+])
diff --git a/src/inst-gpg4win.nsi b/src/inst-gpg4win.nsi
index 81c6e05..0e63295 100644
--- a/src/inst-gpg4win.nsi
+++ b/src/inst-gpg4win.nsi
@@ -86,12 +86,12 @@ Section "-gpg4win" SEC_gpg4win
File "${BUILD_DIR}/md5sum.exe"
File "${BUILD_DIR}/mkportable.exe"
- SetOutPath "$INSTDIR\pub"
# Install the mingw32 runtime libraries. They are stored in the
# build directory with a different suffix, so that makensis does not
- # list sumbol names.
+ # list symbol names.
File /oname=libstdc++-6.dll "${BUILD_DIR}/libstdc++-6.dll-x"
File /oname=libgcc_s_sjlj-1.dll "${BUILD_DIR}/libgcc_s_sjlj-1.dll-x"
+ File /oname=libwinpthread-1.dll "${BUILD_DIR}/libwinpthread-1.dll-x"
!endif
diff --git a/src/uninst-gpg4win.nsi b/src/uninst-gpg4win.nsi
index 82b93af..ba54fd4 100644
--- a/src/uninst-gpg4win.nsi
+++ b/src/uninst-gpg4win.nsi
@@ -36,9 +36,10 @@ Section "-un.gpg4win"
Delete "$INSTDIR\md5sum.exe"
Delete "$INSTDIR\mkportable.exe"
- # Delete the runtime libarries
- Delete "$INSTDIR\pub\libstdc++-6.dll"
- Delete "$INSTDIR\pub\libgcc_s_sjlj-1.dll"
+ # Delete the runtime libaries
+ Delete "$INSTDIR\libstdc++-6.dll"
+ Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
+ Delete "$INSTDIR\libwinpthread-1.dll"
# Delete standard stuff.
Delete "$INSTDIR\share\gpg4win\README.*.txt"
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 53 ++++-------------------------------------------
m4/gpg4win.m4 | 36 ++++++++++++++++++++++++++++++++
packages/packages.current | 4 ++--
src/Makefile.am | 10 ++-------
src/inst-gpg4win.nsi | 4 ++--
src/inst-pinentry.nsi | 4 ++--
src/uninst-gpg4win.nsi | 7 ++++---
src/uninst-pinentry.nsi | 2 +-
8 files changed, 53 insertions(+), 67 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list