diff --git a/common/shlibs b/common/shlibs index 37f8cacd6a0..e4c1a25670e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -543,12 +543,12 @@ libmaildir.so.5 kdepim-runtime-17.12.3_1 libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1 libbabl-0.1.so.0 babl-0.1.16_1 libbamf3.so.2 bamf-0.5.1_1 -libicuio.so.63 icu-libs-63.1_1 -libicui18n.so.63 icu-libs-63.1_1 -libicudata.so.63 icu-libs-63.1_1 -libicutu.so.63 icu-libs-63.1_1 -libicuuc.so.63 icu-libs-63.1_1 -libicutest.so.63 icu-libs-63.1_1 +libicuio.so.64 icu-libs-64.1_1 +libicui18n.so.64 icu-libs-64.1_1 +libicudata.so.64 icu-libs-64.1_1 +libicutu.so.64 icu-libs-64.1_1 +libicuuc.so.64 icu-libs-64.1_1 +libicutest.so.64 icu-libs-64.1_1 libaspell.so.15 aspell-0.60_1 libpspell.so.15 aspell-0.60_1 libenchant.so.1 enchant-1.4.2_1 diff --git a/srcpkgs/icu/patches/buffer_size_adjust.patch b/srcpkgs/icu/patches/buffer_size_adjust.patch deleted file mode 100644 index e41fb481948..00000000000 --- a/srcpkgs/icu/patches/buffer_size_adjust.patch +++ /dev/null @@ -1,21 +0,0 @@ -The value of tmpResult may be -1 in which case setting -currentBufferSize = -1 leads to an error when trying to -allocate the buffers. - -If tmpResult is less than currentBufferSize simply double -currentBufferSize until parsing the flags succeeds. - ---- source/tools/pkgdata/pkgdata.cpp 2015-10-08 05:54:02.000000000 +0200 -+++ source/tools/pkgdata/pkgdata.cpp 2015-11-29 16:52:09.329794090 +0100 -@@ -862,7 +862,10 @@ - pkgDataFlags[i] = NULL; - } - } -- currentBufferSize = tmpResult; -+ if (tmpResult > currentBufferSize) -+ currentBufferSize = tmpResult; -+ else -+ currentBufferSize *= 2; - } else if (U_FAILURE(status)) { - fprintf(stderr,"Unable to open or read \"%s\" option file. status = %s\n", o->options, u_errorName(status)); - return -1; diff --git a/srcpkgs/icu/patches/checkImpl.patch b/srcpkgs/icu/patches/checkImpl.patch deleted file mode 100644 index ae7b66c8e08..00000000000 --- a/srcpkgs/icu/patches/checkImpl.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/icu4c/source/common/unicode/urename.h b/icu4c/source/common/unicode/urename.h -index 5812173e39c..0512be3b6e5 100644 ---- source/common/unicode/urename.h -+++ source/common/unicode/urename.h -@@ -110,7 +110,6 @@ - #define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data) - #define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data) - #define allowedHourFormatsCleanup U_ICU_ENTRY_POINT_RENAME(allowedHourFormatsCleanup) --#define checkImpl U_ICU_ENTRY_POINT_RENAME(checkImpl) - #define cmemory_cleanup U_ICU_ENTRY_POINT_RENAME(cmemory_cleanup) - #define dayPeriodRulesCleanup U_ICU_ENTRY_POINT_RENAME(dayPeriodRulesCleanup) - #define deleteAllowedHourFormats U_ICU_ENTRY_POINT_RENAME(deleteAllowedHourFormats) -diff --git a/icu4c/source/i18n/uspoof.cpp b/icu4c/source/i18n/uspoof.cpp -index 8e3d69ede2b..66f228f037a 100644 ---- source/i18n/uspoof.cpp -+++ source/i18n/uspoof.cpp -@@ -547,7 +547,7 @@ uspoof_checkUnicodeString(const USpoofChecker *sc, - return uspoof_check2UnicodeString(sc, id, NULL, status); - } - --int32_t checkImpl(const SpoofImpl* This, const UnicodeString& id, CheckResult* checkResult, UErrorCode* status) { -+static int32_t checkImpl(const SpoofImpl* This, const UnicodeString& id, CheckResult* checkResult, UErrorCode* status) { - U_ASSERT(This != NULL); - U_ASSERT(checkResult != NULL); - checkResult->clear(); - diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index cb0bfc2c53a..97c06850228 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -1,7 +1,7 @@ # Template file for 'icu' pkgname=icu -version=63.1 -revision=2 +version=64.2 +revision=1 wrksrc=icu build_wrksrc=source build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " license="ICU" homepage="http://www.icu-project.org/" distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${version//./_}-src.tgz" -checksum=05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d +checksum=627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c if [ "$CROSS_BUILD" ]; then configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"