Mercurial > mxe-octave
changeset 1165:44c4736fd51f
upgrade package gsoap
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 20 Sep 2010 01:24:03 +0200 |
| parents | 1a17aa44edbe |
| children | 777cb814bceb |
| files | src/gsoap-1-link-dom.patch src/gsoap-2-locale.patch src/gsoap.mk |
| diffstat | 3 files changed, 31 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gsoap-1-link-dom.patch Sun Sep 19 01:59:47 2010 +0200 +++ b/src/gsoap-1-link-dom.patch Mon Sep 20 01:24:03 2010 +0200 @@ -1,10 +1,13 @@ This file is part of mingw-cross-env. See doc/index.html for further information. -diff -urN a/gsoap/Makefile.am b/gsoap/Makefile.am ---- a/gsoap/Makefile.am 2009-11-07 21:07:06.000000000 +0100 -+++ b/gsoap/Makefile.am 2010-01-22 21:33:36.000000000 +0100 -@@ -31,22 +31,26 @@ +This patch has been taken from: +http://sourceforge.net/tracker/index.php?func=detail&aid=2937534&group_id=52781&atid=468023 + +diff --git a/gsoap/Makefile.am b/gsoap/Makefile.am +--- a/gsoap/Makefile.am ++++ b/gsoap/Makefile.am +@@ -31,22 +31,26 @@ stdsoap2_ssl.c: stdsoap2.cpp stdsoap2_ssl_cpp.cpp: stdsoap2.cpp $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp @@ -26,12 +29,11 @@ -libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp +libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES --libgsoapssl_a_SOURCES = stdsoap2_ssl.c -+libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c - libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP --libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp + libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c + libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM +-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom.cpp +libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp - libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP + libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES) +BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gsoap-2-locale.patch Mon Sep 20 01:24:03 2010 +0200 @@ -0,0 +1,17 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://permalink.gmane.org/gmane.text.xml.soap.gsoap/1933 + +diff -urN a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h +--- a/gsoap/stdsoap2.h 2010-09-19 01:20:12.000000000 +0200 ++++ b/gsoap/stdsoap2.h 2010-09-19 21:00:31.442187011 +0200 +@@ -536,6 +536,7 @@ + + #ifdef WITH_C_LOCALE + # include <xlocale.h> ++# include <locale.h> + #else + # undef HAVE_STRTOF_L + # undef HAVE_STRTOD_L
--- a/src/gsoap.mk Sun Sep 19 01:59:47 2010 +0200 +++ b/src/gsoap.mk Mon Sep 20 01:24:03 2010 +0200 @@ -4,8 +4,8 @@ # gSOAP PKG := gsoap $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7.17 -$(PKG)_CHECKSUM := 573a08ab7d8ca2d970158911482c308484fdd5ed +$(PKG)_VERSION := 2.8.0 +$(PKG)_CHECKSUM := 516559068a61a47b438852f8cb7ad15a4b26c162 $(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip $(PKG)_WEBSITE := http://gsoap2.sourceforge.net/ @@ -34,7 +34,7 @@ # Native build to get tools wsdl2h and soapcpp2 cd '$(1)' && ./configure \ - --enable-openssl + --enable-gnutls # Parallel bulds can fail $(MAKE) -C '$(1)'/gsoap -j 1