[arch-commits] Commit in gsoap/trunk (0001-no-xlocale.patch PKGBUILD)

[Sergej Pupykin]

    Date: Wednesday, March 28, 2018 @ 13:07:10
  Author: spupykin
Revision: 313124

upgpkg: gsoap 2.8.65-1

Modified:
  gsoap/trunk/0001-no-xlocale.patch
  gsoap/trunk/PKGBUILD

-----------------------+
 0001-no-xlocale.patch |   51 +++++++++++++++++++++++++++++++++++++-----------
 PKGBUILD              |    8 +++----
 2 files changed, 44 insertions(+), 15 deletions(-)

Modified: 0001-no-xlocale.patch
===================================================================
--- 0001-no-xlocale.patch	2018-03-28 13:04:11 UTC (rev 313123)
+++ 0001-no-xlocale.patch	2018-03-28 13:07:10 UTC (rev 313124)
@@ -1,12 +1,41 @@
-diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
-index 6871d25..d8fbafc 100644
---- a/gsoap/stdsoap2.h
-+++ b/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)
+diff -wbBur gsoap-2.8/gsoap/stdsoap2.h gsoap-2.8.my/gsoap/stdsoap2.h
+--- gsoap-2.8/gsoap/stdsoap2.h	2018-03-08 18:45:36.000000000 +0300
++++ gsoap-2.8.my/gsoap/stdsoap2.h	2018-03-28 15:51:38.342848826 +0300
+@@ -338,7 +338,6 @@
+ #  define HAVE_MBTOWC
+ #  define HAVE_INTTYPES_H
+ #  define HAVE_LOCALE_H
+-#  define HAVE_XLOCALE_H
+ #  define HAVE_RANDOM
+ # elif defined(_AIX43)
  #  define HAVE_SNPRINTF
+@@ -419,7 +418,6 @@
+ #  define HAVE_ISNAN
+ #  define HAVE_ISINF
+ #  define HAVE_LOCALE_H
+-#  define HAVE_XLOCALE_H
+ #  define HAVE_RANDOM
+ # elif defined(__VMS)
+ #  include <ioctl.h>
+@@ -720,11 +718,6 @@
+ # endif
+ #endif
+ 
+-/* force inclusion of xlocale.h */
+-#if defined(WITH_INCLUDE_XLOCALE_H) && !defined(HAVE_XLOCALE_H)
+-# define HAVE_XLOCALE_H
+-#endif
+-
+ #ifdef WITH_C_LOCALE
+ # include <locale.h>
+ # if defined(WIN32) && !defined(CYGWIN)
+@@ -732,9 +725,6 @@
+ #  define SOAP_LOCALE(soap) ((soap)->c_locale ? (soap)->c_locale : ((soap)->c_locale = _create_locale(LC_ALL, "C")))
+ #  define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (_free_locale((soap)->c_locale), ((soap)->c_locale = NULL)))
+ # else
+-#  if defined(HAVE_XLOCALE_H)
+-#   include <xlocale.h>
+-#  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)))
+ #  define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (freelocale((soap)->c_locale), ((soap)->c_locale = NULL)))

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-28 13:04:11 UTC (rev 313123)
+++ PKGBUILD	2018-03-28 13:07:10 UTC (rev 313124)
@@ -4,8 +4,8 @@
 # Contributor: Lee.MaRS <leemars at gmail.com>
 
 pkgname=gsoap
-pkgver=2.8.63
-pkgrel=2
+pkgver=2.8.65
+pkgrel=1
 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
 url="http://www.cs.fsu.edu/~engelen/soap.html"
 arch=('x86_64')
@@ -16,8 +16,8 @@
 source=("https://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip"
 	'0001-no-xlocale.patch'
 	'LICENSE')
-sha256sums=('c6bbd6cd4290136db77649dd709e7d42dfd7625116487350d5ed6b799b02b72d'
-            '7abffd5ddbd261ad899de12cbf09af144f7b07257935e3945cf818a116533059'
+sha256sums=('34f20170afdeb355cb3a42d87e17efb3fbb299566588d7bd9c30dd1ec02f69c7'
+            '4058a13b4ac5b26c4a1a5e6363390b47652a02ef29cab835de6720ddb516e405'
             '0457ad7ae5599c7ee2e30f94d685dfd1a39cc9a9e3937aef1417d1752dfc6eb3')
 
 prepare() {