Sat Feb 13 20:41:59 2016 UTC ()
Apply patch from upstream to fix compilation on CentOS 7. From Thomas
Orgis via mail.


(bsiegert)
diff -r1.102 -r1.103 pkgsrc/textproc/icu/Makefile
diff -r1.59 -r1.60 pkgsrc/textproc/icu/distinfo
diff -r0 -r1.1 pkgsrc/textproc/icu/patches/patch-tools_toolutil_flagparser.c
cvs diff -r1.102 -r1.103 pkgsrc/textproc/icu/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/icu/Makefile 2015/10/26 09:28:20 1.102
+++ pkgsrc/textproc/icu/Makefile 2016/02/13 20:41:58 1.103
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.102 2015/10/26 09:28:20 jperkin Exp $ 1# $NetBSD: Makefile,v 1.103 2016/02/13 20:41:58 bsiegert Exp $
2 2
3DISTNAME= icu4c-56_1-src 3DISTNAME= icu4c-56_1-src
4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} 4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g}
 5PKGREVISION= 1
5CATEGORIES= textproc 6CATEGORIES= textproc
6MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ 7MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.icu-project.org/ 11HOMEPAGE= http://www.icu-project.org/
11COMMENT= Robust and full-featured Unicode services 12COMMENT= Robust and full-featured Unicode services
12LICENSE= mit 13LICENSE= mit
13 14
14WRKSRC= ${WRKDIR}/icu/source 15WRKSRC= ${WRKDIR}/icu/source
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
17TEST_TARGET= check 18TEST_TARGET= check
cvs diff -r1.59 -r1.60 pkgsrc/textproc/icu/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/icu/distinfo 2015/11/04 01:59:35 1.59
+++ pkgsrc/textproc/icu/distinfo 2016/02/13 20:41:58 1.60
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.59 2015/11/04 01:59:35 agc Exp $ 1$NetBSD: distinfo,v 1.60 2016/02/13 20:41:58 bsiegert Exp $
2 2
3SHA1 (icu4c-56_1-src.tgz) = e4494ce9425c469f138bb6e1ae06faf7fa0cf3de 3SHA1 (icu4c-56_1-src.tgz) = e4494ce9425c469f138bb6e1ae06faf7fa0cf3de
4RMD160 (icu4c-56_1-src.tgz) = 1ef7f377283a379654ebb051b7439c2cc6151da0 4RMD160 (icu4c-56_1-src.tgz) = 1ef7f377283a379654ebb051b7439c2cc6151da0
5SHA512 (icu4c-56_1-src.tgz) = 297fd91ce6c478309ac3d18813f1b3ff39a992584e3bafb79e2e816a516e903af6b86c6318e1104cda0bb29ba7c0414b65c1e83c0ed0e848ce897a06d7678d9a 5SHA512 (icu4c-56_1-src.tgz) = 297fd91ce6c478309ac3d18813f1b3ff39a992584e3bafb79e2e816a516e903af6b86c6318e1104cda0bb29ba7c0414b65c1e83c0ed0e848ce897a06d7678d9a
6Size (icu4c-56_1-src.tgz) = 25721871 bytes 6Size (icu4c-56_1-src.tgz) = 25721871 bytes
7SHA1 (patch-aa) = fd5c513e75ca17a46be4ed010455bda63731afff 7SHA1 (patch-aa) = fd5c513e75ca17a46be4ed010455bda63731afff
8SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 8SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
9SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 9SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
10SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 10SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09
11SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663 11SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
12SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a 12SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a
13SHA1 (patch-common_putil.cpp) = 3058a542bcb2fdfa34b36acf389570990acd0da5 13SHA1 (patch-common_putil.cpp) = 3058a542bcb2fdfa34b36acf389570990acd0da5
14SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 14SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
15SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c 15SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
16SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8 16SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8
17SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33 17SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33
18SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 18SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
19SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 19SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
20SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc 20SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc
21SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4 21SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4
22SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 22SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
23SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e 23SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e
24SHA1 (patch-tools_pkgdata_pkgdata.cpp) = 1c87fcc511f0e6cedbaf01c5164e522c33f19458 24SHA1 (patch-tools_pkgdata_pkgdata.cpp) = 1c87fcc511f0e6cedbaf01c5164e522c33f19458
 25SHA1 (patch-tools_toolutil_flagparser.c) = 08606a67b5e9e1308ef470524576fc000ca1907b
File Added: pkgsrc/textproc/icu/patches/Attic/patch-tools_toolutil_flagparser.c
$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;
     }