diff options
| author | maya <maya@pkgsrc.org> | 2017-10-06 15:20:42 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-10-06 15:20:42 +0000 |
| commit | 44d8dcada49ef6759cdbf614296ddfa2f8868331 (patch) | |
| tree | 1b403334af3795ee40a22f95b28e1443f2d37b89 /textproc | |
| parent | e0759d864bf21b4a4dc23bbf36f19c63248284e0 (diff) | |
| download | pkgsrc-44d8dcada49ef6759cdbf614296ddfa2f8868331.tar.gz | |
icu: include xlocale on all non-netbsd non-linux systems.
netbsd&linux do not have it (glibc had it, but removed in 2.26, and
was satisfied by locale.h always, if their release notes is to be believed)
this should cover BSDs other than netbsd, etc.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/distinfo | 4 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-i18n_digitlst.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index c15c8489d9f..91de86e7a58 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.68 2017/10/06 05:42:01 adam Exp $ +$NetBSD: distinfo,v 1.69 2017/10/06 15:20:42 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) = 47703dcc184f58c0382da3225f849424ab74d472 SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 -SHA1 (patch-i18n_digitlst.cpp) = 000abf4ad9d963e3e786eeccf5a74f01fac33838 +SHA1 (patch-i18n_digitlst.cpp) = 2091ec0d6fe376d4f3f7ebee63515b86b78d3646 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 faef4c206f5..b143f717af1 100644 --- a/textproc/icu/patches/patch-i18n_digitlst.cpp +++ b/textproc/icu/patches/patch-i18n_digitlst.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-i18n_digitlst.cpp,v 1.4 2017/10/06 05:42:01 adam Exp $ +$NetBSD: patch-i18n_digitlst.cpp,v 1.5 2017/10/06 15:20:42 maya Exp $ -Do not include xlocale.h, except for Darwin - not portable header, -also removed in current glibc. +Avoid including xlocale.h on linux and netbsd, which don't have +xlocale.h --- i18n/digitlst.cpp.orig 2017-01-20 00:20:31.000000000 +0000 +++ i18n/digitlst.cpp @@ -12,7 +12,7 @@ also removed in current glibc. -# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN -# include <locale.h> -# else -+# ifdef __APPLE__ ++# if !defined(__NetBSD__) && !defined(__linux__) # include <xlocale.h> +# else +# include <locale.h> |