update package gsoap

pull/13/head
Mark Brand 13 years ago
parent 2783c527a6
commit d16880da80

@ -3,65 +3,25 @@ See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 35024d3ef8fb879a92de71b738ad985b6e8318af Mon Sep 17 00:00:00 2001
From a4e9166bc8d78b2aee3c25757d479d4c2e53c7be Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Mon, 19 Sep 2011 15:22:59 +0200
Subject: [PATCH] bugfix for 2.8.3 from:
http://www.cs.fsu.edu/~engelen/soapbugs.html
Date: Sun, 23 Oct 2011 21:36:53 +0200
Subject: [PATCH] support static linking to ntlm
diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
index 6f05170..f31676b 100644
--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
@@ -8261,7 +8261,7 @@ soap_copy_context(struct soap *copy, const struct soap *soap)
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else
diff --git a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
index 6f05170..f31676b 100644
--- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
+++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
@@ -8261,7 +8261,7 @@ soap_copy_context(struct soap *copy, const struct soap *soap)
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else
diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c
index 6f05170..f31676b 100644
--- a/gsoap/stdsoap2.c
+++ b/gsoap/stdsoap2.c
@@ -8261,7 +8261,7 @@ soap_copy_context(struct soap *copy, const struct soap *soap)
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else
diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
index 6f05170..f31676b 100644
--- a/gsoap/stdsoap2.cpp
+++ b/gsoap/stdsoap2.cpp
@@ -8261,7 +8261,7 @@ soap_copy_context(struct soap *copy, const struct soap *soap)
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else
diff --git a/configure b/configure
index ad1830d..be95edf 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 ;;
--
1.7.6.1
1.7.7

@ -4,13 +4,13 @@
# gSOAP
PKG := gsoap
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.8.3
$(PKG)_CHECKSUM := 55677239751253b48f448eb30a7585df97cba486
$(PKG)_VERSION := 2.8.4
$(PKG)_CHECKSUM := fea8734c83c2b5f9d07c44c556b27a6ce7ff0649
$(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
$(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip
$(PKG)_WEBSITE := http://gsoap2.sourceforge.net/
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FILE)
$(PKG)_DEPS := gcc gnutls
$(PKG)_DEPS := gcc gnutls libntlm
define $(PKG)_UPDATE
wget -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \
@ -42,7 +42,8 @@ define $(PKG)_BUILD
cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--host='$(TARGET)' \
--enable-gnutls
--enable-gnutls \
CPPFLAGS='-DWITH_NTLM'
# Building for mingw requires native soapcpp2
ln -sf '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2'

Loading…
Cancel
Save