diff options
Diffstat (limited to 'system/icu')
| -rw-r--r-- | system/icu/32bit.patch | 23 | ||||
| -rw-r--r-- | system/icu/APKBUILD | 10 | ||||
| -rw-r--r-- | system/icu/icu-60.2-always-use-utf8.patch | 2 | ||||
| -rw-r--r-- | system/icu/islamic-calendar.patch | 14 |
4 files changed, 29 insertions, 20 deletions
diff --git a/system/icu/32bit.patch b/system/icu/32bit.patch new file mode 100644 index 000000000..42fb3ec8f --- /dev/null +++ b/system/icu/32bit.patch @@ -0,0 +1,23 @@ +From 4b3e6888c2aaba6465f1bc96f61b17a2513050f3 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sat, 21 Jun 2025 12:28:15 +0200 +Subject: [PATCH] ICU-23120 Mask UnicodeStringTest::TestLargeMemory on 32-bit + platforms + +--- + icu4c/source/test/intltest/ustrtest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/icu4c/source/test/intltest/ustrtest.cpp b/icu4c/source/test/intltest/ustrtest.cpp +index 56976b3e3d23..26225f5b5b56 100644 +--- source/test/intltest/ustrtest.cpp ++++ source/test/intltest/ustrtest.cpp +@@ -2353,7 +2353,7 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() { + } + + void UnicodeStringTest::TestLargeMemory() { +-#if U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED ++#if (U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED) && (UINTPTR_MAX == 0xFFFFFFFFFFFFFFFF) + if(quick) { return; } + IcuTestErrorCode status(*this, "TestLargeMemory"); + constexpr uint32_t len = 2147483643; diff --git a/system/icu/APKBUILD b/system/icu/APKBUILD index 17741042d..fb11c37bf 100644 --- a/system/icu/APKBUILD +++ b/system/icu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergey Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=icu -pkgver=75.1 +pkgver=77.1 # convert x.y.z to x_y_z _ver=$(printf '%s' "$pkgver" | tr . _) @@ -17,7 +17,7 @@ makedepends="" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs" source="https://github.com/unicode-org/icu/releases/download/release-$(printf '%s' "$pkgver" | tr . -)/${pkgname}4c-$_ver-src.tgz icu-60.2-always-use-utf8.patch - islamic-calendar.patch + 32bit.patch " # secfixes: @@ -79,6 +79,6 @@ static() { mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ } -sha512sums="70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45 icu4c-75_1-src.tgz -f89e9f389621ed9a58548ac961fc93fca8377b91fbb0df1991049757deadf72f6f11346eb7af883040c85b28621140805636a7f90d94f3b53e666d67b9681989 icu-60.2-always-use-utf8.patch -1a4305e6145ecab171d044e4cc14e074294c73e221f780803363823bafa2f79d2efd77d63f6c0bb6df6d5f9767de38d321196d85649be929a583f1abc27dbdd0 islamic-calendar.patch" +sha512sums="a47d6d9c327d037a05ea43d1d1a06b2fd757cc02a94f7c1a238f35cfc3dfd4ab78d0612790f3a3cca0292c77412a9c2c15c8f24b718f79a857e007e66f07e7cd icu4c-77_1-src.tgz +95c37febf7b6291dd0766de0dbd8eaee14132ad1b84bc93260b9e19cb3c05a786e8780ac0cbd47bf80182f73c647d4e5f067c9b4f5fbeda13a7fcc34b3bc0341 icu-60.2-always-use-utf8.patch +dbe7c019529739578593638f09955f58cb7ede6bffe5745c6a933ae2e788fa435ac0c2f6abab5bd08cc80a31621aae88bb4857df0530e23e1b9d751cd2d093a9 32bit.patch" diff --git a/system/icu/icu-60.2-always-use-utf8.patch b/system/icu/icu-60.2-always-use-utf8.patch index 801a907d0..17ff834a4 100644 --- a/system/icu/icu-60.2-always-use-utf8.patch +++ b/system/icu/icu-60.2-always-use-utf8.patch @@ -1,6 +1,6 @@ --- source/common/unicode/platform.h 2017-10-25 13:41:15.000000000 -0500 +++ source/common/unicode/platform.h 2018-04-04 02:07:28.851222016 -0500 -@@ -606,7 +606,7 @@ +@@ -612,7 +612,7 @@ U_PLATFORM == U_PF_EMSCRIPTEN # define U_CHARSET_IS_UTF8 1 #else diff --git a/system/icu/islamic-calendar.patch b/system/icu/islamic-calendar.patch deleted file mode 100644 index bae9734af..000000000 --- a/system/icu/islamic-calendar.patch +++ /dev/null @@ -1,14 +0,0 @@ -The addition is duplicated, causing some dates to be one year off. - -Fixes: d43d216feb ("ICU-22633 Test and fix int32_t overflow for Calendar set") - ---- source/i18n/islamcal.cpp.old 2024-04-16 16:08:53.000000000 -0500 -+++ source/i18n/islamcal.cpp 2024-08-12 00:03:20.102380147 -0500 -@@ -452,7 +452,6 @@ - // This may be called by Calendar::handleComputeJulianDay with months out of the range - // 0..11. Need to handle that here since monthStart requires months in the range 0.11. - if (month > 11) { -- eyear += (month / 12); - if (uprv_add32_overflow(eyear, (month / 12), &eyear)) { - status = U_ILLEGAL_ARGUMENT_ERROR; - return 0; |