diff --git a/srcpkgs/gsoap/patches/no-xlocale.patch b/srcpkgs/gsoap/patches/no-xlocale.patch deleted file mode 100644 index d486d5ea742..00000000000 --- a/srcpkgs/gsoap/patches/no-xlocale.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h -index 6871d25..d8fbafc 100644 ---- gsoap/stdsoap2.h -+++ gsoap/stdsoap2.h -@@ -464,7 +464,6 @@ extern intmax_t __strtoull(const char*, char**, int); - # define HAVE_STRTOD_L - # define HAVE_SSCANF_L - # define HAVE_LOCALE_H --# define HAVE_XLOCALE_H - # endif - # elif defined(TRU64) - # define HAVE_SNPRINTF diff --git a/srcpkgs/gsoap/patches/remove-xlocale_h.patch b/srcpkgs/gsoap/patches/remove-xlocale_h.patch new file mode 100644 index 00000000000..ad0cd13319b --- /dev/null +++ b/srcpkgs/gsoap/patches/remove-xlocale_h.patch @@ -0,0 +1,20 @@ +--- gsoap/stdsoap2.h ++++ gsoap/stdsoap2.h +@@ -722,7 +722,7 @@ extern intmax_t __strtoull(const char*, char**, int); + + /* force inclusion of xlocale.h */ + #if defined(WITH_INCLUDE_XLOCALE_H) && !defined(HAVE_XLOCALE_H) +-# define HAVE_XLOCALE_H ++//# define HAVE_XLOCALE_H + #endif + + #ifdef WITH_C_LOCALE +@@ -733,7 +733,7 @@ extern intmax_t __strtoull(const char*, char**, int); + # define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (_free_locale((soap)->c_locale), ((soap)->c_locale = NULL))) + # else + # if defined(HAVE_XLOCALE_H) +-# include ++//# include + # endif + # define SOAP_LOCALE_T locale_t + # define SOAP_LOCALE(soap) ((soap)->c_locale ? (soap)->c_locale : ((soap)->c_locale = newlocale(LC_ALL_MASK, "C", NULL))) diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index bb4b48c362f..8ff756daf9e 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -1,7 +1,7 @@ # Template file for 'gsoap' pkgname=gsoap -version=2.8.63 -revision=2 +version=2.8.64 +revision=1 build_style=gnu-configure wrksrc="${pkgname}-${version%.*}" disable_parallel_build=yes @@ -10,10 +10,10 @@ hostmakedepends="unzip flex autoconf" makedepends="libressl-devel zlib-devel" short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications" maintainer="Enno Boland " -license="GPL-2" +license="gSOAP-1.3b, GPL-2.0-only" homepage="http://www.cs.fsu.edu/~engelen/soap.html" distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip" -checksum=c6bbd6cd4290136db77649dd709e7d42dfd7625116487350d5ed6b799b02b72d +checksum=221213dd9ba398e4e568ae24d545607c4177f04d3920a6195d9db66a64a69030 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" gsoap" @@ -23,6 +23,10 @@ if [ "$CROSS_BUILD" ]; then } fi +post_install() { + vlicense license.pdf +} + gsoap-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files"