2009-04-02 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 2 Apr 2009 19:08:47 +0000 (19:08 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 2 Apr 2009 19:08:47 +0000 (19:08 +0000)
* Makefile.am (EXTRA_DIST): Add patches for claws.
* patches/claws-3.7.1/03-pipe.patch: New file.

ChangeLog
Makefile.am
patches/claws-mail-3.7.1/03-pipe.patch [new file with mode: 0755]

index c710adc..b2a9db7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-02  Marcus Brinkmann  <marcus@g10code.de>
 
+       * Makefile.am (EXTRA_DIST): Add patches for claws.
+       * patches/claws-3.7.1/03-pipe.patch: New file.
+
        * src/Makefile.am (gpg4win_pkg_glib_configure): Set CCC to mingw's g++.
 
 2009-03-25  Werner Koch  <wk@g10code.com>
index 9a9aee5..68add2d 100644 (file)
@@ -47,6 +47,9 @@ EXTRA_DIST = autogen.sh README.SVN \
        patches/gnupg2-2.0.9/04-ks-w32init.patch \
        patches/gnupg2-2.0.9/05-w32-http.patch \
        patches/gpgol-0.9.91/01-gpgme.patch \
+       patches/claws-3.7.1/01-fix-spaces-after-re.patch \
+       patches/claws-3.7.1/02-3.7.1cvs22.patch \
+        patches/claws-3.7.1/03-pipe.patch \
         patches/scute-1.2.0/01-bugfixes.patch
 
 copy-news:
diff --git a/patches/claws-mail-3.7.1/03-pipe.patch b/patches/claws-mail-3.7.1/03-pipe.patch
new file mode 100755 (executable)
index 0000000..ccfa1a4
--- /dev/null
@@ -0,0 +1,41 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Marcus: New glib dropped pipe() macro.
+
+diff -rup claws-mail-3.7.1-cur/src/common/w32lib.h claws-mail-3.7.1/src/common/w32lib.h
+--- claws-mail-3.7.1-cur/src/common/w32lib.h   2009-03-06 07:01:00.000000000 +0100
++++ claws-mail-3.7.1/src/common/w32lib.h       2009-04-02 20:54:46.000000000 +0200
+@@ -74,6 +74,7 @@
+ #include <windows.h>
+ #include <io.h>
+ #include <stdio.h>
++#include <glib.h>
+ #ifdef __MINGW32__
+ #include <_mingw.h>
+@@ -193,6 +194,10 @@ unsigned int sleep( unsigned int seconds
+ int link( const char *oldpath, const char *newpath );
+ int usleep( unsigned long usec );
++#if GLIB_CHECK_VERSION(2, 13, 2)
++#define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
++#endif
++
+ /*** stdlib ***/
+ long int random( void );
+ void srandom( unsigned int seed );
+diff -rup claws-mail-3.7.1-cur/src/etpan/etpan-thread-manager.c claws-mail-3.7.1/src/etpan/etpan-thread-manager.c
+--- claws-mail-3.7.1-cur/src/etpan/etpan-thread-manager.c      2009-04-02 16:10:46.000000000 +0200
++++ claws-mail-3.7.1/src/etpan/etpan-thread-manager.c  2009-04-02 20:55:09.000000000 +0200
+@@ -66,5 +66,9 @@ enum {
+   TERMINATE_STATE_DONE,
+ };
++#if GLIB_CHECK_VERSION (2, 13, 2)
++#define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
++#endif
++ 
+ struct etpan_thread_manager * etpan_thread_manager_new(void)
+ {