Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1507243831176110"
MIME-Version: 1.0
Date: Thu, 5 Oct 2017 22:50:31 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/icu
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20171005225031.07BA0FBC7@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1507243831176110
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Thu Oct  5 22:50:30 UTC 2017

Modified Files:
	pkgsrc/textproc/icu: distinfo
	pkgsrc/textproc/icu/patches: patch-i18n_digitlst.cpp

Log Message:
icu: never include xlocale.h, always use locale.h

This was a glibc header, whereas locale.h is a POSIX one.
glibc went ahead and removed it in the new version.

change suggested by Thomas Orgis on tech-pkg but probably not applied
exactly.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1507243831176110
Content-Disposition: inline
Content-Length: 2398
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/icu/distinfo
diff -u pkgsrc/textproc/icu/distinfo:1.66 pkgsrc/textproc/icu/distinfo:1.67
--- pkgsrc/textproc/icu/distinfo:1.66	Wed Oct  4 10:52:40 2017
+++ pkgsrc/textproc/icu/distinfo	Thu Oct  5 22:50:30 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2017/10/04 10:52:40 jperkin Exp $
+$NetBSD: distinfo,v 1.67 2017/10/05 22:50:30 maya Exp $
 
 SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82
 RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809
@@ -18,7 +18,7 @@ SHA1 (patch-config_mh-scoosr5) = 47703dc
 SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2
 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d
 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
-SHA1 (patch-i18n_digitlst.cpp) = 2db1a8e28e353ecf201f965d9719d451534865ad
+SHA1 (patch-i18n_digitlst.cpp) = 6f4721d94f0985f5fbce1de75070ebff6a929246
 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2
 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110

Index: pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp
diff -u pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp:1.2 pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp:1.3
--- pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp:1.2	Mon Dec 12 17:46:39 2016
+++ pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp	Thu Oct  5 22:50:30 2017
@@ -1,13 +1,20 @@
-$NetBSD: patch-i18n_digitlst.cpp,v 1.2 2016/12/12 17:46:39 adam Exp $
+$NetBSD: patch-i18n_digitlst.cpp,v 1.3 2017/10/05 22:50:30 maya Exp $
 
---- i18n/digitlst.cpp.orig	2016-10-27 01:37:56.000000000 +0000
+Never include xlocale.h - not portable header, also removed in current
+glibc.
+
+--- i18n/digitlst.cpp.orig	2017-01-20 00:20:31.000000000 +0000
 +++ i18n/digitlst.cpp
-@@ -61,7 +61,7 @@
+@@ -61,11 +61,7 @@
  #endif
  
  #if U_USE_STRTOD_L
 -# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
-+# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN || defined(__NetBSD__)
- #   include <locale.h>
- # else
- #   include <xlocale.h>
+-#   include <locale.h>
+-# else
+-#   include <xlocale.h>
+-# endif
++# include <locale.h>
+ #endif
+ 
+ // ***************************************************************************


--_----------=_1507243831176110--