2007-07-09 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Mon, 9 Jul 2007 15:05:06 +0000 (15:05 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Mon, 9 Jul 2007 15:05:06 +0000 (15:05 +0000)
* patches/gpgol-0.9.91/01-gpgme.patch: New file.
* Makefile.am (EXTRA_DIST): Add patches/gpgol-0.9.91/01-gpgme.patch.

ChangeLog
Makefile.am
patches/gpgol-0.9.91/01-gpgme.patch [new file with mode: 0755]

index 2cf6683..de5db76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-09  Marcus Brinkmann  <marcus@g10code.de>
 
 2007-07-09  Marcus Brinkmann  <marcus@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.
        * packages/download.sh: Implement a new function "ren" for
        renaming.
        * packages/packages.current: Rename gnupg 2.
index 6fb80ae..0bd44fc 100644 (file)
@@ -57,7 +57,8 @@ EXTRA_DIST = autogen.sh README.SVN \
        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/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
 
 copy-news:
        cp NEWS doc/website/NEWS.last
diff --git a/patches/gpgol-0.9.91/01-gpgme.patch b/patches/gpgol-0.9.91/01-gpgme.patch
new file mode 100755 (executable)
index 0000000..5192df2
--- /dev/null
@@ -0,0 +1,32 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2007-07-02  Marcus Brinkmann <mb@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