[Gpg4win-commits] [git] Gpg4win - branch, gpg4win-2, updated. gpg4win-2.2.6-16-g051691f
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Nov 13 16:04:58 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, gpg4win-2 has been updated
via 051691f7439ff0cac26a07ac4c7dfef4a5a22757 (commit)
via 3158e10f857070de48db93a133a7770e41d7ef70 (commit)
via b89871bcb973121fecfaf824ce15be49662e11d2 (commit)
via 23202193d2a137585d425446c731a175007edb0c (commit)
via 0700ea5efaa37ec2644f77a150d9ff8af96139c4 (commit)
from 1caecd79efc622e640dea61dbb400de55e7aac84 (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 051691f7439ff0cac26a07ac4c7dfef4a5a22757
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 13 16:03:49 2015 +0100
Update gpgol to -beta104
* packages/packages.current (gpgol): Update.
--
The libmapi removal contained in beta103 led to a runtime problem.
diff --git a/NEWS b/NEWS
index faa8159..be316ce 100644
--- a/NEWS
+++ b/NEWS
@@ -47,7 +47,7 @@ Noteworthy changes in version 2.3.0 (unreleased)
GnuPG: 2.0.29
Kleopatra: 2.2.0-gitcf609810
GPA: 0.9.9
-GpgOL: 1.3.0-beta103
+GpgOL: 1.3.0-beta104
GpgEX: 1.0.2
Kompendium DE: 3.0.0
Kompendium EN: 3.0.0
diff --git a/packages/packages.current b/packages/packages.current
index 1fb5e36..e9452e0 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -266,8 +266,8 @@ server http://files.gpg4win.org/Beta/gpgol/
# last-changed: 2015-11-13
# by: ah
# verified: Sig 61AC 3F5E E4BE 593C 13D6 8B1E 7CBD 620B EC70 B1B8
-file 1.3.0-beta103/gpgol-1.3.0-beta103.tar.bz2
-chk e62a737adabe4d6c5a5b8a0541e74bf34d9948b5
+file 1.3.0-beta104/gpgol-1.3.0-beta104.tar.bz2
+chk 61d2e787e3a209b9e35a68c09006ddaa7711a5d7
#
commit 3158e10f857070de48db93a133a7770e41d7ef70
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 13 16:01:54 2015 +0100
Map zh_TW and zh_CN to their NSIS names.
* po/nsis-msgfmt.c: Fix mapping of zh_TW and zh_CN
diff --git a/po/nsis-msgfmt.c b/po/nsis-msgfmt.c
index c0f97cc..0d3984d 100644
--- a/po/nsis-msgfmt.c
+++ b/po/nsis-msgfmt.c
@@ -80,8 +80,8 @@ iso639_to_nsis (const char *ll, char **lang, char **nlf)
{ "bg", "LANG_BULGARIAN", "Bulgarian" },
{ "ca", "LANG_CATALAN", "Catalan" },
{ "zh", "LANG_CHINESE", NULL },
- { "zh_??", "SUBLANG_CHINESE_SIMPLIFIED", "SimpChinese" },
- { "zh_??", "SUBLANG_CHINESE_TRADITIONAL", "TradChinese" },
+ { "zh_CN", "SUBLANG_CHINESE_SIMPLIFIED", "SimpChinese" },
+ { "zh_TW", "SUBLANG_CHINESE_TRADITIONAL", "TradChinese" },
{ "zh_HK", "SUBLANG_CHINESE_HONGKONG", NULL },
{ "zh_SG", "SUBLANG_CHINESE_SINGAPORE", NULL },
{ "zh_MO", "SUBLANG_CHINESE_MACAU", NULL },
commit b89871bcb973121fecfaf824ce15be49662e11d2
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 13 16:01:29 2015 +0100
Fix typo in language installation
* src/inst-gpgol.nsi: Fix typo.
diff --git a/src/inst-gpgol.nsi b/src/inst-gpgol.nsi
index fb221d7..184056f 100644
--- a/src/inst-gpgol.nsi
+++ b/src/inst-gpgol.nsi
@@ -53,9 +53,9 @@ ${MementoSection} "GpgOL" SEC_gpgol
SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
File ${prefix}/share/locale/fr/LC_MESSAGES/gpgol.mo
SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
- File ${prefix}/share/locale/zn_CN/LC_MESSAGES/gpgol.mo
+ File ${prefix}/share/locale/zh_CN/LC_MESSAGES/gpgol.mo
SetOutPath "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
- File ${prefix}/share/locale/zn_TW/LC_MESSAGES/gpgol.mo
+ File ${prefix}/share/locale/zh_TW/LC_MESSAGES/gpgol.mo
SetOutPath "$INSTDIR\share\gpgol"
File "${prefix}/share/gpgol/*.cfg"
commit 23202193d2a137585d425446c731a175007edb0c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Nov 13 15:59:47 2015 +0100
Add patch to make libassuan-2.4.0 compile
* patches/libassuan-2.4.0/
0001-Fix-windows-build-with-mingw-w64-2.0.x.patch: New.
* Makefile.am (EXTRA_DIST): Add this.
--
Not needed on jessie
diff --git a/Makefile.am b/Makefile.am
index fe9e5d5..741f0ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch \
patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
- patches/scute-1.4.0/workaround-broken-libtool.patch
+ patches/scute-1.4.0/workaround-broken-libtool.patch \
+ patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch
copy-news:
cp NEWS doc/website/NEWS.last
diff --git a/patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch b/patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch
new file mode 100755
index 0000000..083b180
--- /dev/null
+++ b/patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch
@@ -0,0 +1,51 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From d9ce26f49e506d41317bae9357384bb811870d2e Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Fri, 13 Nov 2015 15:53:00 +0100
+Subject: [PATCH] Fix windows build with mingw-w64 2.0.x
+
+* src/assuan-socket.c: Add errno values not defined by mingw-w64 2.0
+---
+ src/assuan-socket.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/src/assuan-socket.c b/src/assuan-socket.c
+index 89723b3..5ad7299 100644
+--- a/src/assuan-socket.c
++++ b/src/assuan-socket.c
+@@ -70,6 +70,30 @@
+ # define S_IRGRP 0
+ # define S_IWGRP 0
+ #endif
++#ifndef ENOTSUP
++#define ENOTSUP 129
++#endif
++#ifndef EPROTO
++#define EPROTO 134
++#endif
++#ifndef EPROTONOSUPPORT
++#define EPROTONOSUPPORT 135
++#endif
++#ifndef ENETDOWN
++#define ENETDOWN 116
++#endif
++#ifndef ENETUNREACH
++#define ENETUNREACH 118
++#endif
++#ifndef EHOSTUNREACH
++#define EHOSTUNREACH 110
++#endif
++#ifndef ECONNREFUSED
++#define ECONNREFUSED 107
++#endif
++#ifndef ETIMEDOUT
++#define ETIMEDOUT 138
++#endif
+ #endif
+
+ #ifndef ENAMETOOLONG
+--
+2.1.4
commit 0700ea5efaa37ec2644f77a150d9ff8af96139c4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 15:12:32 2015 +0200
Change --build-w32 to old --build-w32-w64
* autogen.sh: Remove --build-w32-w64.
--
The build-w32-w64 command was never documented. Building
gpgex for 64 bit should be default for the convience
configure offered by autogen.sh
(cherry picked from commit 935576828cf0a77d952d8191def843e41512cbe0)
diff --git a/autogen.sh b/autogen.sh
index 731ef13..06be0c7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -79,10 +79,6 @@ myhostsub=""
case "$1" in
--build-w32)
myhost="w32"
- shift
- ;;
- --build-w32-w64)
- myhost="w32"
myhostsub="w64"
shift
;;
@@ -209,7 +205,7 @@ if test "$DIE" = "yes"; then
cat <<EOF
Note that you may use alternative versions of the tools by setting
-the corresponding environment variables; see README.SVN for details.
+the corresponding environment variables; see README.GIT for details.
EOF
exit 1
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 +-
NEWS | 2 +-
autogen.sh | 6 +--
packages/packages.current | 4 +-
...01-Fix-windows-build-with-mingw-w64-2.0.x.patch | 51 ++++++++++++++++++++++
po/nsis-msgfmt.c | 4 +-
src/inst-gpgol.nsi | 4 +-
7 files changed, 61 insertions(+), 13 deletions(-)
create mode 100755 patches/libassuan-2.4.0/0001-Fix-windows-build-with-mingw-w64-2.0.x.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list