diff options
| author | bsiegert <bsiegert> | 2016-02-13 20:41:58 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2016-02-13 20:41:58 +0000 |
| commit | 686e2e4c06dfe9c0c5157d97d1bdd8c79510066e (patch) | |
| tree | b8e50e1260f2bf1e9c3b3fb110c2d2b9f5979185 /textproc/icu | |
| parent | c4936ab5de6a70e899159d2df10577f33d56bc6e (diff) | |
| download | pkgsrc-686e2e4c06dfe9c0c5157d97d1bdd8c79510066e.tar.gz | |
Apply patch from upstream to fix compilation on CentOS 7. From Thomas
Orgis via mail.
Diffstat (limited to 'textproc/icu')
| -rw-r--r-- | textproc/icu/Makefile | 3 | ||||
| -rw-r--r-- | textproc/icu/distinfo | 3 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-tools_toolutil_flagparser.c | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 356f31c1c53..363c3a8a63b 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.102 2015/10/26 09:28:20 jperkin Exp $ +# $NetBSD: Makefile,v 1.103 2016/02/13 20:41:58 bsiegert Exp $ DISTNAME= icu4c-56_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index f0900496d86..e9cc0d42049 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.59 2015/11/04 01:59:35 agc Exp $ +$NetBSD: distinfo,v 1.60 2016/02/13 20:41:58 bsiegert Exp $ SHA1 (icu4c-56_1-src.tgz) = e4494ce9425c469f138bb6e1ae06faf7fa0cf3de RMD160 (icu4c-56_1-src.tgz) = 1ef7f377283a379654ebb051b7439c2cc6151da0 @@ -22,3 +22,4 @@ SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e SHA1 (patch-tools_pkgdata_pkgdata.cpp) = 1c87fcc511f0e6cedbaf01c5164e522c33f19458 +SHA1 (patch-tools_toolutil_flagparser.c) = 08606a67b5e9e1308ef470524576fc000ca1907b diff --git a/textproc/icu/patches/patch-tools_toolutil_flagparser.c b/textproc/icu/patches/patch-tools_toolutil_flagparser.c new file mode 100644 index 00000000000..77283a2f79c --- /dev/null +++ b/textproc/icu/patches/patch-tools_toolutil_flagparser.c @@ -0,0 +1,17 @@ +$NetBSD: patch-tools_toolutil_flagparser.c,v 1.1 2016/02/13 20:41:59 bsiegert Exp $ + +http://bugs.icu-project.org/trac/ticket/11959 + +Fix build on CentOS 7. + +--- tools/toolutil/flagparser.c.orig 2015-10-08 03:54:06.000000000 +0000 ++++ tools/toolutil/flagparser.c +@@ -97,7 +97,7 @@ parseFlagsFile_cleanup: + + T_FileStream_close(f); + +- if (U_FAILURE(*status)) { ++ if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) { + return -1; + } + |