diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-08-20 11:27:23 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2012-08-20 11:28:12 (GMT) |
| commit | 265514be947b05cc7d513f1852b50ddca8455844 (patch) | |
| tree | 5122ef4f0dea4f5127235ac0e84278f99a0c5a16 | |
| parent | 684557ddf32301a03f3ef8198ad7293e5df86723 (diff) | |
| download | mxe-265514be947b05cc7d513f1852b50ddca8455844.zip mxe-265514be947b05cc7d513f1852b50ddca8455844.tar.gz mxe-265514be947b05cc7d513f1852b50ddca8455844.tar.bz2 | |
update package gsoap
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | src/gsoap-1-fixes.patch | 52 | ||||
| -rw-r--r-- | src/gsoap.mk | 5 |
3 files changed, 41 insertions, 18 deletions
@@ -1195,7 +1195,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="gsoap-package">gsoap</td> - <td id="gsoap-version">2.8.9</td> + <td id="gsoap-version">2.8.10</td> <td id="gsoap-website"><a href="http://gsoap2.sourceforge.net/">gSOAP</a></td> </tr> <tr> diff --git a/src/gsoap-1-fixes.patch b/src/gsoap-1-fixes.patch index c4d18d9..b046df7 100644 --- a/src/gsoap-1-fixes.patch +++ b/src/gsoap-1-fixes.patch @@ -3,17 +3,14 @@ See index.html for further information. Contains ad hoc patches for cross building. -From a4e9166bc8d78b2aee3c25757d479d4c2e53c7be Mon Sep 17 00:00:00 2001 +From 538418ded4554eec40b6a889d58cfbb493cd9a2c 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 ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure b/configure -index ad1830d..be95edf 100755 +index 6ac9ee7..0570bb6 100755 --- a/configure +++ b/configure @@ -4822,7 +4822,7 @@ case "${host}" in @@ -26,22 +23,14 @@ index ad1830d..be95edf 100755 *-*-freebsd*) platform=FREEBSD ;; *-*-openbsd*) platform=OPENBSD ;; -- -1.7.7 +1.7.11.4 -From da0eb2fc386be0fd914ef8f9a7d6bf73004ea230 Mon Sep 17 00:00:00 2001 +From 41c709c382a1aa268c85d98df65562eb4563d640 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 ---- - gsoap++.pc.in | 2 +- - gsoap.pc.in | 2 +- - gsoapck++.pc.in | 2 +- - gsoapck.pc.in | 2 +- - gsoapssl++.pc.in | 2 +- - gsoapssl.pc.in | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gsoap++.pc.in b/gsoap++.pc.in index 035afd9..3411d55 100644 @@ -104,6 +93,37 @@ index 79c940a..17c9ee3 100644 -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.7 +1.7.11.4 +From 3b8d0a7db13b9c607e66c6a9d5455f26576d80fd 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 + +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 8718592..ab5bed4 100644 +--- a/gsoap/stdsoap2.h ++++ b/gsoap/stdsoap2.h +@@ -2195,13 +2195,13 @@ soap_wchar soap_get1(struct soap*); + 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 +-- +1.7.11.4 + diff --git a/src/gsoap.mk b/src/gsoap.mk index 423069a..e4a8ef5 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -3,7 +3,7 @@ PKG := gsoap $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 61ac88f1fd3f5f3a93358577c634302760d31640 +$(PKG)_CHECKSUM := 18cedfdabb79ad4e006db64ffd24d72f0d1fd6ba $(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FILE) @@ -16,6 +16,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + # avoid reconfiguration + cd '$(1)' && touch configure config.h.in + # Native build to get tools wsdl2h and soapcpp2 cd '$(1)' && ./configure |