summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2016-03-03 20:44:00 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2016-03-03 20:44:27 +0100
commit7bb8a9efebd6b2292734380bf7c0b65520d2efcc (patch)
treebacf7f2285b0aee88513cb52811df524509e7147
parentx11-wm/page: Revbump, fix file collision (diff)
downloadgentoo-7bb8a9ef.tar.gz
gentoo-7bb8a9ef.tar.bz2
gentoo-7bb8a9ef.zip
dev-libs/icu: Backport fix for bug 573294
Package-Manager: portage-2.2.27
-rw-r--r--dev-libs/icu/files/icu-flagparser.patch13
-rw-r--r--dev-libs/icu/icu-56.1-r1.ebuild1
2 files changed, 14 insertions, 0 deletions
diff --git a/dev-libs/icu/files/icu-flagparser.patch b/dev-libs/icu/files/icu-flagparser.patch
new file mode 100644
index 000000000000..bd642762a0f3
--- /dev/null
+++ b/dev-libs/icu/files/icu-flagparser.patch
@@ -0,0 +1,13 @@
+Index: source/tools/toolutil/flagparser.c
+===================================================================
+--- a/source/tools/toolutil/flagparser.c (revision 38080)
++++ b/source/tools/toolutil/flagparser.c (revision 38081)
+@@ -97,7 +97,7 @@
+
+ T_FileStream_close(f);
+
+- if (U_FAILURE(*status)) {
++ if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
+ return -1;
+ }
+
diff --git a/dev-libs/icu/icu-56.1-r1.ebuild b/dev-libs/icu/icu-56.1-r1.ebuild
index e8a0e2beac09..3968b3a1dda8 100644
--- a/dev-libs/icu/icu-56.1-r1.ebuild
+++ b/dev-libs/icu/icu-56.1-r1.ebuild
@@ -34,6 +34,7 @@ src_prepare() {
local variable
epatch "${FILESDIR}/${PN}-remove-bashisms.patch"
+ epatch "${FILESDIR}/${PN}-flagparser.patch"
epatch_user
# Disable renaming as it is stupind thing to do