diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-01-22 10:19:40 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2013-01-22 10:19:40 (GMT) |
| commit | dcf0baaeffdf229b46fb99a256ee433e22e34a50 (patch) | |
| tree | 4e97bb01b507d4bdcdb7c3fa730d22dc4f05f2dc /src/gsoap-1-fixes.patch | |
| parent | d33a9a6b8aa5d99e6f77583bfa46706965178abe (diff) | |
| download | mxe-dcf0baaeffdf229b46fb99a256ee433e22e34a50.zip mxe-dcf0baaeffdf229b46fb99a256ee433e22e34a50.tar.gz mxe-dcf0baaeffdf229b46fb99a256ee433e22e34a50.tar.bz2 | |
update package gsoap
Diffstat (limited to 'src/gsoap-1-fixes.patch')
| -rw-r--r-- | src/gsoap-1-fixes.patch | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/src/gsoap-1-fixes.patch b/src/gsoap-1-fixes.patch index 0d0d701..ce24aed 100644 --- a/src/gsoap-1-fixes.patch +++ b/src/gsoap-1-fixes.patch @@ -3,30 +3,39 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 456c8b43d754248563fbb7ad57a0ff91a10fcb0d Mon Sep 17 00:00:00 2001 +From 132b5b5d092d73faaafbdc5225bf7da1c7bca7f1 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 23 Oct 2011 21:36:53 +0200 Subject: [PATCH 1/3] support static linking to ntlm diff --git a/configure b/configure -index 4dca8b9..61e9549 100755 +index ee860c3..916d009 100755 --- a/configure +++ b/configure @@ -4822,7 +4822,7 @@ case "${host}" in ;; *-*-cygwin*) platform=CYGWIN ;; *-*-mingw*) platform=MINGW -- SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32" -+ SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32" +- SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm" ++ SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32 -lm" ;; *-*-freebsd*) platform=FREEBSD ;; *-*-openbsd*) platform=OPENBSD ;; +@@ -7336,7 +7336,7 @@ echo $ECHO_N "checking for enable gnutls in library... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP" +- WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" ++ WSDL2H_EXTRA_LIBS="-lntlm -lgnutls -lgcrypt -lgpg-error -lz" + SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" + else -- 1.7.10.4 -From f3aca73d1283bbcc1c2d7d622ada27b5b66a6af1 Mon Sep 17 00:00:00 2001 +From dd5f823a0c846d0705c7502b796d5e077d1ba8e5 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 24 Oct 2011 11:17:13 +0200 Subject: [PATCH 2/3] ntlm support in .pc files @@ -73,30 +82,30 @@ index 859a922..e5ce5eb 100644 -Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir} +Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir} diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in -index 391d820..791408a 100644 +index 6378d0e..2a68e09 100644 --- a/gsoapssl++.pc.in +++ b/gsoapssl++.pc.in -@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with SSL and ZLIB - Version: @VERSION@ +@@ -9,4 +9,4 @@ Version: @VERSION@ Requires: - Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ + Libs: -L${libdir} -lgsoapssl++ + Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ -Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} +Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in -index 79c940a..17c9ee3 100644 +index 365274b..82af331 100644 --- a/gsoapssl.pc.in +++ b/gsoapssl.pc.in -@@ -8,4 +8,4 @@ Description: SOAP C Web Services with SSL and ZLIB - Version: @VERSION@ +@@ -9,4 +9,4 @@ Version: @VERSION@ Requires: - Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ + Libs: -L${libdir} -lgsoapssl + Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ -Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} +Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} -- 1.7.10.4 -From 90981d5170719c8ed5865f97380d78e3e12c4f07 Mon Sep 17 00:00:00 2001 +From 80e9efe3c7edef979840ff6526e06efb3d5ebf22 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 20 Aug 2012 13:12:49 +0200 Subject: [PATCH 3/3] fix MINGW compatibility @@ -105,10 +114,10 @@ taken from https://sourceforge.net/tracker/?func=detail&aid=3559816&group_id=52781&atid=468023 diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h -index 89f1c90..240a150 100644 +index 7e50e95..b93e12c 100644 --- a/gsoap/stdsoap2.h +++ b/gsoap/stdsoap2.h -@@ -2215,13 +2215,13 @@ soap_wchar soap_get1(struct soap*); +@@ -2244,13 +2244,13 @@ soap_wchar soap_get1(struct soap*); SOAP_FMAC1 unsigned long SOAP_FMAC2 soap_strtoul(const char *s, char **t, int b); #endif |