[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: eed8d095c2ca12fd1afc5b9dbd69417da74098ea Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 20 19:28:22 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 20 20:48:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed8d095 dev-libs/icu: drop 73.2, 74.1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/icu/Manifest | 4 - ...TestHebrewCalendarInTemporalLeapYear-test.patch | 31 dev-libs/icu/icu-73.2.ebuild | 177 - dev-libs/icu/icu-74.1.ebuild | 176 4 files changed, 388 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 45032ec823a8..821057a1856d 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,6 +1,2 @@ -DIST icu4c-73_2-src.tgz 26519906 BLAKE2B 3f7dec9d527939d6d594c92844a400733e43af018bbc2f600edcb18299211a2f2285332188976d15e1ef672191416abac0b95a9d1a2ea6ababdaddf12708ccef SHA512 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 -DIST icu4c-73_2-src.tgz.asc 659 BLAKE2B 83e082ba15ba7aeb366b6d97da15d076c200f9051e55bf00ba13265a3d87aade5a5b18c98a0c903d5015821c63e4b340ffbcc7940a654d169ad1948d6594ce63 SHA512 7598b8cc498ada8ca904b13f7aba27abd3f8f3013a0677d7ffab42d5413df9d2f0526107559301abc4049123b2e6d4d4f4cc589cbd943959d97b595dd57ea63c -DIST icu4c-74_1-src.tgz 26625850 BLAKE2B cf8277cd513bd99c85104669e617683e4a91280c4c15a396021289fe0093d64682466550a44a0115bcc9e7abf30e3108dbadfb46e85e832e4cfd689618968507 SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 -DIST icu4c-74_1-src.tgz.asc 659 BLAKE2B d95224933dc665f3c4e6f9cb81ab65d4755fc768161bf8abf97ba0d8ad350bc0ccfccdcb5c21d97b132e036bad960f6021283325c1ec836d2aecc5101af3c298 SHA512 45064eb2cf83dd7e3edc423c43914cc7fbcee38ad79e93c80da1e9e59e0554329a174cd6ef5a8055fe92220621eae9761f7de3b0cb311e5874efa41555e58396 DIST icu4c-74_2-src.tgz 26529443 BLAKE2B 08790dd3634037177eaec428651afe0da1f71dbad3423bde7ea5a6d49eab5dc011f72b175760fc55f6d8d7d820f7f3dfc369a80a1f7cb2f9f933644beb3d3711 SHA512 e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0 DIST icu4c-74_2-src.tgz.asc 659 BLAKE2B 0723204ce19d7bd4b1989e00b5ab084cc5b154c214129632a7f7ce31c151c8a4b9e0033d49872db728a3787809dbad2320f1d848561c84f94797c7e006749b94 SHA512 b249a61aba711b34599c3c0fbc113a52a83e59cb7bbda914ca74f534c1f474e6821d663dc7f078608b24393703654a43c2b793ca3d3f3be761393b6a73862ecc diff --git a/dev-libs/icu/files/icu-73.2-fix-TestHebrewCalendarInTemporalLeapYear-test.patch b/dev-libs/icu/files/icu-73.2-fix-TestHebrewCalendarInTemporalLeapYear-test.patch deleted file mode 100644 index df4dd0793837.. --- a/dev-libs/icu/files/icu-73.2-fix-TestHebrewCalendarInTemporalLeapYear-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/914887 -https://github.com/unicode-org/icu/commit/f3b869cbb0b9ced42d7ca4e24626a868a14ddcfc - -From f3b869cbb0b9ced42d7ca4e24626a868a14ddcfc Mon Sep 17 00:00:00 2001 -From: Frank Tang -Date: Mon, 18 Sep 2023 20:20:42 -0700 -Subject: [PATCH] ICU-22512 Fix broken TestHebrewCalendarInTemporalLeapYear - -Fix broken test mistakenly landed in -https://github.com/unicode-org/icu/pull/2274 - -Some important steps were missed in the last landing. a/test/intltest/caltest.cpp -+++ b/test/intltest/caltest.cpp -@@ -4028,6 +4028,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { - for (gc.set(startYear, UCAL_JANUARY, 1); - gc.get(UCAL_YEAR, status) <= stopYear; - gc.add(UCAL_DATE, incrementDays, status)) { -+cal->setTime(gc.getTime(status), status); - if (failure(status, "add/get/set/getTime/setTime incorrect")) return; - - int32_t cal_year = cal->get(UCAL_EXTENDED_YEAR, status); -@@ -4036,6 +4037,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { - leapTest->set(UCAL_MONTH, 0); - leapTest->set(UCAL_DATE, 1); - // If 10 months after TISHRI is TAMUZ, then it is a leap year. -+leapTest->add(UCAL_MONTH, 10, status); - hasLeapMonth = leapTest->get(UCAL_MONTH, status) == icu::HebrewCalendar::TAMUZ; - yearForHasLeapMonth = cal_year; - } - diff --git a/dev-libs/icu/icu-73.2.ebuild b/dev-libs/icu/icu-73.2.ebuild deleted file mode 100644 index d821c812d01f.. --- a/dev-libs/icu/icu-73.2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with dev-libs/icu-layoutex - -PYTHON_COMPAT=( python3_{10..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc -inherit autotools
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 717a5d9246a1b33796e21dbf42c0520c54deb837 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 3 17:51:32 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 4 13:28:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717a5d92 dev-libs/icu: drop 73.1-r2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/icu/Manifest | 2 - .../icu/files/icu-73.1-fix-UChar-api-deux.patch| 82 --- dev-libs/icu/icu-73.1-r2.ebuild| 163 - 3 files changed, 247 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 1bd85246f8dd..d312969b2e95 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,4 +1,2 @@ -DIST icu4c-73_1-src.tgz 26512935 BLAKE2B 45de117efc4a49301c04a997963393967a70b8583abf1a9626331e275c5bc329cf2685de5c80b32f764c8ff2530b5594316d7119ce66503e5adba7842ca24424 SHA512 e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8 -DIST icu4c-73_1-src.tgz.asc 833 BLAKE2B 2c0a02a109280c7994f3c9404473119105ccbe051633dd8dc89c14ff65612d7a18deccff2a525752808f26f34d7c192f9346a8c3a0d34af9aa2110744d9f863d SHA512 b7042b0e39e1ebfcef8573d388b32a740106c7cfd4c18ebd52e7fd22e64e07b174d766373b1722520369e937fc56d439a0b290a3efeee287b2740388c3d3 DIST icu4c-73_2-src.tgz 26519906 BLAKE2B 3f7dec9d527939d6d594c92844a400733e43af018bbc2f600edcb18299211a2f2285332188976d15e1ef672191416abac0b95a9d1a2ea6ababdaddf12708ccef SHA512 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 DIST icu4c-73_2-src.tgz.asc 659 BLAKE2B 83e082ba15ba7aeb366b6d97da15d076c200f9051e55bf00ba13265a3d87aade5a5b18c98a0c903d5015821c63e4b340ffbcc7940a654d169ad1948d6594ce63 SHA512 7598b8cc498ada8ca904b13f7aba27abd3f8f3013a0677d7ffab42d5413df9d2f0526107559301abc4049123b2e6d4d4f4cc589cbd943959d97b595dd57ea63c diff --git a/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch b/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch deleted file mode 100644 index ea943873a82b.. --- a/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://bugs.gentoo.org/904381 -https://unicode-org.atlassian.net/browse/ICU-22356 -https://github.com/unicode-org/icu/pull/2431 (what we originally applied) -https://github.com/unicode-org/icu/pull/2432 (this commit) -https://github.com/unicode-org/icu/commit/4fd9d6ce9a951e66e727b296138f22cd05479de1 - -From 4fd9d6ce9a951e66e727b296138f22cd05479de1 Mon Sep 17 00:00:00 2001 -From: Fredrik Roubert -Date: Tue, 18 Apr 2023 23:39:28 +0200 -Subject: [PATCH] ICU-22356 Use ConstChar16Ptr to safely cast from UChar* to - char16_t*. - -This is necessary for this header file to be usable by clients that -define UCHAR_TYPE as a type not compatible with char16_t, eg. uint16_t. a/common/unicode/ures.h -+++ b/common/unicode/ures.h -@@ -25,6 +25,7 @@ - #ifndef URES_H - #define URES_H - -+#include "unicode/char16ptr.h" - #include "unicode/utypes.h" - #include "unicode/uloc.h" - -@@ -812,7 +813,7 @@ inline UnicodeString - ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t *r = ures_getString(resB, , status); -+const char16_t *r = ConstChar16Ptr(ures_getString(resB, , status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -837,7 +838,7 @@ inline UnicodeString - ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t* r = ures_getNextString(resB, , key, status); -+const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, , key, status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -859,7 +860,7 @@ inline UnicodeString - ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t* r = ures_getStringByIndex(resB, indexS, , status); -+const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, , status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -882,7 +883,7 @@ inline UnicodeString - ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t* r = ures_getStringByKey(resB, key, , status); -+const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, , status)); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { a/test/intltest/Makefile.in -+++ b/test/intltest/Makefile.in -@@ -70,7 +70,7 @@ numbertest_parse.o
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 24df8320a11586a3f854deb337455ebbfd421e75 Author: Sam James gentoo org> AuthorDate: Fri Jun 9 09:55:17 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jun 9 11:01:31 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24df8320 dev-libs/icu: drop 73.1, 73.1-r1 Signed-off-by: Sam James gentoo.org> dev-libs/icu/files/icu-73.1-fix-UChar-api.patch | 49 --- dev-libs/icu/icu-73.1-r1.ebuild | 163 dev-libs/icu/icu-73.1.ebuild| 162 --- 3 files changed, 374 deletions(-) diff --git a/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch b/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch deleted file mode 100644 index 7f3f6a8e472f.. --- a/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://bugs.gentoo.org/904381 -https://unicode-org.atlassian.net/browse/ICU-22356 -https://github.com/unicode-org/icu/pull/2431 - -From d58ab7c27c2f5ecb83a3fc3de5803dc42f807746 Mon Sep 17 00:00:00 2001 -From: Xi Ruoyao -Date: Mon, 17 Apr 2023 15:33:18 +0800 -Subject: [PATCH] ICU-22356 Revert ICU-21833 change for ures.h - -These usages of UChar are in inline functions for calling C API functions, so they should not be changed to char16_t or the code will fail to compile with `-DUCHAR_TYPE=`. a/common/unicode/ures.h -+++ b/common/unicode/ures.h -@@ -812,7 +812,7 @@ inline UnicodeString - ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t *r = ures_getString(resB, , status); -+const UChar *r = ures_getString(resB, , status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -837,7 +837,7 @@ inline UnicodeString - ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t* r = ures_getNextString(resB, , key, status); -+const UChar* r = ures_getNextString(resB, , key, status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -859,7 +859,7 @@ inline UnicodeString - ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t* r = ures_getStringByIndex(resB, indexS, , status); -+const UChar* r = ures_getStringByIndex(resB, indexS, , status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { -@@ -882,7 +882,7 @@ inline UnicodeString - ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { - UnicodeString result; - int32_t len = 0; --const char16_t* r = ures_getStringByKey(resB, key, , status); -+const UChar* r = ures_getStringByKey(resB, key, , status); - if(U_SUCCESS(*status)) { - result.setTo(true, r, len); - } else { - diff --git a/dev-libs/icu/icu-73.1-r1.ebuild b/dev-libs/icu/icu-73.1-r1.ebuild deleted file mode 100644 index c8c62931c741.. --- a/dev-libs/icu/icu-73.1-r1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with dev-libs/icu-layoutex - -PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc -inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig - -MY_PV=${PV/_rc/-rc} -MY_PV=${MY_PV//./_} - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="https://icu.unicode.org/; -SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz; -SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" -S="${WORKDIR}"/${PN}/source - -# Keyword with boost-1.82 -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -fi -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="debug doc examples static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - sys-devel/autoconf-archive - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/icu-config -) - -PATCHES=( - "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" - "${FILESDIR}/${PN}-64.2-darwin.patch" - "${FILESDIR}/${PN}-68.1-nonunicode.patch" - "${FILESDIR}/${PN}-73.1-fix-UChar-api.patch" -) - -src_prepare() { - default - - # Disable renaming as it assumes stable ABI and that consumers - # won't use unofficial APIs. We need this despite the
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 004077eb58c061c1b39ada2654cc409e91fac2de Author: Sam James gentoo org> AuthorDate: Wed May 10 21:40:39 2023 + Commit: Sam James gentoo org> CommitDate: Wed May 10 21:41:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=004077eb dev-libs/icu: switch to upstream variant of UChar patch Closes: https://bugs.gentoo.org/904381 Signed-off-by: Sam James gentoo.org> .../icu/files/icu-73.1-fix-UChar-api-deux.patch| 82 +++ dev-libs/icu/icu-73.1-r2.ebuild| 163 + 2 files changed, 245 insertions(+) diff --git a/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch b/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch new file mode 100644 index ..ea943873a82b --- /dev/null +++ b/dev-libs/icu/files/icu-73.1-fix-UChar-api-deux.patch @@ -0,0 +1,82 @@ +https://bugs.gentoo.org/904381 +https://unicode-org.atlassian.net/browse/ICU-22356 +https://github.com/unicode-org/icu/pull/2431 (what we originally applied) +https://github.com/unicode-org/icu/pull/2432 (this commit) +https://github.com/unicode-org/icu/commit/4fd9d6ce9a951e66e727b296138f22cd05479de1 + +From 4fd9d6ce9a951e66e727b296138f22cd05479de1 Mon Sep 17 00:00:00 2001 +From: Fredrik Roubert +Date: Tue, 18 Apr 2023 23:39:28 +0200 +Subject: [PATCH] ICU-22356 Use ConstChar16Ptr to safely cast from UChar* to + char16_t*. + +This is necessary for this header file to be usable by clients that +define UCHAR_TYPE as a type not compatible with char16_t, eg. uint16_t. +--- a/common/unicode/ures.h b/common/unicode/ures.h +@@ -25,6 +25,7 @@ + #ifndef URES_H + #define URES_H + ++#include "unicode/char16ptr.h" + #include "unicode/utypes.h" + #include "unicode/uloc.h" + +@@ -812,7 +813,7 @@ inline UnicodeString + ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t *r = ures_getString(resB, , status); ++const char16_t *r = ConstChar16Ptr(ures_getString(resB, , status)); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -837,7 +838,7 @@ inline UnicodeString + ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t* r = ures_getNextString(resB, , key, status); ++const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, , key, status)); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -859,7 +860,7 @@ inline UnicodeString + ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t* r = ures_getStringByIndex(resB, indexS, , status); ++const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, , status)); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -882,7 +883,7 @@ inline UnicodeString + ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t* r = ures_getStringByKey(resB, key, , status); ++const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, , status)); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +--- a/test/intltest/Makefile.in b/test/intltest/Makefile.in +@@ -70,7 +70,7 @@ numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \ + static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o \ + formattedvaluetest.o formatted_string_builder_test.o numbertest_permutation.o \ + units_data_test.o units_router_test.o units_test.o displayoptions_test.o \ +-numbertest_simple.o ++numbertest_simple.o uchar_type_build_test.o + + DEPS = $(OBJECTS:.o=.d) + +--- /dev/null b/test/intltest/uchar_type_build_test.cpp +@@ -0,0 +1,7 @@ ++// © 2023 and later: Unicode, Inc. and others. ++// License & terms of use: http://www.unicode.org/copyright.html#License ++ ++// ICU-22356 Test that client code can be built with UCHAR_TYPE redefined. ++#undef UCHAR_TYPE ++#define UCHAR_TYPE uint16_t ++#include "unicode/ures.h" + diff --git a/dev-libs/icu/icu-73.1-r2.ebuild b/dev-libs/icu/icu-73.1-r2.ebuild new file mode 100644 index ..2bf7dd7ca175 --- /dev/null +++ b/dev-libs/icu/icu-73.1-r2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-libs/icu-layoutex + +PYTHON_COMPAT=( python3_{10..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc +inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/-rc} +MY_PV=${MY_PV//./_} + +DESCRIPTION="International Components for Unicode" +HOMEPAGE="https://icu.unicode.org/;
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 5a5db7fc59b5ff77e2cf44f51784ed4e87aeab5b Author: Sam James gentoo org> AuthorDate: Tue Apr 18 02:11:06 2023 + Commit: Sam James gentoo org> CommitDate: Tue Apr 18 02:12:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5db7fc dev-libs/icu: fix builds w/ UCHAR_TYPE set Closes: https://bugs.gentoo.org/904381 Signed-off-by: Sam James gentoo.org> dev-libs/icu/files/icu-73.1-fix-UChar-api.patch | 49 +++ dev-libs/icu/icu-73.1-r1.ebuild | 163 2 files changed, 212 insertions(+) diff --git a/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch b/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch new file mode 100644 index ..7f3f6a8e472f --- /dev/null +++ b/dev-libs/icu/files/icu-73.1-fix-UChar-api.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/904381 +https://unicode-org.atlassian.net/browse/ICU-22356 +https://github.com/unicode-org/icu/pull/2431 + +From d58ab7c27c2f5ecb83a3fc3de5803dc42f807746 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Mon, 17 Apr 2023 15:33:18 +0800 +Subject: [PATCH] ICU-22356 Revert ICU-21833 change for ures.h + +These usages of UChar are in inline functions for calling C API functions, so they should not be changed to char16_t or the code will fail to compile with `-DUCHAR_TYPE=`. +--- a/common/unicode/ures.h b/common/unicode/ures.h +@@ -812,7 +812,7 @@ inline UnicodeString + ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t *r = ures_getString(resB, , status); ++const UChar *r = ures_getString(resB, , status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -837,7 +837,7 @@ inline UnicodeString + ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t* r = ures_getNextString(resB, , key, status); ++const UChar* r = ures_getNextString(resB, , key, status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -859,7 +859,7 @@ inline UnicodeString + ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t* r = ures_getStringByIndex(resB, indexS, , status); ++const UChar* r = ures_getStringByIndex(resB, indexS, , status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { +@@ -882,7 +882,7 @@ inline UnicodeString + ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) { + UnicodeString result; + int32_t len = 0; +-const char16_t* r = ures_getStringByKey(resB, key, , status); ++const UChar* r = ures_getStringByKey(resB, key, , status); + if(U_SUCCESS(*status)) { + result.setTo(true, r, len); + } else { + diff --git a/dev-libs/icu/icu-73.1-r1.ebuild b/dev-libs/icu/icu-73.1-r1.ebuild new file mode 100644 index ..ad36b18454e5 --- /dev/null +++ b/dev-libs/icu/icu-73.1-r1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-libs/icu-layoutex + +PYTHON_COMPAT=( python3_{9..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc +inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/-rc} +MY_PV=${MY_PV//./_} + +DESCRIPTION="International Components for Unicode" +HOMEPAGE="https://icu.unicode.org/; +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz; +SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" +S="${WORKDIR}"/${PN}/source + +# Keyword with boost-1.82 +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +fi +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="debug doc examples static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + sys-devel/autoconf-archive + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/icu-config +) + +PATCHES=( + "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" + "${FILESDIR}/${PN}-64.2-darwin.patch" + "${FILESDIR}/${PN}-68.1-nonunicode.patch" + "${FILESDIR}/${PN}-73.1-fix-UChar-api.patch" +) + +src_prepare() { + default + + # Disable renaming as it assumes stable ABI and that consumers + # won't use unofficial APIs. We
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 46f716736cde3356966f1f3eb97ae1bb4035a9d9 Author: Sam James gentoo org> AuthorDate: Fri Jan 14 20:41:37 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jan 14 20:45:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f71673 dev-libs/icu: backport test failure fix for ARM; add missing BDEPEND - Backport test failure fix (not within test itself so let's revbump as could affect runtime behaviour). Noticed after Exherbo committed it, so gave the test suite a go on arm, and indeed it failed & this sorts it out. (Only usage is within the test suite but it seems to be an exported function, so let's not take the risk.) - Add missing autoconf-archive BDEPEND (thanks juippis). Closes: https://bugs.gentoo.org/827034 Signed-off-by: Sam James gentoo.org> dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch | 38 ++ .../icu/{icu-70.1.ebuild => icu-70.1-r1.ebuild}| 6 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch b/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch new file mode 100644 index ..05d390a1284a --- /dev/null +++ b/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch @@ -0,0 +1,38 @@ +Fixes test failure on arm. + +https://github.com/unicode-org/icu/pull/1925 +https://unicode-org.atlassian.net/browse/ICU-21793 + +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Wed, 3 Nov 2021 02:31:18 +0100 +Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff + +--- a/tools/toolutil/toolutil.cpp b/tools/toolutil/toolutil.cpp +@@ -228,18 +228,19 @@ uprv_compareGoldenFiles( + std::ifstream ifs(goldenFilePath, std::ifstream::in); + int32_t pos = 0; + char c; +-while ((c = ifs.get()) != std::char_traits::eof() && pos < bufferLen) { ++while (ifs.get(c) && pos < bufferLen) { + if (c != buffer[pos]) { + // Files differ at this position +-return pos; ++break; + } + pos++; + } +-if (pos < bufferLen || c != std::char_traits::eof()) { +-// Files are different lengths +-return pos; ++if (pos == bufferLen && ifs.eof()) { ++// Files are same lengths ++pos = -1; + } +-return -1; ++ifs.close(); ++return pos; + } + + /*U_CAPI UDate U_EXPORT2 + diff --git a/dev-libs/icu/icu-70.1.ebuild b/dev-libs/icu/icu-70.1-r1.ebuild similarity index 95% rename from dev-libs/icu/icu-70.1.ebuild rename to dev-libs/icu/icu-70.1-r1.ebuild index 83163eaec2b6..c2095a985a40 100644 --- a/dev-libs/icu/icu-70.1.ebuild +++ b/dev-libs/icu/icu-70.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ IUSE="debug doc examples static-libs" BDEPEND="${PYTHON_DEPS} + sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) " @@ -29,9 +30,10 @@ PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" "${FILESDIR}/${PN}-64.2-darwin.patch" "${FILESDIR}/${PN}-68.1-nonunicode.patch" - # Should be in the next rleease, but check + # Should both be in the next release, but check # https://bugs.gentoo.org/788112 "${FILESDIR}/${PN}-69.1-fix-ub-units.patch" + "${FILESDIR}/${PN}-70.1-fix-ucptrietest.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 7a771de8495a19e73ee8c2bd3cd7f08fbe341e7d Author: Sam James gentoo org> AuthorDate: Fri Sep 24 18:13:44 2021 + Commit: Sam James gentoo org> CommitDate: Fri Sep 24 18:13:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a771de8 dev-libs/icu: add upstream patch for test failure This may cause runtime breakage (not just a failure in a test, but exposed by it on hppa and actually riscv) and it's a straightforward patch, so let's `git mv` in stable. Bug: https://bugs.gentoo.org/788112 Closes: https://bugs.gentoo.org/807893 Signed-off-by: Sam James gentoo.org> dev-libs/icu/files/icu-69.1-fix-ub-units.patch | 23 ++ .../icu/{icu-69.1.ebuild => icu-69.1-r1.ebuild}| 3 +++ 2 files changed, 26 insertions(+) diff --git a/dev-libs/icu/files/icu-69.1-fix-ub-units.patch b/dev-libs/icu/files/icu-69.1-fix-ub-units.patch new file mode 100644 index 000..6847d585155 --- /dev/null +++ b/dev-libs/icu/files/icu-69.1-fix-ub-units.patch @@ -0,0 +1,23 @@ +https://github.com/unicode-org/icu/pull/1715 +https://bugs.gentoo.org/788112 + +From 29f1188d191a7a75ac7ffa4bfa390f625da39c53 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Tue, 11 May 2021 19:04:24 +0200 +Subject: [PATCH] ICU-21613 Fix undefined behaviour in + ComplexUnitsConverter::applyRounder + +--- a/i18n/units_complexconverter.cpp b/i18n/units_complexconverter.cpp +@@ -237,6 +237,11 @@ void ComplexUnitsConverter::applyRounder(MaybeStackArray , + } + quantity = decimalQuantity.toDouble(); + ++if (uprv_isNaN(quantity) || uprv_isInfinite(quantity)) { ++// Do nothing for non-finite values, since conversion to int64_t is undefined ++return; ++} ++ + int32_t lastIndex = unitsConverters_.length() - 1; + if (lastIndex == 0) { + // Only one element, no need to bubble up the carry diff --git a/dev-libs/icu/icu-69.1.ebuild b/dev-libs/icu/icu-69.1-r1.ebuild similarity index 96% rename from dev-libs/icu/icu-69.1.ebuild rename to dev-libs/icu/icu-69.1-r1.ebuild index 1d2630ee16e..b540e57c81b 100644 --- a/dev-libs/icu/icu-69.1.ebuild +++ b/dev-libs/icu/icu-69.1-r1.ebuild @@ -32,6 +32,9 @@ PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" "${FILESDIR}/${PN}-64.2-darwin.patch" "${FILESDIR}/${PN}-68.1-nonunicode.patch" + # Should be in the next rleease, but check + # https://bugs.gentoo.org/788112 + "${FILESDIR}/${PN}-69.1-fix-ub-units.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 9442d61a4c4d8483f53868776586446aba7a7d78 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Nov 28 18:51:05 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Nov 28 18:53:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9442d61a dev-libs/icu: Allow non-utf8 locales again Bug: https://bugs.gentoo.org/679674 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel gentoo.org> dev-libs/icu/files/icu-68.1-nonunicode.patch | 12 dev-libs/icu/icu-68.1.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/dev-libs/icu/files/icu-68.1-nonunicode.patch b/dev-libs/icu/files/icu-68.1-nonunicode.patch new file mode 100644 index 000..e02c1413d99 --- /dev/null +++ b/dev-libs/icu/files/icu-68.1-nonunicode.patch @@ -0,0 +1,12 @@ +diff -ruN a/common/unicode/platform.h b/common/unicode/platform.h +--- a/common/unicode/platform.h2020-10-28 23:21:12.0 +0200 b/common/unicode/platform.h2020-11-28 20:48:53.223629867 +0200 +@@ -649,7 +649,7 @@ + /* Use the predefined value. */ + #elif U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED || \ + U_PLATFORM == U_PF_EMSCRIPTEN +-# define U_CHARSET_IS_UTF8 1 ++# define U_CHARSET_IS_UTF8 0 + #else + # define U_CHARSET_IS_UTF8 0 + #endif diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild index 50248a6dbbd..e13a81c1b33 100644 --- a/dev-libs/icu/icu-68.1.ebuild +++ b/dev-libs/icu/icu-68.1.ebuild @@ -31,6 +31,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" "${FILESDIR}/${PN}-64.2-darwin.patch" + "${FILESDIR}/${PN}-68.1-nonunicode.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 768c299432b08c62219b645905ada45b6d83d128 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 17:43:47 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 17:48:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=768c2994 dev-libs/icu: Drop 65.1-r1 ad 66.1 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/icu/Manifest | 2 - .../files/icu-64.1-data_archive_generation.patch | 14 -- dev-libs/icu/files/icu-65.1-integer-overflow.patch | 118 - dev-libs/icu/icu-65.1-r1.ebuild| 143 - dev-libs/icu/icu-66.1.ebuild | 143 - 5 files changed, 420 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index b0ef99e45df..0a1add51ea7 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,3 +1 @@ -DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139 -DIST icu4c-66_1-src.tgz 24361305 BLAKE2B db26e9380305601f8429366e2813ce3ccae11f34adde513d72a1ae09281a2078ce5eb7410bc788c717167018b4c2042fc83217fac22f34e26b94ee4621a6b4ec SHA512 78d87bce65a7bdf7e9a19bda13e353c60846816ff34025f829d1ff15f9ac49aa6061eb192173742be0eca105684ce0e39e95656147afe848520bf60274c8d246 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8 diff --git a/dev-libs/icu/files/icu-64.1-data_archive_generation.patch b/dev-libs/icu/files/icu-64.1-data_archive_generation.patch deleted file mode 100644 index 3bb7673f254..000 --- a/dev-libs/icu/files/icu-64.1-data_archive_generation.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/682170 - a/data/Makefile.in -+++ b/data/Makefile.in -@@ -148,7 +148,8 @@ - # and convert it to the current type. - ifneq ($(ICUDATA_ARCHIVE),) - ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat --$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR) -+$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) -+ $(MKINSTALLDIRS) $(OUTDIR) - $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE) - endif - else diff --git a/dev-libs/icu/files/icu-65.1-integer-overflow.patch b/dev-libs/icu/files/icu-65.1-integer-overflow.patch deleted file mode 100644 index 8e76a9f289d..000 --- a/dev-libs/icu/files/icu-65.1-integer-overflow.patch +++ /dev/null @@ -1,118 +0,0 @@ -From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001 -From: Frank Tang -Date: Sat, 1 Feb 2020 02:39:04 + -Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append - -See #971 - common/unistr.cpp | 6 ++- - test/intltest/ustrtest.cpp | 62 + - test/intltest/ustrtest.h | 1 + - 3 files changed, 68 insertions(+), 1 deletion(-) - -diff --git a/common/unistr.cpp b/common/unistr.cpp -index 901bb3358ba..077b4d6ef20 100644 a/common/unistr.cpp -+++ b/common/unistr.cpp -@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t srcStart, int32_t srcLeng - } - - int32_t oldLength = length(); -- int32_t newLength = oldLength + srcLength; -+ int32_t newLength; -+ if (uprv_add32_overflow(oldLength, srcLength, )) { -+setToBogus(); -+return *this; -+ } - - // Check for append onto ourself - const UChar* oldArray = getArrayStart(); -diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp -index b6515ea813c..ad38bdf53a3 100644 a/test/intltest/ustrtest.cpp -+++ b/test/intltest/ustrtest.cpp -@@ -67,6 +67,7 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* & - TESTCASE_AUTO(TestWCharPointers); - TESTCASE_AUTO(TestNullPointers); - TESTCASE_AUTO(TestUnicodeStringInsertAppendToSelf); -+TESTCASE_AUTO(TestLargeAppend); - TESTCASE_AUTO_END; - } - -@@ -2310,3 +2311,64 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() { - str.insert(2, sub); - assertEquals("", u"abbcdcde", str); - } -+ -+void UnicodeStringTest::TestLargeAppend() { -+if(quick) return; -+ -+IcuTestErrorCode status(*this, "TestLargeAppend"); -+// Make a large UnicodeString -+int32_t len = 0xAFF; -+UnicodeString str; -+char16_t *buf = str.getBuffer(len); -+// A fast way to set buffer to valid Unicode. -+// 4E4E is a valid unicode character -+uprv_memset(buf, 0x4e, len * 2); -+str.releaseBuffer(len); -+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 156d2bd5e79f0d331afc1ff82b565350fe5ea93c Author: Stephan Hartmann googlemail com> AuthorDate: Wed Feb 26 11:15:01 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 26 11:49:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156d2bd5 dev-libs/icu: add patch to fix integer overflow Bug: https://bugs.gentoo.org/710758 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Stephan Hartmann googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/14779 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/icu/files/icu-65.1-integer-overflow.patch | 118 + dev-libs/icu/icu-65.1-r1.ebuild| 143 + 2 files changed, 261 insertions(+) diff --git a/dev-libs/icu/files/icu-65.1-integer-overflow.patch b/dev-libs/icu/files/icu-65.1-integer-overflow.patch new file mode 100644 index 000..8e76a9f289d --- /dev/null +++ b/dev-libs/icu/files/icu-65.1-integer-overflow.patch @@ -0,0 +1,118 @@ +From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001 +From: Frank Tang +Date: Sat, 1 Feb 2020 02:39:04 + +Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append + +See #971 +--- + common/unistr.cpp | 6 ++- + test/intltest/ustrtest.cpp | 62 + + test/intltest/ustrtest.h | 1 + + 3 files changed, 68 insertions(+), 1 deletion(-) + +diff --git a/common/unistr.cpp b/common/unistr.cpp +index 901bb3358ba..077b4d6ef20 100644 +--- a/common/unistr.cpp b/common/unistr.cpp +@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t srcStart, int32_t srcLeng + } + + int32_t oldLength = length(); +- int32_t newLength = oldLength + srcLength; ++ int32_t newLength; ++ if (uprv_add32_overflow(oldLength, srcLength, )) { ++setToBogus(); ++return *this; ++ } + + // Check for append onto ourself + const UChar* oldArray = getArrayStart(); +diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp +index b6515ea813c..ad38bdf53a3 100644 +--- a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp +@@ -67,6 +67,7 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* & + TESTCASE_AUTO(TestWCharPointers); + TESTCASE_AUTO(TestNullPointers); + TESTCASE_AUTO(TestUnicodeStringInsertAppendToSelf); ++TESTCASE_AUTO(TestLargeAppend); + TESTCASE_AUTO_END; + } + +@@ -2310,3 +2311,64 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() { + str.insert(2, sub); + assertEquals("", u"abbcdcde", str); + } ++ ++void UnicodeStringTest::TestLargeAppend() { ++if(quick) return; ++ ++IcuTestErrorCode status(*this, "TestLargeAppend"); ++// Make a large UnicodeString ++int32_t len = 0xAFF; ++UnicodeString str; ++char16_t *buf = str.getBuffer(len); ++// A fast way to set buffer to valid Unicode. ++// 4E4E is a valid unicode character ++uprv_memset(buf, 0x4e, len * 2); ++str.releaseBuffer(len); ++UnicodeString dest; ++// Append it 16 times ++// 0xAFF times 16 is 0xA4F1, ++// which is greater than INT32_MAX, which is 0x7FFF. ++int64_t total = 0; ++for (int32_t i = 0; i < 16; i++) { ++dest.append(str); ++total += len; ++if (total <= INT32_MAX) { ++assertFalse("dest is not bogus", dest.isBogus()); ++} else { ++assertTrue("dest should be bogus", dest.isBogus()); ++} ++} ++dest.remove(); ++total = 0; ++for (int32_t i = 0; i < 16; i++) { ++dest.append(str); ++total += len; ++if (total + len <= INT32_MAX) { ++assertFalse("dest is not bogus", dest.isBogus()); ++} else if (total <= INT32_MAX) { ++// Check that a string of exactly the maximum size works ++UnicodeString str2; ++int32_t remain = INT32_MAX - total; ++char16_t *buf2 = str2.getBuffer(remain); ++if (buf2 == nullptr) { ++// if somehow memory allocation fail, return the test ++return; ++} ++uprv_memset(buf2, 0x4e, remain * 2); ++str2.releaseBuffer(remain); ++dest.append(str2); ++total += remain; ++assertEquals("When a string of exactly the maximum size works", (int64_t)INT32_MAX, total); ++assertEquals("When a string of exactly the maximum size works", INT32_MAX, dest.length()); ++assertFalse("dest is not bogus", dest.isBogus()); ++ ++// Check that a string size+1 goes bogus ++str2.truncate(1); ++dest.append(str2); ++total++; ++assertTrue("dest should be bogus", dest.isBogus()); ++} else { ++assertTrue("dest should be bogus", dest.isBogus()); ++} ++} ++} +diff --git a/test/intltest/ustrtest.h
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: a7228509a3911a2988bf0e5b9415fec49488c86b Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 16 23:44:53 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 17 02:50:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7228509 dev-libs/icu: Drop 64.2 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/icu/Manifest | 1 - dev-libs/icu/files/icu-58.1-remove-bashisms.patch | 224 -- dev-libs/icu/files/icu-64.2-extern_c.patch| 789 -- dev-libs/icu/icu-64.2.ebuild | 143 4 files changed, 1157 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 852d3209dce..5b6c81f24b9 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1 @@ -DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139 diff --git a/dev-libs/icu/files/icu-58.1-remove-bashisms.patch b/dev-libs/icu/files/icu-58.1-remove-bashisms.patch deleted file mode 100644 index ef60ce4569b..000 --- a/dev-libs/icu/files/icu-58.1-remove-bashisms.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in a/config/Makefile.inc.in 2016-09-09 23:28:18.0 +0200 -+++ b/config/Makefile.inc.in 2016-11-05 19:43:07.68848 +0100 -@@ -124,12 +124,6 @@ - # with usually. Many applications will want to add $(ICULIBS_I18N) as well. - ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) - --# Proper echo newline handling is needed in icu-config --ECHO_N=@ICU_ECHO_N@ --ECHO_C=@ICU_ECHO_C@ --# Not currently being used but good to have for proper tab handling --ECHO_T=@ICU_ECHO_T@ -- - ## - ## - # -diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom a/config/icu-config-bottom 2016-09-09 23:28:18.0 +0200 -+++ b/config/icu-config-bottom 2016-11-05 19:49:00.854481361 +0100 -@@ -218,65 +218,65 @@ - ;; - - --cflags) -- echo $ECHO_N "${CFLAGS} ${ECHO_C}" -+ printf "%s" "${CFLAGS} " - ;; - - --cc) -- echo $ECHO_N "${CC} ${ECHO_C}" -+ printf "%s" "${CC} " - ;; - - --cxx) -- echo $ECHO_N "${CXX} ${ECHO_C}" -+ printf "%s" "${CXX} " - ;; - - --cxxflags) -- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" -+ printf "%s" "${CXXFLAGS} " - ;; - - --cppflags) - # Don't echo the -I. - it's unneeded. -- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' -+ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' - ;; - - --cppflags-searchpath) -- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" -+ printf "%s" "-I${prefix}/include " - ;; - - --cppflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCPPFLAGS} " - ;; - - --cxxflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCXXFLAGS} " - ;; - - --cflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCFLAGS} " - ;; - - --ldflags-system) -- echo $ECHO_N "${LIBS} ${ECHO_C}" -+ printf "%s" "${LIBS} " - ;; - - --ldflags) -- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" -+ printf "%s" "${LDFLAGS} ${ICULIBS} " - # $RPATH_LDFLAGS - ;; - - --ldflags-libsonly) -- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" -+ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " - ;; - - --ldflags-icuio) -- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" -+ printf "%s" " ${ICULIBS_ICUIO} " - ;; - - --ldflags-obsolete) -- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" -+ printf "%s" "${ICULIBS_OBSOLETE} " - ;; - - --ldflags-toolutil) -- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" -+ printf "%s" " ${ICULIBS_TOOLUTIL} " - ;; - - --ldflags-layout) -@@
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 651f107d52dfc2b2032fe7c01e8c60f515a2ec52 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 27 09:11:00 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 27 10:47:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651f107d dev-libs/icu: Drop 63.1-r1 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/icu/Manifest| 1 - dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch | 62 -- dev-libs/icu/icu-63.1-r1.ebuild | 143 --- 3 files changed, 206 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 5bd14af28bc..efaf4e9e515 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,3 +1,2 @@ DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a -DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78 diff --git a/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch b/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch deleted file mode 100644 index bbbef9e793d..000 --- a/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001 -From: Shane Carr -Date: Mon, 29 Oct 2018 23:52:44 -0700 -Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing. - - i18n/fmtable.cpp | 2 +- - i18n/number_decimalquantity.cpp | 5 - - test/intltest/numfmtst.cpp| 8 - .../icu/impl/number/DecimalQuantity_AbstractBCD.java | 5 - - .../impl/number/DecimalQuantity_DualStorageBCD.java| 10 +- - .../com/ibm/icu/dev/test/format/NumberFormatTest.java | 5 + - 6 files changed, 31 insertions(+), 4 deletions(-) - -diff --git a/i18n/fmtable.cpp b/i18n/fmtable.cpp -index 45c7024fc29..8601d95f4a6 100644 a/i18n/fmtable.cpp -+++ b/i18n/fmtable.cpp -@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode ) { - // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?). - if (fDecimalQuantity->isZero()) { - fDecimalStr->append("0", -1, status); -- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) { -+ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) { - fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status); - } else { - fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status); -diff --git a/i18n/number_decimalquantity.cpp b/i18n/number_decimalquantity.cpp -index 47b930a564b..d5dd7ae694c 100644 a/i18n/number_decimalquantity.cpp -+++ b/i18n/number_decimalquantity.cpp -@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const { - } - result.append(u'E'); - int32_t _scale = upperPos + scale; --if (_scale < 0) { -+if (_scale == INT32_MIN) { -+result.append({u"-2147483648", -1}); -+return result; -+} else if (_scale < 0) { - _scale *= -1; - result.append(u'-'); - } else { -diff --git a/test/intltest/numfmtst.cpp b/test/intltest/numfmtst.cpp -index 34355939113..8d52dc122bf 100644 a/test/intltest/numfmtst.cpp -+++ b/test/intltest/numfmtst.cpp -@@ -9226,6 +9226,14 @@ void NumberFormatTest::Test20037_ScientificIntegerOverflow() { - assertEquals(u"Should not overflow and should parse only the first exponent", - u"1E-2147483647", - {sp.data(), sp.length(), US_INV}); -+ -+// Test edge case overflow of exponent -+result = Formattable(); -+nf->parse(u".0003e-2147483644", result, status); -+sp = result.getDecimalNumber(status); -+assertEquals(u"Should not overflow", -+ u"3E-2147483648", -+ {sp.data(), sp.length(), US_INV}); - } - - void NumberFormatTest::Test13840_ParseLongStringCrash() { diff --git a/dev-libs/icu/icu-63.1-r1.ebuild b/dev-libs/icu/icu-63.1-r1.ebuild deleted file mode 100644
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 77165b807efc2a976f20c98dd6e07c24aa349656 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 3 15:16:40 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 3 15:17:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77165b80 dev-libs/icu: add Prefix support Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-libs/icu/Manifest| 4 +-- dev-libs/icu/files/icu-58.2-darwin.patch | 55 dev-libs/icu/icu-58.2-r1.ebuild | 15 - dev-libs/icu/icu-60.1.ebuild | 9 +- 4 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 25e55a75ffb..2fb7f8b34c1 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,4 +1,4 @@ -DIST icu4c-58_1-src.tgz 23366443 SHA256 0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 WHIRLPOOL faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37 -DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a +DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e57289535a25edd8ee8c96bdf4551499ead2c75d0f7e733fb89d1670c5065f1e8013ebe14cbdc34881a67452e622cd990 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 +DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a DIST icu4c-59_1-src.tgz 22706578 SHA256 7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe SHA512 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4 WHIRLPOOL f213951e98b7e1b59a3caf193f671fd9dff9a77c49aa3c4c118d6e3414688830ffb029d5c01495b369d4e666ab38669340a4c24a26f93742a99145972e20ede0 DIST icu4c-60_1-src.tgz 23296064 BLAKE2B 4f90c1f4f00b686d2632429fbaa6a6ec3d977e414f8d00cf82a525a1504c9d8c9b1a19458b495e5847abbcfff933038752f96d6bd165d206582f8ec1b77fff40 SHA512 a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233 diff --git a/dev-libs/icu/files/icu-58.2-darwin.patch b/dev-libs/icu/files/icu-58.2-darwin.patch new file mode 100644 index 000..e5a9000a346 --- /dev/null +++ b/dev-libs/icu/files/icu-58.2-darwin.patch @@ -0,0 +1,55 @@ +same as 4.7, but retargetted to apply with eapply + +--- a/config/mh-darwin b/config/mh-darwin +@@ -4,6 +4,13 @@ + ## Copyright (c) 1999-2011 International Business Machines Corporation and + ## others. All Rights Reserved. + ++ ++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ++FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO) ++MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO) ++ ++IS_DARWIN = yes ++ + ## Flags for position independent code + SHAREDLIBCFLAGS = -dynamic + SHAREDLIBCXXFLAGS = -dynamic +@@ -28,7 +35,7 @@ + ifeq ($(ENABLE_RPATH),YES) + LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) + else +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) + endif + + ## Compiler switch to embed a runtime search path +--- a/stubdata/Makefile.in b/stubdata/Makefile.in +@@ -32,7 +32,11 @@ + + + ifneq ($(ENABLE_SHARED),) ++ifeq ($(IS_DARWIN),) + SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) ++else ++SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) ++endif + ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT) + endif + +--- a/tools/ctestfw/Makefile.in b/tools/ctestfw/Makefile.in +@@ -31,7 +31,11 @@ + endif + +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: f7f37c1d8c48f31bcdb24d949db3b2fe327050a2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Jan 15 19:56:25 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Jan 15 19:56:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f37c1d dev-libs/icu: Remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/icu/Manifest | 2 - dev-libs/icu/files/icu-57.1-remove-bashisms.patch | 230 -- dev-libs/icu/files/icu-remove-bashisms.patch | 230 -- dev-libs/icu/icu-55.1.ebuild | 134 - dev-libs/icu/icu-57.1.ebuild | 140 - 5 files changed, 736 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index de5fa87..9b35855 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,4 +1,2 @@ -DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a -DIST icu4c-57_1-src.tgz 22360664 SHA256 ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581 SHA512 a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a WHIRLPOOL f9107e3019a0d9b4c40b83e6e7ea5277ab7d4317e349d6c5d6731f0b2355811b37a4c12aa8408a3bc0195ffeebdc952b7df709d2fb191ae1044fffadbafc897c DIST icu4c-58_1-src.tgz 23366443 SHA256 0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 WHIRLPOOL faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37 DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a diff --git a/dev-libs/icu/files/icu-57.1-remove-bashisms.patch b/dev-libs/icu/files/icu-57.1-remove-bashisms.patch deleted file mode 100644 index 09c2dd5.. --- a/dev-libs/icu/files/icu-57.1-remove-bashisms.patch +++ /dev/null @@ -1,230 +0,0 @@ -Index: config/Makefile.inc.in -=== a/config/Makefile.inc.in (revision 36912) -+++ b/config/Makefile.inc.in (working copy) -@@ -125,12 +125,6 @@ - # with usually. Many applications will want to add $(ICULIBS_I18N) as well. - ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) - --# Proper echo newline handling is needed in icu-config --ECHO_N=@ICU_ECHO_N@ --ECHO_C=@ICU_ECHO_C@ --# Not currently being used but good to have for proper tab handling --ECHO_T=@ICU_ECHO_T@ -- - ## - ## - # -Index: config/icu-config-bottom -=== a/config/icu-config-bottom (revision 36912) -+++ b/config/icu-config-bottom (working copy) -@@ -217,73 +217,73 @@ - ;; - - --cflags) -- echo $ECHO_N "${CFLAGS} ${ECHO_C}" -+ printf "%s" "${CFLAGS} " - ;; - - --cc) -- echo $ECHO_N "${CC} ${ECHO_C}" -+ printf "%s" "${CC} " - ;; - - --cxx) -- echo $ECHO_N "${CXX} ${ECHO_C}" -+ printf "%s" "${CXX} " - ;; - - --cxxflags) -- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" -+ printf "%s" "${CXXFLAGS} " - ;; - - --cppflags) - # Don't echo the -I. - it's unneeded. -- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' -+ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' - ;; - - --cppflags-searchpath) -- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" -+ printf "%s" "-I${prefix}/include " - ;; - - --cppflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCPPFLAGS} " - ;; - - --cxxflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCXXFLAGS} " - ;; - - --cflags-dynamic) -- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" -+ printf "%s" "${SHAREDLIBCFLAGS} " - ;; - - --ldflags-system) --
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: b4293900b8325feb1be4ad127dd4823ed022985d Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Nov 5 19:05:06 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Nov 5 20:27:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4293900 dev-libs/icu: Version bump Package-Manager: portage-2.3.2 dev-libs/icu/Manifest | 1 + dev-libs/icu/files/icu-58.1-remove-bashisms.patch | 224 ++ dev-libs/icu/icu-58.1.ebuild | 140 ++ 3 files changed, 365 insertions(+) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 7df2adc..2342ef9 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1,3 @@ DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a DIST icu4c-57_1-src.tgz 22360664 SHA256 ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581 SHA512 a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a WHIRLPOOL f9107e3019a0d9b4c40b83e6e7ea5277ab7d4317e349d6c5d6731f0b2355811b37a4c12aa8408a3bc0195ffeebdc952b7df709d2fb191ae1044fffadbafc897c +DIST icu4c-58_1-src.tgz 23366443 SHA256 0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 WHIRLPOOL faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37 diff --git a/dev-libs/icu/files/icu-58.1-remove-bashisms.patch b/dev-libs/icu/files/icu-58.1-remove-bashisms.patch new file mode 100644 index ..ef60ce4 --- /dev/null +++ b/dev-libs/icu/files/icu-58.1-remove-bashisms.patch @@ -0,0 +1,224 @@ +diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in +--- a/config/Makefile.inc.in 2016-09-09 23:28:18.0 +0200 b/config/Makefile.inc.in 2016-11-05 19:43:07.68848 +0100 +@@ -124,12 +124,6 @@ + # with usually. Many applications will want to add $(ICULIBS_I18N) as well. + ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) + +-# Proper echo newline handling is needed in icu-config +-ECHO_N=@ICU_ECHO_N@ +-ECHO_C=@ICU_ECHO_C@ +-# Not currently being used but good to have for proper tab handling +-ECHO_T=@ICU_ECHO_T@ +- + ## + ## + # +diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom +--- a/config/icu-config-bottom 2016-09-09 23:28:18.0 +0200 b/config/icu-config-bottom 2016-11-05 19:49:00.854481361 +0100 +@@ -218,65 +218,65 @@ + ;; + + --cflags) +- echo $ECHO_N "${CFLAGS} ${ECHO_C}" ++ printf "%s" "${CFLAGS} " + ;; + + --cc) +- echo $ECHO_N "${CC} ${ECHO_C}" ++ printf "%s" "${CC} " + ;; + + --cxx) +- echo $ECHO_N "${CXX} ${ECHO_C}" ++ printf "%s" "${CXX} " + ;; + + --cxxflags) +- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" ++ printf "%s" "${CXXFLAGS} " + ;; + + --cppflags) + # Don't echo the -I. - it's unneeded. +- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' ++ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' + ;; + + --cppflags-searchpath) +- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" ++ printf "%s" "-I${prefix}/include " + ;; + + --cppflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCPPFLAGS} " + ;; + + --cxxflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCXXFLAGS} " + ;; + + --cflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCFLAGS} " + ;; + + --ldflags-system) +- echo $ECHO_N "${LIBS} ${ECHO_C}" ++ printf "%s" "${LIBS} " + ;; + + --ldflags) +- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" ++ printf "%s" "${LDFLAGS} ${ICULIBS} " + # $RPATH_LDFLAGS + ;; + + --ldflags-libsonly) +- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" ++ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " + ;; + + --ldflags-icuio) +- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" ++
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: d85cd1c43d4de7620f732e428a279cf3e2336fc2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Mar 25 20:16:39 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Fri Mar 25 20:16:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d85cd1c4 dev-libs/icu: Version bump Package-Manager: portage-2.2.28 dev-libs/icu/Manifest | 1 + dev-libs/icu/files/icu-57.1-remove-bashisms.patch | 230 + .../files/icu-fix-tests-depending-on-date.patch| 15 -- dev-libs/icu/icu-57.1.ebuild | 140 + 4 files changed, 371 insertions(+), 15 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 6dcb7c1..177e24b 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1,3 @@ DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a DIST icu4c-56_1-src.tgz 25721871 SHA256 3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816 SHA512 297fd91ce6c478309ac3d18813f1b3ff39a992584e3bafb79e2e816a516e903af6b86c6318e1104cda0bb29ba7c0414b65c1e83c0ed0e848ce897a06d7678d9a WHIRLPOOL d7ed3a260fb6b8f8a65ae3872c93528528650d85ddef341abeeaf609f6db3f40de2f4856e0629bed4e31c412120263378642941f8c8029d400082ad2017cd28c +DIST icu4c-57_1-src.tgz 22360664 SHA256 ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581 SHA512 a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a WHIRLPOOL f9107e3019a0d9b4c40b83e6e7ea5277ab7d4317e349d6c5d6731f0b2355811b37a4c12aa8408a3bc0195ffeebdc952b7df709d2fb191ae1044fffadbafc897c diff --git a/dev-libs/icu/files/icu-57.1-remove-bashisms.patch b/dev-libs/icu/files/icu-57.1-remove-bashisms.patch new file mode 100644 index 000..09c2dd5 --- /dev/null +++ b/dev-libs/icu/files/icu-57.1-remove-bashisms.patch @@ -0,0 +1,230 @@ +Index: config/Makefile.inc.in +=== +--- a/config/Makefile.inc.in (revision 36912) b/config/Makefile.inc.in (working copy) +@@ -125,12 +125,6 @@ + # with usually. Many applications will want to add $(ICULIBS_I18N) as well. + ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) + +-# Proper echo newline handling is needed in icu-config +-ECHO_N=@ICU_ECHO_N@ +-ECHO_C=@ICU_ECHO_C@ +-# Not currently being used but good to have for proper tab handling +-ECHO_T=@ICU_ECHO_T@ +- + ## + ## + # +Index: config/icu-config-bottom +=== +--- a/config/icu-config-bottom (revision 36912) b/config/icu-config-bottom (working copy) +@@ -217,73 +217,73 @@ + ;; + + --cflags) +- echo $ECHO_N "${CFLAGS} ${ECHO_C}" ++ printf "%s" "${CFLAGS} " + ;; + + --cc) +- echo $ECHO_N "${CC} ${ECHO_C}" ++ printf "%s" "${CC} " + ;; + + --cxx) +- echo $ECHO_N "${CXX} ${ECHO_C}" ++ printf "%s" "${CXX} " + ;; + + --cxxflags) +- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" ++ printf "%s" "${CXXFLAGS} " + ;; + + --cppflags) + # Don't echo the -I. - it's unneeded. +- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' ++ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' + ;; + + --cppflags-searchpath) +- echo $ECHO_N "-I${prefix}/include ${ECHO_C}" ++ printf "%s" "-I${prefix}/include " + ;; + + --cppflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCPPFLAGS} " + ;; + + --cxxflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCXXFLAGS} " + ;; + + --cflags-dynamic) +- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" ++ printf "%s" "${SHAREDLIBCFLAGS} " + ;; + + --ldflags-system) +- echo $ECHO_N "${LIBS} ${ECHO_C}" ++ printf "%s" "${LIBS} " + ;; + + --ldflags) +- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" ++ printf "%s" "${LDFLAGS} ${ICULIBS} " + # $RPATH_LDFLAGS + ;; + + --ldflags-libsonly) +- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" ++ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " + ;; + +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 7bb8a9efebd6b2292734380bf7c0b65520d2efcc Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Mar 3 19:44:00 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Thu Mar 3 19:44:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb8a9ef dev-libs/icu: Backport fix for bug 573294 Package-Manager: portage-2.2.27 dev-libs/icu/files/icu-flagparser.patch | 13 + dev-libs/icu/icu-56.1-r1.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/dev-libs/icu/files/icu-flagparser.patch b/dev-libs/icu/files/icu-flagparser.patch new file mode 100644 index 000..bd64276 --- /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 e8a0e2b..3968b3a 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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/
commit: 236e3a215901857f964efa457fa6b3c1bf5c6c10 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Mon Nov 2 21:51:34 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Mon Nov 2 21:51:34 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236e3a21 dev-libs/icu: Remove old Package-Manager: portage-2.2.23 dev-libs/icu/Manifest |1 - dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch | 1105 --- dev-libs/icu/icu-54.1-r1.ebuild | 135 --- 3 files changed, 1241 deletions(-) diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 2374fdc..f600c9f 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1 @@ -DIST icu4c-54_1-src.tgz 25485678 SHA256 d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 SHA512 d54d4cd826e1aef62a574595a04f9fec0a42c4445ed0a166a6bb5c5f3c9f692bf3273756f350233f50b2a1ad32c437dedfeeac96d6dc814d27bfd9159b7a651c WHIRLPOOL 1ae01eb26824ca591ff76ea040f703023f24975ad4177d49b1dd60f7e7f96f60884745d6c6e5e2bdf17fc8e104e97ed814f6c0ca051d1807814e324eb24e94dd DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a diff --git a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch b/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch deleted file mode 100644 index db86c92..000 --- a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch +++ /dev/null @@ -1,1105 +0,0 @@ -Index: /icu/trunk/source/common/unicode/utypes.h -=== /icu/trunk/source/common/unicode/utypes.h (revision 36800) -+++ /icu/trunk/source/common/unicode/utypes.h (revision 36801) -@@ -648,4 +648,5 @@ - U_REGEX_TIME_OUT, /**< Maximum allowed match time exceeded*/ - U_REGEX_STOPPED_BY_CALLER,/**< Matching operation aborted by user callback fn.*/ -+U_REGEX_PATTERN_TOO_BIG, /**< Pattern exceeds limits on size or complexity. @draft ICU 55 */ - U_REGEX_ERROR_LIMIT, /**< This must always be the last value to indicate the limit for regexp errors */ - -Index: /icu/trunk/source/common/utypes.c -=== /icu/trunk/source/common/utypes.c (revision 36800) -+++ /icu/trunk/source/common/utypes.c (revision 36801) -@@ -2,5 +2,5 @@ - ** - * --* Copyright (C) 1997-2011, International Business Machines -+* Copyright (C) 1997-2014, International Business Machines - * Corporation and others. All Rights Reserved. - * -@@ -166,5 +166,6 @@ - "U_REGEX_STACK_OVERFLOW", - "U_REGEX_TIME_OUT", --"U_REGEX_STOPPED_BY_CALLER" -+"U_REGEX_STOPPED_BY_CALLER", -+"U_REGEX_PATTERN_TOO_BIG" - }; - -Index: /icu/trunk/source/i18n/regexcmp.cpp -=== /icu/trunk/source/i18n/regexcmp.cpp(revision 36800) -+++ /icu/trunk/source/i18n/regexcmp.cpp(revision 36801) -@@ -305,5 +305,5 @@ - // the position in the compiled pattern. - // --fRXPat->fFrameSize+=RESTACKFRAME_HDRCOUNT; -+allocateStackData(RESTACKFRAME_HDRCOUNT); - - // -@@ -371,7 +371,7 @@ - //4 NOP Resreved, will be replaced by a save if there are - //OR | operators at the top level --fRXPat->fCompiledPat->addElement(URX_BUILD(URX_STATE_SAVE, 2), *fStatus); --fRXPat->fCompiledPat->addElement(URX_BUILD(URX_JMP, 3), *fStatus); --fRXPat->fCompiledPat->addElement(URX_BUILD(URX_FAIL, 0), *fStatus); -+appendOp(URX_STATE_SAVE, 2); -+appendOp(URX_JMP, 3); -+appendOp(URX_FAIL, 0); - - // Standard open nonCapture paren action emits the two NOPs and -@@ -396,5 +396,5 @@ - - // add the END operation to the compiled pattern. --fRXPat->fCompiledPat->addElement(URX_BUILD(URX_END, 0), *fStatus); -+appendOp(URX_END, 0); - - // Terminate the pattern compilation state machine. -@@ -418,5 +418,5 @@ - int32_t op = (int32_t)fRXPat->fCompiledPat->elementAti(savePosition); - U_ASSERT(URX_TYPE(op) == URX_NOP); // original contents of reserved location --op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1); -+op = buildOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1); - fRXPat->fCompiledPat->setElementAt(op, savePosition); - -@@ -424,6 +424,5 @@ - // the JMP will eventually be the location following