diff options
| author | adam <adam@pkgsrc.org> | 2017-10-06 05:42:01 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2017-10-06 05:42:01 +0000 |
| commit | e5709ddbbba949be71e6101f1132ab815303c386 (patch) | |
| tree | 6f950814e82371bc8fe34d447d6088e7b40610be /textproc | |
| parent | 99b1e930b4884188acae363b80fdfc49db83b804 (diff) | |
| download | pkgsrc-e5709ddbbba949be71e6101f1132ab815303c386.tar.gz | |
Fix building on Darwin
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/distinfo | 4 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-i18n_digitlst.cpp | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 551f26afa0e..c15c8489d9f 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.67 2017/10/05 22:50:30 maya Exp $ +$NetBSD: distinfo,v 1.68 2017/10/06 05:42:01 adam Exp $ SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82 RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809 @@ -18,7 +18,7 @@ SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 -SHA1 (patch-i18n_digitlst.cpp) = 6f4721d94f0985f5fbce1de75070ebff6a929246 +SHA1 (patch-i18n_digitlst.cpp) = 000abf4ad9d963e3e786eeccf5a74f01fac33838 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110 diff --git a/textproc/icu/patches/patch-i18n_digitlst.cpp b/textproc/icu/patches/patch-i18n_digitlst.cpp index 8fbcca73ac0..faef4c206f5 100644 --- a/textproc/icu/patches/patch-i18n_digitlst.cpp +++ b/textproc/icu/patches/patch-i18n_digitlst.cpp @@ -1,20 +1,21 @@ -$NetBSD: patch-i18n_digitlst.cpp,v 1.3 2017/10/05 22:50:30 maya Exp $ +$NetBSD: patch-i18n_digitlst.cpp,v 1.4 2017/10/06 05:42:01 adam Exp $ -Never include xlocale.h - not portable header, also removed in current -glibc. +Do not include xlocale.h, except for Darwin - not portable header, +also removed in current glibc. --- i18n/digitlst.cpp.orig 2017-01-20 00:20:31.000000000 +0000 +++ i18n/digitlst.cpp -@@ -61,11 +61,7 @@ +@@ -61,10 +61,10 @@ #endif #if U_USE_STRTOD_L -# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN -# include <locale.h> -# else --# include <xlocale.h> --# endif -+# include <locale.h> ++# ifdef __APPLE__ + # include <xlocale.h> ++# else ++# include <locale.h> + # endif #endif - // *************************************************************************** |