[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-122-gc2d4300
by Werner Koch
cvs at cvs.gnupg.org
Wed Apr 24 21:36:10 CEST 2013
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 c2d43000f8879ba11a016636e39c351962139417 (commit)
via f44607b4405fbbe9e414479afe468fe5974c5d61 (commit)
via d654a261188216b187fddcb798745526c5eb372f (commit)
via 332721862bcbd358f682053a862e14cb85d1c577 (commit)
via da5abb4ef4b81f81464ee6c547d8098f60706867 (commit)
from 4fc4de2572e799d3f744f802a9276ac0e27be46d (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 c2d43000f8879ba11a016636e39c351962139417
Author: Werner Koch <wk at gnupg.org>
Date: Wed Apr 24 21:18:21 2013 +0200
glib: Use the installed toolchain also for CXX.
* src/Makefile.am (gpg4win_pkg_glib_configure): Replace hardwired CCC
value. This is a cosmetic change CCC is only used by regression
tests.
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f5b740..ef75916 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,7 +119,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
gpg4win_pkg_glib_configure = \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
- CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib CCC=i586-mingw32msvc-g++
+ CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib CCC=$(host)-g++
gpg4win_pkg_glib_extracflags = -march=i486
gpg4win_pkg_gdk_pixbuf_configure = \
commit f44607b4405fbbe9e414479afe468fe5974c5d61
Author: Werner Koch <wk at gnupg.org>
Date: Wed Apr 24 21:09:37 2013 +0200
zlib: Use the installed toolchain.
* src/Makefile.am (gpg4win_pkg_zlib_make_args): Repalce hardwired
prefix by $(host).
diff --git a/src/Makefile.am b/src/Makefile.am
index 9ff7c9d..0f5b740 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -344,15 +344,16 @@ gpg4win_pkg_crypt_make_args = \
gpg4win_pkg_crypt_make_args_inst = \
prefix=$$$${pkgidir}
-gpg4win_pkg_zlib_make_args = -fwin32/Makefile.gcc PREFIX=i586-mingw32msvc- IMPLIB=libz.dll.a
+gpg4win_pkg_zlib_make_args = \
+ -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
BINARY_PATH=$$$${pkgidir}/bin INCLUDE_PATH=$$$${pkgidir}/include \
LIBRARY_PATH=$$$${pkgidir}/lib SHARED_MODE=1 IMPLIB=libz.dll.a
# Supported binary packages.
-gpg4win_bpkgs = libiconv gettext pkgconfig pango expat freetype fontconfig cairo \
- atk qt kdesupport oxygen-icons kdelibs kleopatra bsfilter
+gpg4win_bpkgs = libiconv gettext pkgconfig pango expat freetype fontconfig \
+ cairo atk qt kdesupport oxygen-icons kdelibs kleopatra bsfilter
# libiconv needs some special magic to generate a usable import
# library.
commit d654a261188216b187fddcb798745526c5eb372f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 16:46:05 2013 +0000
pthreads-w32: Add patch for newer mingw-w64 versions
* Makefile.am: Add patch to EXTRA_DIST
* patches/pthreads-w32-2-8-0-release: Add
02-mingw_w64_timespec_compatibility.patch
--
The mingw-w64 header included in debian sid define timespec in time.h
for windows. As pthread has not a configurable build system we check
for a definition made by the header instead of checking for the
struct.
(cherry picked from commit 3e813b391bf77b91b4492aafc5c8f136a60d535f)
diff --git a/Makefile.am b/Makefile.am
index b638f42..433cd16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ SUBDIRS = po packages include doc src
EXTRA_DIST = autogen.sh README.GIT ONEWS \
build-aux/git-log-footer build-aux/git-log-fix \
patches/pthreads-w32-2-8-0-release/01-make.patch \
+ patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch \
patches/glib-2.12.12/01-giowin32.patch \
patches/glib-2.12.12/02-gspawn-w32.patch \
patches/glib-2.12.12/03-gspawn-w32-fixup.patch \
diff --git a/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch b/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
new file mode 100755
index 0000000..cc83013
--- /dev/null
+++ b/patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
@@ -0,0 +1,34 @@
+#! /bin/sh
+# Ignore whitespace is necessary because the original context of the patch
+# contains whitespace errors
+patch -p0 -f --ignore-whitespace $* < $0
+exit $?
+
+2013-04-18 Andre Heinecke <aheinecke at intevation.de>
+
+ * pthread.h: Handle that struct timespec might be defined
+ on windows without _UWIN definition.
+
+--- pthread.h.orig 2013-04-18 15:52:11.470656381 +0000
++++ pthread.h 2013-04-18 15:52:14.762630601 +0000
+@@ -110,7 +110,6 @@
+ #endif
+
+ #ifdef _UWIN
+-# define HAVE_STRUCT_TIMESPEC 1
+ # define HAVE_SIGNAL_H 1
+ # undef HAVE_CONFIG_H
+ # pragma comment(lib, "pthread")
+@@ -227,6 +226,12 @@
+ #include <setjmp.h>
+ #include <limits.h>
+
++// Check if someone defined timespec
++#if defined(_UWIN) || defined(_TIMESPEC_DEFINED)
++# define HAVE_STRUCT_TIMESPEC 1
++#endif
++
++
+ /*
+ * Boolean values to make us independent of system includes.
+ */
commit 332721862bcbd358f682053a862e14cb85d1c577
Author: Werner Koch <wk at gnupg.org>
Date: Wed Apr 24 20:57:17 2013 +0200
A first set of patch to allow the use of i686-w64-mingw32.
* autogen.sh <build-w32>: Prefer the i686-w64-mingw32 toolchain.
* src/Makefile.am (gpg4win_pkg_crypt_make): Rename to
gpg4win_pkg_crypt_make_args to make it actually work.
* src/gpg4win.mk.in (stamps/stamp-$(1)-02-configure): Use host and
build instead host_cpu+host_os.
diff --git a/autogen.sh b/autogen.sh
index afe16d7..45de064 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -104,7 +104,7 @@ if [ "$myhost" = "w32" ]; then
case $myhostsub in
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
- toolprefixes="$w32_toolprefixes i586-mingw32msvc"
+ toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
extraoptions="$w32_extraoptions"
;;
diff --git a/src/Makefile.am b/src/Makefile.am
index e6ad550..9ff7c9d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -338,7 +338,7 @@ gpg4win_pkg_bzip2_make_args = \
gpg4win_pkg_bzip2_make_args_inst = \
PREFIX=$$$${pkgidir} CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
-gpg4win_pkg_crypt_make = \
+gpg4win_pkg_crypt_make_args = \
CC=$(CC) AR=$(AR)
gpg4win_pkg_crypt_make_args_inst = \
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 1324335..79b1d7a 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -135,8 +135,8 @@ stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
cd "$$$${pkgbdir}"; \
eval "../$$$${pkg_version}/configure" \
--prefix="$$$${pkgidir}" \
- --host=$(host_cpu)-$(host_os) \
- --build=$(build_cpu)-$(build_os) \
+ --host=$(host) \
+ --build=$(build) \
$$$${pkgcfg} CFLAGS=\"-mms-bitfields $$$${pkgextracflags}\")
touch stamps/stamp-$(1)-02-configure
commit da5abb4ef4b81f81464ee6c547d8098f60706867
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 23 10:08:00 2013 +0200
Update most ftp.gnupg.org packages.
--
diff --git a/packages/packages.current b/packages/packages.current
index e314988..9ef8356 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -334,8 +334,9 @@ chk 02ee561282ffd4a893e87be82a4a85b0435bc470
server ftp://ftp.g10code.com/g10code/w32pth
# checked: 2012-03-28 wk - still sufficient
-file w32pth-2.0.2.tar.bz2
-chk 9f43acb64867fb54b456f8a1187307ceb7bdf183
+# 2013-04-24 wk - updated to support w64-mingw32
+file w32pth-2.0.5.tar.bz2
+chk d648b98ce215f81e901f3f982470d37c704433a6
#
# Stripped down version of BZIP2
@@ -351,28 +352,28 @@ chk 6e38be3377340a21a1f13ff84b5e6adce97cd1d4
#
server ftp://ftp.gnupg.org/gcrypt
-# checked: 2012-03-28 wk
-file libgpg-error/libgpg-error-1.10.tar.bz2
-chk 95b324359627fbcb762487ab6091afbe59823b29
+# checked: 2013-04-23 wk
+file libgpg-error/libgpg-error-1.11.tar.bz2
+chk be209b013652add5c7e2c473ea114f58203cc6cd
-# checked: 2012-03-28 wk
-file libgcrypt/libgcrypt-1.5.0.tar.bz2
-chk 3e776d44375dc1a710560b98ae8437d5da6e32cf
+# checked: 2013-04-23 wk
+file libgcrypt/libgcrypt-1.5.2.tar.bz2
+chk c9998383532ba3e8bcaf690f2f0d65e814b48d2f
-# checked: 2012-03-28 wk
-file libksba/libksba-1.2.0.tar.bz2
-chk 0c4e593464b9dec6f53c728c375d54a095658230
+# checked: 2013-04-23 wk
+file libksba/libksba-1.3.0.tar.bz2
+chk 241afcb2dfbf3f3fc27891a53a33f12d9084d772
-# checked: 2012-03-28 wk
-file libassuan/libassuan-2.0.3.tar.bz2
-chk 2bf4eba3b588758e349976a7eb9e8a509960c3b5
+# checked: 2013-04-23 wk
+file libassuan/libassuan-2.1.0.tar.bz2
+chk af114073610ce0b30961986c2741d5e7230c9880
-# checked: 2012-03-28 wk
-name gnupg2-2.0.19.tar.bz2
-file gnupg/gnupg-2.0.19.tar.bz2
-chk 190c09e6688f688fb0a5cf884d01e240d957ac1f
+# checked: 2013-04-24 wk beta version for testing
+name gnupg2-2.0.20-beta118.tar.bz2
+file alpha/gnupg/gnupg-2.0.20-beta118.tar.bz2
+chk 4dafebee7b0c7adde2b27473faca7236851cf472
-# checked: 2012-03-28 wk
+# checked: 2013-04-23 wk
file dirmngr/dirmngr-1.1.0.tar.bz2
chk a7a7d1432db9edad2783ea1bce761a8106464165
@@ -385,11 +386,12 @@ chk 84a6940175b552a8562b4014f4661dec3ff10165
file scute/scute-1.4.0.tar.bz2
chk e28141d2b03612c09512651795976c58ed3f8035
-# checked: 2012-12-07 wk
-file gpgme/gpgme-1.3.2.tar.bz2
-chk 5b5ebcc4dad46ced0e436a30f5542577536619c7
+# checked: 2013-04-23 wk
+file gpgme/gpgme-1.4.0.tar.bz2
+chk 897e36c1d3f6595d69fb37c820aaa162daa0e369
# checked: 2012-12-07 wk
+# 2013-04-23 wk - waiting for next release
file gpa/gpa-0.9.3.tar.bz2
chk 8dc810e465ec49cd8353d93b3ede8e69ad3cf48b
@@ -412,9 +414,9 @@ chk 069bb0bdba28682f9fedcd446ae5d1b7633b9788
#
server ftp://ftp.g10code.com/g10code/adns
-# checked: 2012-03-28 wk
-file adns-1.4-g10-2.tar.bz2
-chk 6255a7958dc9e735c3f76595cd973abca09c1f93
+# checked: 2013-04-24 wk
+file adns-1.4-g10-3.tar.bz2
+chk ef483090edcdd85ae672aa3bab21526b1e335ae3
#
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 +
autogen.sh | 2 +-
packages/packages.current | 52 ++++++++++---------
.../02-mingw_w64_timespec_compatibility.patch | 34 +++++++++++++
src/Makefile.am | 11 ++--
src/gpg4win.mk.in | 4 +-
6 files changed, 71 insertions(+), 33 deletions(-)
create mode 100755 patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list