mirror of https://git.wownero.com/dsc/mxe.git
update gsoap
This commit is contained in:
Mark Brand
parent
f28d710f7e
commit
c95db71a95
|
|
@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
|
|||
From 0000000000000000000000000000000000000000 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
|
||||
Subject: [PATCH 1/4] support static linking to ntlm
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
|
|
@ -27,14 +27,14 @@ index 1111111..2222222 100755
|
|||
From 0000000000000000000000000000000000000000 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
|
||||
Subject: [PATCH 2/4] ntlm support in .pc files
|
||||
|
||||
|
||||
diff --git a/gsoap++.pc.in b/gsoap++.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/gsoap++.pc.in
|
||||
+++ b/gsoap++.pc.in
|
||||
@@ -9,4 +9,4 @@ Version: @VERSION@
|
||||
@@ -9,4 +9,4 @@ Version: 2.8.92
|
||||
Requires:
|
||||
Libs: -L${libdir} -lgsoap++
|
||||
Libs.private: @SAMPLE_EXTRA_LIBS@
|
||||
|
|
@ -44,7 +44,7 @@ diff --git a/gsoap.pc.in b/gsoap.pc.in
|
|||
index 1111111..2222222 100644
|
||||
--- a/gsoap.pc.in
|
||||
+++ b/gsoap.pc.in
|
||||
@@ -9,4 +9,4 @@ Version: @VERSION@
|
||||
@@ -9,4 +9,4 @@ Version: 2.8.92
|
||||
Requires:
|
||||
Libs: -L${libdir} -lgsoap
|
||||
Libs.private: @SAMPLE_EXTRA_LIBS@
|
||||
|
|
@ -54,7 +54,7 @@ diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in
|
|||
index 1111111..2222222 100644
|
||||
--- a/gsoapck++.pc.in
|
||||
+++ b/gsoapck++.pc.in
|
||||
@@ -9,4 +9,4 @@ Version: @VERSION@
|
||||
@@ -9,4 +9,4 @@ Version: 2.8.92
|
||||
Requires:
|
||||
Libs: -L${libdir} -lgsoapck++
|
||||
Libs.private: @SAMPLE_EXTRA_LIBS@
|
||||
|
|
@ -64,7 +64,7 @@ diff --git a/gsoapck.pc.in b/gsoapck.pc.in
|
|||
index 1111111..2222222 100644
|
||||
--- a/gsoapck.pc.in
|
||||
+++ b/gsoapck.pc.in
|
||||
@@ -9,4 +9,4 @@ Version: @VERSION@
|
||||
@@ -9,4 +9,4 @@ Version: 2.8.92
|
||||
Requires:
|
||||
Libs: -L${libdir} -lgsoapck
|
||||
Libs.private: @SAMPLE_EXTRA_LIBS@
|
||||
|
|
@ -74,7 +74,7 @@ diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in
|
|||
index 1111111..2222222 100644
|
||||
--- a/gsoapssl++.pc.in
|
||||
+++ b/gsoapssl++.pc.in
|
||||
@@ -9,4 +9,4 @@ Version: @VERSION@
|
||||
@@ -9,4 +9,4 @@ Version: 2.8.92
|
||||
Requires:
|
||||
Libs: -L${libdir} -lgsoapssl++
|
||||
Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
|
||||
|
|
@ -84,7 +84,7 @@ diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in
|
|||
index 1111111..2222222 100644
|
||||
--- a/gsoapssl.pc.in
|
||||
+++ b/gsoapssl.pc.in
|
||||
@@ -9,4 +9,4 @@ Version: @VERSION@
|
||||
@@ -9,4 +9,4 @@ Version: 2.8.92
|
||||
Requires:
|
||||
Libs: -L${libdir} -lgsoapssl
|
||||
Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
|
||||
|
|
@ -94,7 +94,7 @@ index 1111111..2222222 100644
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Wed, 1 Feb 2017 12:32:00 +1100
|
||||
Subject: [PATCH 3/3] workaround for building on newer OSX, can be removed in
|
||||
Subject: [PATCH 3/4] workaround for building on newer OSX, can be removed in
|
||||
next update.
|
||||
|
||||
similar to https://github.com/unbit/uwsgi/pull/966
|
||||
|
|
@ -103,7 +103,7 @@ diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
|
|||
index 1111111..2222222 100644
|
||||
--- a/gsoap/stdsoap2.h
|
||||
+++ b/gsoap/stdsoap2.h
|
||||
@@ -3649,6 +3649,12 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_putsetcookies(struct soap *soap);
|
||||
@@ -3646,6 +3646,12 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_putsetcookies(struct soap *soap);
|
||||
SOAP_FMAC1 int SOAP_FMAC2 soap_putcookies(struct soap *soap, const char *domain, const char *path, int secure);
|
||||
#endif
|
||||
|
||||
|
|
@ -116,3 +116,23 @@ index 1111111..2222222 100644
|
|||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Tue, 17 Sep 2019 23:06:42 +0200
|
||||
Subject: [PATCH 4/4] fix pthreads with MINGW
|
||||
|
||||
|
||||
diff --git a/gsoap/plugin/threads.h b/gsoap/plugin/threads.h
|
||||
index 1111111..2222222 100644
|
||||
--- a/gsoap/plugin/threads.h
|
||||
+++ b/gsoap/plugin/threads.h
|
||||
@@ -102,7 +102,7 @@ The threads.h and threads.c code define the following portable API:
|
||||
*
|
||||
\******************************************************************************/
|
||||
|
||||
-#if defined(WIN32)
|
||||
+#if defined(WIN32) && !defined(MINGW)
|
||||
# define THREAD_TYPE HANDLE
|
||||
# define THREAD_ID GetCurrentThreadId()
|
||||
# define THREAD_CREATE(x,y,z) ((*(x) = (HANDLE)_beginthread((void(__cdecl*)(void*))(y), 0, (z))) == (HANDLE)-1L)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ PKG := gsoap
|
|||
$(PKG)_WEBSITE := https://www.genivia.com/dev.html
|
||||
$(PKG)_DESCR := gSOAP
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.8.87
|
||||
$(PKG)_CHECKSUM := 0d117633cb973dbd46a0bdcdcba74c67485aa9bc62b065e0ca621fdef9425dda
|
||||
$(PKG)_VERSION := 2.8.92
|
||||
$(PKG)_CHECKSUM := bcc77bc8843ae00091d40bbfaee5071665ca2793ac1e8f05de2e2d54a84a7ddb
|
||||
$(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
|
||||
$(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip
|
||||
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/gsoap2/gsoap-$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
|
||||
|
|
|
|||
Loading…
Reference in New Issue