mxe/src/gsoap-1-fixes.patch

130 lines
4.2 KiB
Diff
Raw Normal View History

2012-03-28 14:46:58 +01:00
This file is part of MXE.
2012-03-29 11:14:15 +01:00
See index.html for further information.
2011-09-19 14:39:23 +01:00
Contains ad hoc patches for cross building.
2012-12-10 09:13:08 +00:00
From 456c8b43d754248563fbb7ad57a0ff91a10fcb0d 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
2011-09-19 14:39:23 +01:00
diff --git a/configure b/configure
2012-12-10 09:13:08 +00:00
index 4dca8b9..61e9549 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"
;;
*-*-freebsd*) platform=FREEBSD ;;
*-*-openbsd*) platform=OPENBSD ;;
--
2012-12-10 09:13:08 +00:00
1.7.10.4
2012-12-10 09:13:08 +00:00
From f3aca73d1283bbcc1c2d7d622ada27b5b66a6af1 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
diff --git a/gsoap++.pc.in b/gsoap++.pc.in
index 035afd9..3411d55 100644
--- a/gsoap++.pc.in
+++ b/gsoap++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoap++ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoap.pc.in b/gsoap.pc.in
index e2607aa..96a54b9 100644
--- a/gsoap.pc.in
+++ b/gsoap.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoap @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in
index cb03e2f..b349049 100644
--- a/gsoapck++.pc.in
+++ b/gsoapck++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with Cookies Enabled
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapck++ @SAMPLE_EXTRA_LIBS@
-Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir}
+Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir}
diff --git a/gsoapck.pc.in b/gsoapck.pc.in
index 859a922..e5ce5eb 100644
--- a/gsoapck.pc.in
+++ b/gsoapck.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services with Cookies Enabled
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapck @SAMPLE_EXTRA_LIBS@
-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
--- a/gsoapssl++.pc.in
+++ b/gsoapssl++.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with SSL and ZLIB
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapssl++ @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
--- a/gsoapssl.pc.in
+++ b/gsoapssl.pc.in
@@ -8,4 +8,4 @@ Description: SOAP C Web Services with SSL and ZLIB
Version: @VERSION@
Requires:
Libs: -L${libdir} -lgsoapssl @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}
--
2012-12-10 09:13:08 +00:00
1.7.10.4
2012-12-10 09:13:08 +00:00
From 90981d5170719c8ed5865f97380d78e3e12c4f07 Mon Sep 17 00:00:00 2001
2012-08-20 12:27:23 +01:00
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 20 Aug 2012 13:12:49 +0200
Subject: [PATCH 3/3] fix MINGW compatibility
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
2012-12-10 09:13:08 +00:00
index 89f1c90..240a150 100644
2012-08-20 12:27:23 +01:00
--- a/gsoap/stdsoap2.h
+++ b/gsoap/stdsoap2.h
2012-12-10 09:13:08 +00:00
@@ -2215,13 +2215,13 @@ soap_wchar soap_get1(struct soap*);
2012-08-20 12:27:23 +01:00
SOAP_FMAC1 unsigned long SOAP_FMAC2 soap_strtoul(const char *s, char **t, int b);
#endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
# define soap_strtoll _strtoi64
#else
# define soap_strtoll strtoll
#endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
# define soap_strtoull _strtoui64
#else
# define soap_strtoull strtoull
--
2012-12-10 09:13:08 +00:00
1.7.10.4
2012-08-20 12:27:23 +01:00