[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-181-gc9418d8
by Werner Koch
cvs at cvs.gnupg.org
Fri May 10 20:21:55 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 c9418d85d9957de8b15d4e7b250f7b622b630006 (commit)
via c54e9ab6d8fcad06bb8a57427ec24a225c4c3f21 (commit)
via dc2f92ec90ebadaa69b6b0fdede1f771f9a89b2a (commit)
via 4bbc4f0da2c34bfd9ca461aac1200c10c69a524f (commit)
via 066177bcebc5600a2a8324d1778655706b52fc90 (commit)
via ca29a71333d7145da4dc4e07c710fc8ad4b0595d (commit)
via 04f8359777390deb0019e4e8d62b0d897d10b602 (commit)
from 847f1203895c94f75a5a563058ccaf1175af273a (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 c9418d85d9957de8b15d4e7b250f7b622b630006
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 13:14:01 2013 +0200
Remove remaining claws plugin cruft.
* src/Makefile.am (EXTRA_DIST): Remove rssyl and vcalendar.
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ff775c..1d4e00e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,8 +37,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
inst-libetpan.nsi uninst-libetpan.nsi \
inst-claws-mail.nsi uninst-claws-mail.nsi \
inst-gtkhtml2_viewer.nsi uninst-gtkhtml2_viewer.nsi \
- inst-vcalendar.nsi uninst-vcalendar.nsi \
- inst-rssyl.nsi uninst-rssyl.nsi \
inst-crypt.nsi uninst-crypt.nsi \
inst-dirmngr.nsi uninst-dirmngr.nsi \
inst-gettext.nsi uninst-gettext.nsi \
commit c54e9ab6d8fcad06bb8a57427ec24a225c4c3f21
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 13:14:01 2013 +0200
Update GnuPG to 2.0.20.
diff --git a/packages/packages.current b/packages/packages.current
index 55a36a5..1965487 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -403,10 +403,10 @@ chk 241afcb2dfbf3f3fc27891a53a33f12d9084d772
file libassuan/libassuan-2.1.0.tar.bz2
chk af114073610ce0b30961986c2741d5e7230c9880
-# 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: 2013-05-10 wk
+name gnupg2-2.0.20.tar.bz2
+file gnupg/gnupg-2.0.20.tar.bz2
+chk 7ddfefa37ee9da89a8aaa8f9059d251b4cd02562
# checked: 2013-04-26 wk
file dirmngr/dirmngr-1.1.1.tar.bz2
commit dc2f92ec90ebadaa69b6b0fdede1f771f9a89b2a
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 18:47:29 2013 +0200
Make make distcheck work.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Use host i686-w64-mingw32.
diff --git a/Makefile.am b/Makefile.am
index cab7fe7..bb212f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
+DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
SUBDIRS = po packages include doc src
commit 4bbc4f0da2c34bfd9ca461aac1200c10c69a524f
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 16:22:26 2013 +0200
Fix building of msis-msgfmt.
* po/Rules-nsis (nsis-msgfmt): Use detected build compiler.
* po/build-cc.in: New.
* configure.ac (BUILD_CC): New ac_subst.
diff --git a/.gitignore b/.gitignore
index 202252b..6a2a10d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ src/mingwm10.dll
/src/libgcc_s_sjlj-1.dll-x
/src/libstdc++-6.dll-x
+/po/build-cc
diff --git a/configure.ac b/configure.ac
index f9937a5..64a7371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,11 +225,12 @@ AC_CHECK_PROGS(SHA1SUM, sha1sum)
AC_CHECK_PROGS(MSGFMT, msgfmt)
AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
[build-aux/gitlog-to-changelog])
+AC_CHECK_PROGS(BUILD_CC, gcc cc)
AC_PROG_INSTALL
missing_tools=
for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
- DVIPDF CONVERT SHA1SUM MSGFMT ; do
+ DVIPDF CONVERT SHA1SUM MSGFMT BUILD_CC; do
eval tmp='$'$i
if test -z "$tmp"; then
missing_tools="$missing_tools `echo $i | tr 'A-Z' 'a-z'`"
@@ -410,6 +411,7 @@ chmod +x patches/gnupg2/01-version.patch
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(packages/Makefile include/Makefile src/Makefile po/Makefile.in)
+AC_CONFIG_FILES(po/build-cc)
AC_CONFIG_FILES(include/config.nsi src/gpg4win.mk)
AC_CONFIG_FILES(doc/Makefile)
AC_CONFIG_FILES(doc/logo/Makefile)
diff --git a/po/Rules-nsis b/po/Rules-nsis
index c82c351..7b55303 100644
--- a/po/Rules-nsis
+++ b/po/Rules-nsis
@@ -1,38 +1,36 @@
# Rules-nsis - Special Makefile rules for NSIS msg catalogs. -*- Makefile -*-
# Copyright (C) 2007 g10 Code GmbH
-#
+#
# This file is part of GPG4Win.
-#
+#
# GPG4Win is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# GPG4Win is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
NSIFILES = $(GMOFILES:.gmo=.nsi)
-DISTFILES.extra1 = nsis-xgettext.sh nsis-xgettext.awk nsis-msgfmt.c $(NSIFILES) \
- Rules-nsis README.nsis
+DISTFILES.extra1 = nsis-xgettext.sh nsis-xgettext.awk nsis-msgfmt.c \
+ $(NSIFILES) Rules-nsis build-cc.in README.nsis
.SUFFIXES: .nsi
-# We build this little utility on the BUILD architecture! FIXME: It
-# would not be unreasonable to use $(BUILD_CC) and corresponding tests
-# in configure.
+# We build this little utility on the BUILD architecture!
nsis-msgfmt: nsis-msgfmt.c
- $(CC) -o nsis-msgfmt $(srcdir)/nsis-msgfmt.c -lgettextpo
+ $$(cat $(srcdir)/build-cc) -o nsis-msgfmt $(srcdir)/nsis-msgfmt.c -lgettextpo
# We extend the GMO file mechanism to also handle NSIS files.
$(GMOFILES): %.gmo: %.nsi
-%.nsi : %.po
+%.nsi : %.po
$(MAKE) nsis-msgfmt
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && dir="" || dir="$(srcdir)/"; \
diff --git a/po/build-cc.in b/po/build-cc.in
new file mode 100644
index 0000000..27ae24c
--- /dev/null
+++ b/po/build-cc.in
@@ -0,0 +1 @@
+ at BUILD_CC@
commit 066177bcebc5600a2a8324d1778655706b52fc90
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 13:14:01 2013 +0200
claws: Cleanup removed packages NSI code.
* src/inst-sections.nsi: Enable libxml2 if rssyl is selected. Remove
dependency checks for removed plugin packages.
* include/config.nsi.in: Remove code for remove plugin packages.
claws: Cleanup removed packages NSI code.
diff --git a/configure.ac b/configure.ac
index e9cd5a5..f9937a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,10 +366,9 @@ GPG4WIN_SPKG([libxml2], [zlib])
GPG4WIN_SPKG([regex])
GPG4WIN_SPKG([crypt])
GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
- gpgme pthreads-w32 crypt regex libetpan gnutls])
+ gpgme pthreads-w32 crypt regex libetpan gnutls dnl
+ libxml2])
GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail libxml2])
-GPG4WIN_SPKG([vcalendar], [curl claws-mail])
-GPG4WIN_SPKG([rssyl], [curl claws-mail])
GPG4WIN_IPKG([compendium])
# Qt related stuff.
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 08265ad..9ef0eb0 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -637,27 +637,9 @@ Function CalcDepends
!ifdef HAVE_PKG_LIBXML2
!insertmacro UnselectSection ${SEC_libxml2}
!endif
-!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
- !insertmacro UnselectSection ${SEC_notification_plugin}
-!endif
!ifdef HAVE_PKG_GTKHTML2_VIEWER
!insertmacro UnselectSection ${SEC_gtkhtml2_viewer}
!endif
-!ifdef HAVE_PKG_VCALENDAR
- !insertmacro UnselectSection ${SEC_vcalendar}
-!endif
-!ifdef HAVE_PKG_RSSYL
- !insertmacro UnselectSection ${SEC_rssyl}
-!endif
-!ifdef HAVE_PKG_TNEF_PARSE
- !insertmacro UnselectSection ${SEC_tnef_parse}
-!endif
-!ifdef HAVE_PKG_ATTACHWARNER
- !insertmacro UnselectSection ${SEC_attachwarner}
-!endif
-!ifdef HAVE_PKG_BSFILTER_PLUGIN
- !insertmacro UnselectSection ${SEC_bsfilter_plugin}
-!endif
!ifdef HAVE_PKG_DBUS
!insertmacro UnselectSection ${SEC_dbus}
!endif
@@ -790,14 +772,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_gnutls}
# These are not build dependencies, but we always want to install
# all plugins.
- !insertmacro SelectSection ${SEC_bsfilter}
- !insertmacro SelectSection ${SEC_notification_plugin}
!insertmacro SelectSection ${SEC_gtkhtml2_viewer}
- !insertmacro SelectSection ${SEC_vcalendar}
- !insertmacro SelectSection ${SEC_rssyl}
- !insertmacro SelectSection ${SEC_tnef_parse}
- !insertmacro SelectSection ${SEC_attachwarner}
- !insertmacro SelectSection ${SEC_bsfilter_plugin}
skip_claws_mail:
!endif
@@ -823,20 +798,6 @@ Function CalcDepends
# Package "dbus" has no dependencies.
# Package "oxygen-icons" has no dependencies.
-!ifdef HAVE_PKG_RSSYL
- !insertmacro SectionFlagIsSet ${SEC_rssyl} ${SF_SELECTED} have_rssyl skip_rssyl
- have_rssyl:
- !insertmacro SelectSection ${SEC_curl}
- skip_rssyl:
-!endif
-
-!ifdef HAVE_PKG_VCALENDAR
- !insertmacro SectionFlagIsSet ${SEC_vcalendar} ${SF_SELECTED} have_vcalendar skip_vcalendar
- have_vcalendar:
- !insertmacro SelectSection ${SEC_curl}
- skip_vcalendar:
-!endif
-
!ifdef HAVE_PKG_GTKHTML2_VIEWER
!insertmacro SectionFlagIsSet ${SEC_gtkhtml2_viewer} ${SF_SELECTED} have_gtkhtml2_viewer skip_gtkhtml2_viewer
have_gtkhtml2_viewer:
@@ -845,13 +806,6 @@ Function CalcDepends
skip_gtkhtml2_viewer:
!endif
-!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
- !insertmacro SectionFlagIsSet ${SEC_notification_plugin} ${SF_SELECTED} have_notification_plugin skip_notification_plugin
- have_notification_plugin:
- !insertmacro SelectSection ${SEC_curl}
- skip_notification_plugin:
-!endif
-
!ifdef HAVE_PKG_LIBXML2
!insertmacro SectionFlagIsSet ${SEC_libxml2} ${SF_SELECTED} have_libxml2 skip_libxml2
have_libxml2:
commit ca29a71333d7145da4dc4e07c710fc8ad4b0595d
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 13:04:00 2013 +0200
Avoid makensis printing all symbols from gcc runtime libs.
* configure.ac: Store gcc runtile libs under a different name
* src/inst-gpg4win.nsi: Adjust for that name change.
diff --git a/.gitignore b/.gitignore
index fcf20df..202252b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,5 +73,6 @@ src/mingwm10.dll
/src/COMPONENTS-list.tmp
/web/
-/src/libgcc_s_sjlj-1.dll
-/src/libstdc++-6.dll
+
+/src/libgcc_s_sjlj-1.dll-x
+/src/libstdc++-6.dll-x
diff --git a/configure.ac b/configure.ac
index 22d2003..e9cd5a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,7 +258,7 @@ if test "$libgcc_dll" = "no"; then
missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
else
if test -r "$libgcc_dll"; then
- cp $libgcc_dll src/libgcc_s_sjlj-1.dll
+ cp $libgcc_dll src/libgcc_s_sjlj-1.dll-x
else
missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
fi
@@ -279,7 +279,7 @@ if test "$libstdcpp_dll" = "no"; then
missing_tools="libstdc++-6.dll $missing_tools"
else
if test -r "$libstdcpp_dll"; then
- cp $libstdcpp_dll src/libstdc++-6.dll
+ cp $libstdcpp_dll src/libstdc++-6.dll-x
else
missing_tools="libstdc++-6.dll $missing_tools"
fi
diff --git a/src/inst-gpg4win.nsi b/src/inst-gpg4win.nsi
index f761735..584c873 100644
--- a/src/inst-gpg4win.nsi
+++ b/src/inst-gpg4win.nsi
@@ -80,9 +80,11 @@ Section "-gpg4win" SEC_gpg4win
File "${BUILD_DIR}/md5sum.exe"
SetOutPath "$INSTDIR\pub"
- # Install the mingw runtime libaries
- File "${BUILD_DIR}/libstdc++-6.dll"
- File "${BUILD_DIR}/libgcc_s_sjlj-1.dll"
+ # Install the mingw32 runtime libraries. They are stored in the
+ # build directory with a different suffix, so that makensis does not
+ # list sumbol 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"
!endif
commit 04f8359777390deb0019e4e8d62b0d897d10b602
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 10 13:01:24 2013 +0200
claws: Update gtkhtml_2_viewer plugin.
* patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build: New.
* Makefile.am (EXTRA_DIST): Add patch.
* packages/packages.current: Enable gtkhtml2_viewer and update to
latest version.
diff --git a/Makefile.am b/Makefile.am
index a4e8d28..cab7fe7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/claws-mail-3.9.1/50-configure.patch \
patches/claws-mail-3.9.1/51-version-file.patch \
patches/claws-mail-3.9.1/80-src-makefile.postcfg-build \
+ patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build \
patches/gnutls-2.12.21/01-openssl-wincrypt.patch
copy-news:
diff --git a/packages/packages.current b/packages/packages.current
index 08fcfaa..55a36a5 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -148,8 +148,11 @@ server ftp://ftp.g10code.com/mirrors/claws
file claws-mail-3.9.1.tar.bz2
chk ec3a787b34b07983d938f7d353e3cfd85167122b
-#file gtkhtml2_viewer-0.33.tar.gz
-#chk b2a7047af55b2273e031e16806859458762d74a1
+server http://www.claws-mail.org/downloads/plugins
+
+# checked: 2013-05-10 wk
+file gtkhtml2_viewer-0.34.tar.gz
+chk 7f3f8a9e3f7bec443a51c890d1bbcd26049dde02
#
diff --git a/patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build b/patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build
new file mode 100755
index 0000000..68b722a
--- /dev/null
+++ b/patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build
@@ -0,0 +1,14 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+--- src/Makefile.orig 2013-05-10 12:39:57.612558040 +0200
++++ src/Makefile 2013-05-10 12:40:23.440554587 +0200
+@@ -261,7 +261,7 @@
+ top_builddir = ..
+ top_srcdir = ../../gtkhtml2_viewer-0.34
+ EXTRA_DIST = claws.def plugin.def version.rc
+-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
++LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 6 ++-
Makefile.am | 3 +-
configure.ac | 13 +++---
packages/packages.current | 15 ++++---
.../80-src-makefile.postcfg-build | 14 ++++++
po/Rules-nsis | 20 ++++-----
po/build-cc.in | 1 +
src/Makefile.am | 2 -
src/inst-gpg4win.nsi | 8 ++-
src/inst-sections.nsi | 46 --------------------
10 files changed, 51 insertions(+), 77 deletions(-)
create mode 100755 patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build
create mode 100644 po/build-cc.in
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list