aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCeleste <20312-Celeste@users.gitlab.alpinelinux.org>2023-11-01 13:47:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2023-11-08 21:13:15 +0100
commitb969a4466fd5e00c61bd3adfdb9cd3707c7b24b0 (patch)
treead8bf003f05e4cfdc2543615a71bfdd285818898
parent677f2ea585cbf4d21bca7b0512f7a42bd706ce84 (diff)
main/icu: upgrade to 74.1
-rw-r--r--main/icu/APKBUILD16
-rw-r--r--main/icu/Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch33
-rw-r--r--main/icu/cal-regression.patch110
3 files changed, 6 insertions, 153 deletions
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index a0ec04e7fb9..e43dc3dda2b 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=icu
-pkgver=73.2
-pkgrel=3
+pkgver=74.1
+pkgrel=0
pkgdesc="International Components for Unicode library"
url="https://icu.unicode.org/"
arch="all"
@@ -24,9 +24,7 @@ source="https://github.com/unicode-org/icu/releases/download/release-${pkgver//.
https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-data.zip
https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-data-bin-b.zip
https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-data-bin-l.zip
- cal-regression.patch
standardize-vtzone-output.patch
- Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch
data-filter-en.yml
"
builddir="$srcdir/icu/source"
@@ -153,12 +151,10 @@ _yaml2json() {
}
sha512sums="
-76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 icu4c-73_2-src.tgz
-7f25816de4062fe79eaf350cb5230747643b9bb08c60443b4e1b2d79eb1ce3192ae9a767107171b85bda4cfc1969035ce09cebc81add0590eb4d61ca33aa0730 icu4c-73_2-data.zip
-8512947da7b2a927627abed6bd7e04218cd4fcd02d44eb72a82ffa87aedabfc3be5d3152e9fba33a769ef35e2db55764c2ab8f5bd65b4e89aa9c15b33392e078 icu4c-73_2-data-bin-b.zip
-420c2f5090927dab13f5449da3b0ec7bf86a91ea8723f177aca2907a8eea9bcb4c3475b66c54355ae320001813db57a00afdab00bd85b8c36d39adedcab80bfc icu4c-73_2-data-bin-l.zip
-09dd560bf5cfa5c32fc6f1f04b209446fa3b5306e9c237ee78afeea4588030bac1e3daf03a1e7f6273c85ecfacd9b938518fc194c11d7f5259e2b7730fc2a56d cal-regression.patch
+32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 icu4c-74_1-src.tgz
+7e411e0f190428588a872a3c65477eed60063f6fef0c84d09822c3b6b7ebba3c956a484cd91da1e26f93360f4b3e08da6ba226b674f2d139c44f86fdb2ac90a3 icu4c-74_1-data.zip
+8089c6afda973fd7c9c1ee4db96478b48215a0d7bb5a033fc69546e08d01fda168656386ce911076ad29d6ca5f9a88afe14bd2127fdead1c939ed1a4f693aab5 icu4c-74_1-data-bin-b.zip
+8e3703ba76363f92958113eeab7f48119f9ceaacc86512099a325585d61c9f985c0a65c5c793bf687eebd85cc72bc2af1a6fcca02bb55c90dd14245017d5a6d6 icu4c-74_1-data-bin-l.zip
c76fd529f92a7b27a45a307c8bb91c109910d012478414b08983af3320e29fbe76e03d8434c4efbde68ecaa56a86130d6514428c5a1085985634bc3650e8e96e standardize-vtzone-output.patch
-07127ebd85fd1ce605c3644d87676044dcb6cc5cb4b86dbfa04b23d8cc6d29477fa6caf55fe879b5040181d9723dafdbcfbf224415ae77cbb8373104ec1bf397 Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch
609541c1ac10c12b2b52f7800a2057d5c97e49dc9a1774a1b53e13d88599128baa7637f1a63b4de52dfe58b1038c7f3462ef29ad223dbe2ecb2862e3249a1cf4 data-filter-en.yml
"
diff --git a/main/icu/Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch b/main/icu/Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch
deleted file mode 100644
index 7e7522c0e45..00000000000
--- a/main/icu/Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f3b869cbb0b9ced42d7ca4e24626a868a14ddcfc Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-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.
----
- icu4c/source/test/intltest/caltest.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp
-index 9d89f468eef0..18b96f231ba3 100644
---- 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/main/icu/cal-regression.patch b/main/icu/cal-regression.patch
deleted file mode 100644
index ab425ceaca3..00000000000
--- a/main/icu/cal-regression.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Patch-Source: https://github.com/unicode-org/icu/commit/1b15a4e9db345b67ad284b92801f3fd99fe56e69
---
-From 1b15a4e9db345b67ad284b92801f3fd99fe56e69 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Thu, 29 Jun 2023 14:55:05 -0700
-Subject: [PATCH] ICU-22424 Fix Calendar::clear(UCAL_MONTH)
-
-Make the calling of clear(UCAL_MONTH or UCAL_ORDINAL_MONTH) clear both fields.
----
- icu4c/source/i18n/calendar.cpp | 11 +++++++++-
- icu4c/source/i18n/unicode/calendar.h | 3 ++-
- icu4c/source/test/intltest/caltest.cpp | 28 ++++++++++++++++++++++++++
- icu4c/source/test/intltest/caltest.h | 2 ++
- 4 files changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
-index 72d5d10ed5f..d8d544581ea 100644
---- a/i18n/calendar.cpp
-+++ b/i18n/calendar.cpp
-@@ -1305,7 +1305,16 @@ Calendar::clear(UCalendarDateFields field)
- }
- fFields[field] = 0;
- fStamp[field] = kUnset;
-- fIsSet[field] = false; // Remove later
-+ if (field == UCAL_MONTH) {
-+ fFields[UCAL_ORDINAL_MONTH] = 0;
-+ fStamp[UCAL_ORDINAL_MONTH] = kUnset;
-+ fIsSet[UCAL_ORDINAL_MONTH] = false; // Remove later
-+ }
-+ if (field == UCAL_ORDINAL_MONTH) {
-+ fFields[UCAL_MONTH] = 0;
-+ fStamp[UCAL_MONTH] = kUnset;
-+ fIsSet[UCAL_MONTH] = false; // Remove later
-+ }
- fIsTimeSet = fAreFieldsSet = fAreAllFieldsSet = fAreFieldsVirtuallySet = false;
- }
-
-diff --git a/icu4c/source/i18n/unicode/calendar.h b/icu4c/source/i18n/unicode/calendar.h
-index aa83866ac9c..26781f8a056 100644
---- a/i18n/unicode/calendar.h
-+++ b/i18n/unicode/calendar.h
-@@ -1237,7 +1237,8 @@ class U_I18N_API Calendar : public UObject {
- /**
- * Clears the value in the given time field, both making it unset and assigning it a
- * value of zero. This field value will be determined during the next resolving of
-- * time into time fields.
-+ * time into time fields. Clearing UCAL_ORDINAL_MONTH or UCAL_MONTH will
-+ * clear both fields.
- *
- * @param field The time field to be cleared.
- * @stable ICU 2.6.
-diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp
-index 7518f1123a7..217fc692fed 100644
---- a/test/intltest/caltest.cpp
-+++ b/test/intltest/caltest.cpp
-@@ -184,6 +184,7 @@ void CalendarTest::runIndexedTest( int32_t index, UBool exec, const char* &name,
- TESTCASE_AUTO(TestLimitsOrdinalMonth);
- TESTCASE_AUTO(TestActualLimitsOrdinalMonth);
- TESTCASE_AUTO(TestChineseCalendarMonthInSpecialYear);
-+ TESTCASE_AUTO(TestClearMonth);
-
- TESTCASE_AUTO_END;
- }
-@@ -3887,6 +3888,33 @@ void CalendarTest::TestChineseCalendarMapping() {
- }
- }
-
-+void CalendarTest::TestClearMonth() {
-+ UErrorCode status = U_ZERO_ERROR;
-+ LocalPointer<Calendar> cal(Calendar::createInstance(Locale::getRoot(), status));
-+ if (failure(status, "construct Calendar")) return;
-+ cal->set(2023, UCAL_JUNE, 29);
-+ assertEquals("Calendar::get(UCAL_MONTH)", UCAL_JUNE, cal->get(UCAL_MONTH, status));
-+ if (failure(status, "Calendar::get(UCAL_MONTH)")) return;
-+ cal->clear(UCAL_MONTH);
-+ assertEquals("Calendar::isSet(UCAL_MONTH) after clear(UCAL_MONTH)", false, !!cal->isSet(UCAL_MONTH));
-+ assertEquals("Calendar::get(UCAL_MONTH after clear(UCAL_MONTH))", UCAL_JANUARY, !!cal->get(UCAL_MONTH, status));
-+ if (failure(status, "Calendar::get(UCAL_MONTH)")) return;
-+
-+ cal->set(UCAL_ORDINAL_MONTH, 7);
-+ assertEquals("Calendar::get(UCAL_MONTH) after set(UCAL_ORDINAL_MONTH, 7)", UCAL_AUGUST, cal->get(UCAL_MONTH, status));
-+ if (failure(status, "Calendar::get(UCAL_MONTH) after set(UCAL_ORDINAL_MONTH, 7)")) return;
-+ assertEquals("Calendar::get(UCAL_ORDINAL_MONTH) after set(UCAL_ORDINAL_MONTH, 7)", 7, cal->get(UCAL_ORDINAL_MONTH, status));
-+ if (failure(status, "Calendar::get(UCAL_ORDINAL_MONTH) after set(UCAL_ORDINAL_MONTH, 7)")) return;
-+
-+ cal->clear(UCAL_ORDINAL_MONTH);
-+ assertEquals("Calendar::isSet(UCAL_ORDINAL_MONTH) after clear(UCAL_ORDINAL_MONTH)", false, !!cal->isSet(UCAL_ORDINAL_MONTH));
-+ assertEquals("Calendar::get(UCAL_MONTH) after clear(UCAL_ORDINAL_MONTH)", UCAL_JANUARY, cal->get(UCAL_MONTH, status));
-+ if (failure(status, "Calendar::get(UCAL_MONTH) after clear(UCAL_ORDINAL_MONTH)")) return;
-+ assertEquals("Calendar::get(UCAL_ORDINAL_MONTH) after clear(UCAL_ORDINAL_MONTH)", 0, cal->get(UCAL_ORDINAL_MONTH, status));
-+ if (failure(status, "Calendar::get(UCAL_ORDINAL_MONTH) after clear(UCAL_ORDINAL_MONTH)")) return;
-+
-+}
-+
- void CalendarTest::TestGregorianCalendarInTemporalLeapYear() {
- // test from year 1800 to 2500
- UErrorCode status = U_ZERO_ERROR;
-diff --git a/icu4c/source/test/intltest/caltest.h b/icu4c/source/test/intltest/caltest.h
-index ee062b2e0ed..bc23702dc91 100644
---- a/test/intltest/caltest.h
-+++ b/test/intltest/caltest.h
-@@ -56,6 +56,8 @@ class CalendarTest: public CalendarTimeZoneTest {
-
- virtual void TestDebug();
-
-+ virtual void TestClearMonth();
-+
- public: // package
- /**
- * test subroutine used by TestDisambiguation765