[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.0-23-gedb5ba8
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Nov 30 15:36:34 CET 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 edb5ba81a7cb4523d02ed8619f1ad157c09ff443 (commit)
from 8bf10e2ff49add53725413e7ba208d6aa96776af (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 edb5ba81a7cb4523d02ed8619f1ad157c09ff443
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 30 15:32:36 2015 +0100
Add 64bit version of GpgOL
* configure.ac: Mark gpgme and gpgol als SPKGEX. Clarify output.
* doc/README.de.txt, doc/README.en.txt: Note 64 support.
* packages/packages.current (gpgol): Update to beta for testing.
* src/Makefile.am: Mark gpgme and gpgol as expkgs. Add config opts.
* src/inst-gpgex.nsi: Undefine exprefix if necessary.
* src/inst-gpgol.nsi: Install 64 bit variant.
* src/uninst-gpgol.nsi: Uninstall 64 bit variant.
diff --git a/configure.ac b/configure.ac
index 2bef226..2804164 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,8 @@ GPG4WIN_SPKG([gettext], [libiconv])
GPG4WIN_SPKGEX([libgpg-error])
GPG4WIN_SPKGEX([libassuan], [libgpg-error])
GPG4WIN_SPKGEX([gpgex], [libassuan])
+GPG4WIN_SPKGEX([gpgme], [libgpg-error libassuan])
+GPG4WIN_SPKGEX([gpgol], [gpgme])
GPG4WIN_IPKG([compendium])
@@ -389,6 +391,6 @@ echo "
$PACKAGE_NAME-$PACKAGE_VERSION prepared for make
Revision: ${GIT_REVISION} (${GIT_REVISION_DEC})
- Platform: $host
- Additional gpgEx platform: ${GPGEX_ADD_HOST}
+ 32bit platform: $host
+ 64bit platform: ${GPGEX_ADD_HOST}
"
diff --git a/doc/README.de.txt b/doc/README.de.txt
index a8a3d12..e23691b 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -36,7 +36,7 @@ Gpg4win unterst
* Betriebssystem: Windows XP und neuere Versionen (für alle: 32/64 bit)
- * MS Outlook: 2003, 2007, 2010, 2013, 2016 (alle nur 32 bit!)
+ * MS Outlook: 2003, 2007, 2010, 2013, 2016 (2010 und spätere auch in 64bit)
2. Änderungen
diff --git a/doc/README.en.txt b/doc/README.en.txt
index db0392d..fec0f5b 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -34,7 +34,7 @@ Gpg4win supports these platforms:
* Operating System: Windows XP and later Versions (for all: 32/64 bit)
- * MS Outlook: 2003, 2007, 2010, 2013, 2016 (for all: only 32bit!)
+ * MS Outlook: 2003, 2007, 2010, 2013, 2016 (2010 and later also in 64bit)
2. Changes
diff --git a/packages/packages.current b/packages/packages.current
index 4f10ade..bb1c2b8 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -229,13 +229,12 @@ chk f5230890dc0be42fb5c58fbf793da253155de106
#
# GpgOL
#
-server ftp://ftp.g10code.com/g10code/gpgol
+server http://files.gpg4win.org/Beta/gpgol
-# last-changed: 2015-11-24
+# last-changed: 2015-11-30
# by: ah
-# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
-file gpgol-1.3.0.tar.bz2
-chk c569e7b223f7b5efcce38cc4a4445127744c0454
+file 1.3.1-beta7/gpgol-1.3.1-beta7.tar.bz2
+chk d50af4273def6c212b2872e094cb258f27f2dfc1
#
# GpgEX
diff --git a/src/Makefile.am b/src/Makefile.am
index 441356d..d8ef66e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,7 +90,8 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
w32pth paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
-gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex
+gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
+ gpgme
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -170,7 +171,6 @@ gpg4win_pkg_libgpg_error_configure = --silent \
--enable-static
gpg4win_pkg_libgpg_error_ex_configure = --silent \
- CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib \
--enable-static
# We convert the PO files to UTF-8. FIXME: This should be done in
@@ -208,12 +208,11 @@ gpg4win_pkg_gpgme_configure = --silent \
--with-gpg-error-prefix=$(idir) --enable-static \
`test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
--disable-w32-qt LDFLAGS=-L$(idir)/lib
-# `test -n "@HAVE_PKG_QT@" && echo "--disable-w32-qt"` \
-# QT4_CORE_CFLAGS=\"-DQT_LARGEFILE_SUPPORT -DQT_DLL \
-# -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT \
-# -I$(idir)/include/QtCore -I$(idir)/include \
-# -I$(idir)/mkspecs/win32-g++\" \
-# QT4_CORE_LIBS=\"-L$(idir)/lib -lQtCore4\"
+
+gpg4win_pkg_gpgme_ex_configure = --silent \
+ --with-gpg-error-prefix=$(ex_idir) --enable-static \
+ --with-libassuan-prefix=$(ex_idir) \
+ LDFLAGS=-L$(ex_idir)/lib
gpg4win_pkg_gpa_configure = --silent \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
@@ -224,6 +223,10 @@ gpg4win_pkg_gpgol_configure = --silent \
--with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
+gpg4win_pkg_gpgol_ex_configure = --silent \
+ --with-gpgme-prefix=$(ex_idir) --with-gpg-error-prefix=$(ex_idir) \
+ --with-libassuan-prefix=$(ex_idir)
+
gpg4win_pkg_gpgex_configure = --silent \
--with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir)
diff --git a/src/inst-gpgex.nsi b/src/inst-gpgex.nsi
index b486d1e..8eced8d 100644
--- a/src/inst-gpgex.nsi
+++ b/src/inst-gpgex.nsi
@@ -20,6 +20,9 @@
!ifdef prefix
!undef prefix
!endif
+!ifdef exprefix
+!undef exprefix
+!endif
!define prefix ${ipdir}/gpgex-${gpg4win_pkg_gpgex_version}
!define exprefix ${exipdir}/gpgex-${gpg4win_pkg_gpgex_version}
diff --git a/src/inst-gpgol.nsi b/src/inst-gpgol.nsi
index 184056f..d80dc59 100644
--- a/src/inst-gpgol.nsi
+++ b/src/inst-gpgol.nsi
@@ -20,8 +20,12 @@
!ifdef prefix
!undef prefix
!endif
+!ifdef exprefix
+!undef exprefix
+!endif
!define prefix ${ipdir}/gpgol-${gpg4win_pkg_gpgol_version}
!define bdir ${bpdir}/gpgol-${gpg4win_pkg_gpgol_version}-build
+!define exprefix ${exipdir}/gpgol-${gpg4win_pkg_gpgol_version}
${MementoSection} "GpgOL" SEC_gpgol
@@ -64,7 +68,30 @@ ${MementoSection} "GpgOL" SEC_gpgol
SetOutPath "$INSTDIR\share\doc\gpgol"
File "${bdir}/doc/gpgol.pdf"
+${If} ${RunningX64}
+
+ # Install the 64 bit version of the dll.
+ SetOutPath "$INSTDIR\bin"
+ ClearErrors
+ SetOverwrite try
+ File ${exprefix}/bin/gpgol.dll
+ SetOverwrite lastused
+ ifErrors 0 do_reg64
+ File /oname=gpgol.dll.tmp ${exprefix}/bin/gpgol.dll
+ Rename /REBOOTOK gpgol.dll.tmp gpgol.dll
+
+ do_reg64:
+ # Register the DLL. We need to register both versions. However
+ # RegDLL can't be used for 64 bit and InstallLib seems to be a
+ # registry hack.
+ ClearErrors
+ ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin\gpgol.dll"'
+ ifErrors 0 +2
+ MessageBox MB_OK "$(T_GpgOL_RegFailed) (64 bit)"
+${EndIf}
+
!endif
+
${MementoSectionEnd}
diff --git a/src/uninst-gpgol.nsi b/src/uninst-gpgol.nsi
index 46216cd..0f6be8b 100644
--- a/src/uninst-gpgol.nsi
+++ b/src/uninst-gpgol.nsi
@@ -62,6 +62,11 @@ Section "-un.gpgol"
UnRegDLL "$INSTDIR\gpgol.dll"
Delete /REBOOTOK "$INSTDIR\gpgol.dll"
+
+${If} ${RunningX64}
+ ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin\gpgol.dll"'
+ Delete /REBOOTOK "$INSTDIR\bin\gpgol.dll"
+${EndIf}
RMDir "$INSTDIR"
!endif
SectionEnd
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 6 ++++--
doc/README.de.txt | 2 +-
doc/README.en.txt | 2 +-
packages/packages.current | 9 ++++-----
src/Makefile.am | 19 +++++++++++--------
src/inst-gpgex.nsi | 3 +++
src/inst-gpgol.nsi | 27 +++++++++++++++++++++++++++
src/uninst-gpgol.nsi | 5 +++++
8 files changed, 56 insertions(+), 17 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list