[Pkg-privacy-commits] [pidgin-otr] 244/255: Update patches for cross-compiling on mingw32

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit fbf0c82173509e37c5df9919344514b86d3b42c8
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Mon Oct 20 15:14:15 2014 +0100

    Update patches for cross-compiling on mingw32
    
    There are small patches for libgpg-error and for libgcrypt
---
 patches/win32/gcrypt-1.5.4-mingw.diff   | 24 ++++++++++++++++++++++++
 patches/win32/gpg-error-1.17-mingw.diff | 25 +++++++++++++++++++++++++
 patches/win32/libgcrypt-config.h.patch  |  7 -------
 patches/win32/rndw32.diff               | 28 ----------------------------
 4 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/patches/win32/gcrypt-1.5.4-mingw.diff b/patches/win32/gcrypt-1.5.4-mingw.diff
new file mode 100644
index 0000000..8b5adef
--- /dev/null
+++ b/patches/win32/gcrypt-1.5.4-mingw.diff
@@ -0,0 +1,24 @@
+--- ltmain.sh.orig	2014-08-07 16:21:31.000000000 +0100
++++ ltmain.sh	2014-10-18 19:29:30.200877263 +0100
+@@ -5851,9 +5851,10 @@
+       # -tp=*                Portland pgcc target processor selection
+       # --sysroot=*          for sysroot support
+       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -fstack-protector*   stack protector flags for GCC
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+--- autogen.sh.orig	2014-10-20 14:05:57.538483259 +0100
++++ autogen.sh	2014-10-20 14:07:56.806478288 +0100
+@@ -140,6 +140,7 @@
+ 
+     $tsdir/configure --enable-maintainer-mode  --prefix=${w32root}  \
+             --host=${host} --build=${build} \
++            --enable-static --disable-shared \
+             --with-gpg-error-prefix=${w32root}
+     exit $?
+ fi
diff --git a/patches/win32/gpg-error-1.17-mingw.diff b/patches/win32/gpg-error-1.17-mingw.diff
new file mode 100644
index 0000000..7a998f0
--- /dev/null
+++ b/patches/win32/gpg-error-1.17-mingw.diff
@@ -0,0 +1,25 @@
+--- build-aux/ltmain.sh.orig	2014-01-10 14:00:06.000000000 +0000
++++ build-aux/ltmain.sh	2014-10-18 19:05:57.464936154 +0100
+@@ -5855,9 +5855,10 @@
+       # -tp=*                Portland pgcc target processor selection
+       # --sysroot=*          for sysroot support
+       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -fstack-protector*   stack protector flags for GCC
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+--- src/Makefile.in.orig	2014-10-18 19:24:18.096890273 +0100
++++ src/Makefile.in	2014-10-18 19:24:30.668889749 +0100
+@@ -451,7 +451,7 @@
+ @HAVE_W32_SYSTEM_TRUE at export_symbols = -export-symbols gpg-error.def
+ @HAVE_W32_SYSTEM_TRUE at libgpg_error_la_DEPENDENCIES = $(gpg_error_res) gpg-error.def
+ @HAVE_W32_SYSTEM_FALSE at intllibs = @LTLIBINTL@
+- at HAVE_W32_SYSTEM_TRUE@intllibs = 
++ at HAVE_W32_SYSTEM_TRUE@intllibs = @LTLIBINTL@
+ @HAVE_LD_VERSION_SCRIPT_FALSE at libgpg_error_vers_opt = 
+ 
+ #
diff --git a/patches/win32/libgcrypt-config.h.patch b/patches/win32/libgcrypt-config.h.patch
deleted file mode 100644
index ebed825..0000000
--- a/patches/win32/libgcrypt-config.h.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- config.h	2012-08-21 22:03:41.119779064 -0700
-+++ config.h	2012-08-21 22:04:27.999779052 -0700
-@@ -312,3 +312,4 @@
- 
- #define _GCRYPT_IN_LIBGCRYPT 1
- 
-+#undef HAVE_GETTIMEOFDAY
diff --git a/patches/win32/rndw32.diff b/patches/win32/rndw32.diff
deleted file mode 100644
index 01c0b62..0000000
--- a/patches/win32/rndw32.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- cipher/rndw32.c.orig	2003-12-11 10:46:12.000000000 -0500
-+++ cipher/rndw32.c	2005-01-18 09:45:26.000000000 -0500
-@@ -238,6 +238,8 @@
- 
-     /* Walk through the local heap */
-     {	HEAPLIST32 hl32;
-+	DWORD dwHeapsAdded = 0;
-+	const DWORD maxHeapsToAdd = 500;
- 	hl32.dwSize = sizeof (HEAPLIST32);
- 	if (pHeap32ListFirst (hSnapshot, &hl32)) {
- 	    if ( debug_me )
-@@ -254,12 +256,16 @@
- 		if (pHeap32First (&he32, hl32.th32ProcessID, hl32.th32HeapID)){
- 		    do {
- 			(*add) ( &he32, sizeof (he32), requester );
-+			if (++dwHeapsAdded == maxHeapsToAdd) {
-+			    goto doneheap;
-+			}
- 		    } while (pHeap32Next (&he32));
- 		}
- 	    } while (pHeap32ListNext (hSnapshot, &hl32));
- 	}
-     }
- 
-+doneheap:
- 
-     /* Walk through all processes */
-     {	PROCESSENTRY32 pe32;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git