[Gpg4win-commits] r450 - in trunk: . patches patches/gpgol-0.9.91

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-07-09 17:05:06 +0200 (Mon, 09 Jul 2007)
New Revision: 450

Added:
   trunk/patches/gpgol-0.9.91/
   trunk/patches/gpgol-0.9.91/01-gpgme.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
Log:
2007-07-09  Marcus Brinkmann  <marcus at g10code.de>

	* patches/gpgol-0.9.91/01-gpgme.patch: New file.
	* Makefile.am (EXTRA_DIST): Add patches/gpgol-0.9.91/01-gpgme.patch.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-09 14:29:25 UTC (rev 449)
+++ trunk/ChangeLog	2007-07-09 15:05:06 UTC (rev 450)
@@ -1,5 +1,8 @@
 2007-07-09  Marcus Brinkmann  <marcus at g10code.de>
 
+	* patches/gpgol-0.9.91/01-gpgme.patch: New file.
+	* Makefile.am (EXTRA_DIST): Add patches/gpgol-0.9.91/01-gpgme.patch.
+
 	* packages/download.sh: Implement a new function "ren" for
 	renaming.
 	* packages/packages.current: Rename gnupg 2.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-07-09 14:29:25 UTC (rev 449)
+++ trunk/Makefile.am	2007-07-09 15:05:06 UTC (rev 450)
@@ -57,7 +57,8 @@
 	patches/claws-mail-2.10.0/02-w32-icon.patch \
 	patches/claws-mail-2.10.0/03-w32-port.patch \
 	patches/claws-mail-2.10.0/04-smime-plugin.patch \
-	patches/claws-mail-2.10.0/99-auto.patch
+	patches/claws-mail-2.10.0/99-auto.patch \
+	patches/gpgol-0.9.91/01-gpgme.patch
 
 copy-news:
 	cp NEWS doc/website/NEWS.last

Added: trunk/patches/gpgol-0.9.91/01-gpgme.patch
===================================================================
--- trunk/patches/gpgol-0.9.91/01-gpgme.patch	2007-07-09 14:29:25 UTC (rev 449)
+++ trunk/patches/gpgol-0.9.91/01-gpgme.patch	2007-07-09 15:05:06 UTC (rev 450)
@@ -0,0 +1,32 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2007-07-02  Marcus Brinkmann <mb at g10code.com>
+
+	* src/Makefile.am (gpgol_LDADD): Add -lws2_32 for GPGME.
+
+diff -rup gpgol-0.9.91-orig/src/Makefile.am gpgol-0.9.91/src/Makefile.am
+--- gpgol-0.9.91-orig/src/Makefile.am	2006-04-25 16:08:31.000000000 +0200
++++ gpgol-0.9.91/src/Makefile.am	2007-07-09 16:46:08.000000000 +0200
+@@ -70,7 +70,7 @@ clean-local:
+ 
+ gpgol_LDADD = $(srcdir)/gpgol.def  \
+ 	-L . -lgpgme -lgpg-error -lmapi32 -lshell32 -lgdi32 -lcomdlg32 \
+-        -loleaut32
++        -loleaut32 -lws2_32
+ 
+ resource.o: resource.rc versioninfo.rc gpgol-rsrcs.rc olflange-rsrcs.rc
+ 
+diff -rup gpgol-0.9.91-orig/src/Makefile.in gpgol-0.9.91/src/Makefile.in
+--- gpgol-0.9.91-orig/src/Makefile.in	2006-10-13 08:46:04.000000000 +0200
++++ gpgol-0.9.91/src/Makefile.in	2007-07-09 16:46:18.000000000 +0200
+@@ -265,7 +265,7 @@ gpgol_SOURCES = \
+ gpgol_DEPENDENCIES = libmapi32.a libgpgme.a libgpg-error.a
+ gpgol_LDADD = $(srcdir)/gpgol.def  \
+ 	-L . -lgpgme -lgpg-error -lmapi32 -lshell32 -lgdi32 -lcomdlg32 \
+-        -loleaut32
++        -loleaut32 -lws2_32
+ 
+ all: all-am
+ 


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