tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] textproc/icu: drop xlocale.h completely to un-break build on current glibc



Hi,

icu build is broken on a system with glibc-2.26 (I think also 2.25) as
xlocale.h is gone. It was never really intended to be used anyway, so
here is a patch that just drops it from icu instead of having the
special case for NetBSD only.


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
Universität Hamburg
RRZ / Basis-Infrastruktur / HPC
Schlüterstr. 70
20146 Hamburg
Tel.: 040/42838 8826
Fax: 040/428 38 6270
Index: textproc/icu/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/icu/distinfo,v
retrieving revision 1.66
diff -u -r1.66 distinfo
--- textproc/icu/distinfo	4 Oct 2017 10:52:40 -0000	1.66
+++ textproc/icu/distinfo	5 Oct 2017 11:58:31 -0000
@@ -18,7 +18,7 @@
 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) = 4b4210a6dd4ef3325747d86357e4fa8368f8f404
 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2
 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110
Index: textproc/icu/patches/patch-i18n_digitlst.cpp
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-i18n_digitlst.cpp
--- textproc/icu/patches/patch-i18n_digitlst.cpp	12 Dec 2016 17:46:39 -0000	1.2
+++ textproc/icu/patches/patch-i18n_digitlst.cpp	5 Oct 2017 11:58:31 -0000
@@ -2,12 +2,16 @@
 
 --- i18n/digitlst.cpp.orig	2016-10-27 01:37:56.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
+ 
+ // ***************************************************************************

Attachment: smime.p7s
Description: S/MIME cryptographic signature



Home | Main Index | Thread Index | Old Index