[Gpg4win-commits] r661 - in trunk: . patches patches/gpgme src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-01-03 12:54:12 +0100 (Thu, 03 Jan 2008)
New Revision: 661

Added:
   trunk/patches/gpgme/
   trunk/patches/gpgme/01-gpg2.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/src/gpg4win.mk.in
Log:
Use gpg2.
Ipdate gpgol.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-03 10:08:13 UTC (rev 660)
+++ trunk/ChangeLog	2008-01-03 11:54:12 UTC (rev 661)
@@ -1,7 +1,15 @@
 2008-01-03  Werner Koch  <wk at g10code.com>
 
-	* packages/packages.current: Fix pinentry name.
+	* patches/gpgme/01-gpg2.patch: New.
+	* Makefile.am (EXTRA_DIST): Add it.
 
+	* src/gpg4win.mk.in (SETVARS): Add new var PKGPBDIR.
+	(SPKG_template) <stamps/stamp-$(1)-01-patch>: Allow for patches
+	without the version name of the package.
+	(MPKG_template) <stamps/stamp-$(1)-01-patch>: Ditto.
+
+	* packages/packages.current: Fix pinentry name.  Use gpgol svn 204.
+	
 2008-01-02  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update pinentry to 0.7.5-cvs.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-01-03 10:08:13 UTC (rev 660)
+++ trunk/Makefile.am	2008-01-03 11:54:12 UTC (rev 661)
@@ -57,6 +57,7 @@
 	patches/claws-mail-3.1.0cvs70/02-w32-icon.patch \
 	patches/claws-mail-3.1.0cvs70/03-smime-plugin.patch \
 	patches/claws-mail-3.1.0cvs70/99-auto.patch \
+	patches/gpgme/01-gpg2.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch
 
 copy-news:

Added: trunk/patches/gpgme/01-gpg2.patch
===================================================================
--- trunk/patches/gpgme/01-gpg2.patch	2008-01-03 10:08:13 UTC (rev 660)
+++ trunk/patches/gpgme/01-gpg2.patch	2008-01-03 11:54:12 UTC (rev 661)
@@ -0,0 +1,19 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Change gpgme to use gpg2.exe by default.
+
+
+--- gpgme/w32-util.c
++++ gpgme/w32-util.c
+@@ -274,7 +275,7 @@
+   if (!gpg_program)
+     gpg_program = find_program_in_registry ("gpgProgram");
+   if (!gpg_program)
+-    gpg_program = find_program_at_standard_place ("GNU\\GnuPG\\gpg.exe");
++    gpg_program = find_program_at_standard_place ("GNU\\GnuPG\\gpg2.exe");
+ #ifdef GPG_PATH
+   if (!gpg_program)
+     gpg_program = GPG_PATH;
+


Property changes on: trunk/patches/gpgme/01-gpg2.patch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2008-01-03 10:08:13 UTC (rev 660)
+++ trunk/src/gpg4win.mk.in	2008-01-03 11:54:12 UTC (rev 661)
@@ -59,6 +59,7 @@
 	pkgsdir="$(bdir)/$$$${pkg_version}";				\
 	pkgbdir="$(bdir)/$$$${pkg_version}-build";			\
 	pkgpdir="$(pdir)/$$$${pkg_version}";				\
+	pkgpbdir="$(pdir)/$(1)";	          			\
 	pkgidir="$(ipdir)/$$$${pkg_version}";				\
 	pkg_dev="$(call GETVAR,gpg4win_pkg_$(1)_dev)";			\
 	pkg_version_dev="$(1)-dev-$(call GETVAR,gpg4win_pkg_$(1)_version)"; \
@@ -117,7 +118,7 @@
 stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
 	(shopt -s nullglob;				\
 	 $(call SETVARS,$(1));				\
-	 for pfile in "$$$${pkgpdir}"/*.patch ; do	\
+	 for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do  \
 	   (cd "$$$${pkgsdir}"; "$$$${pfile}")		\
 	 done)
 	touch stamps/stamp-$(1)-01-patch
@@ -185,7 +186,7 @@
 stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
 	(shopt -s nullglob;				\
 	 $(call SETVARS,$(1));				\
-	 for pfile in "$$$${pkgpdir}"/*.patch ; do	\
+	 for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
 	   (cd "$$$${pkgsdir}"; "$$$${pfile}")		\
 	 done)
 	touch stamps/stamp-$(1)-01-patch