packages/icu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!62 update to 74.1

Browse Source 
From: @zppzhangpan 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2024-02-01 08:04:42 +00:00 committed by Gitee
commit a75df737d0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 48 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backport-Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch
View File

@ -1,29 +0,0 @@
From b6b3e89231a623441940889b5badd90f74bdce2b 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.
---
source/test/intltest/caltest.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/source/test/intltest/caltest.cpp b/source/test/intltest/caltest.cpp
index 7518f11..ab63e75 100644
--- a/source/test/intltest/caltest.cpp
+++ b/source/test/intltest/caltest.cpp
@@ -4006,6 +4006,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;
}
--
2.33.0

80
delete-taboo-words.patch
View File

@ -4,53 +4,51 @@ Date: Sat, 4 Jun 2022 18:54:52 +0800
Subject: [PATCH] delete-taboo-words.patch Subject: [PATCH] delete-taboo-words.patch
--- ---
source/data/in/icudt73l.dat | Bin 32029568 -> 32029568 bytes source/data/in/icudt74l.dat | Bin 30783664 -> 30783664 bytes
source/test/testdata/metaZones.txt | 10 +++++----- source/test/testdata/metaZones.txt | 10 +++++-----
source/test/testdata/structLocale.txt | 2 +- source/test/testdata/structLocale.txt | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-) 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/data/in/icudt73l.dat b/source/data/in/icudt73l.dat diff --git a/source/data/in/icudt74l.dat b/source/data/in/icudt74l.dat
index 3fe621b7ed292e18d285248a6fd60493b1e9de13..33819fc00b22c4e173c090e484beb22a20a3ad29 100644 index 6e7cf8e2c83f93b028fc66a9e0a6b16f7a211eee..6d975b4bce0ee187e15cfbdb9ac915191f2f30cd 100644
GIT binary patch GIT binary patch
delta 1647 delta 1561
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 ZzXz7dL-9yF7Ei=e@yt>K{hnJ~;%ob#{Ote$
A`2YX_
delta 1647 delta 1561
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 a^m|~LJQR<_WAQ{h70)a+(C@j$CB6pGkNnR7
A+W-In
diff --git a/source/test/testdata/metaZones.txt b/source/test/testdata/metaZones.txt diff --git a/source/test/testdata/metaZones.txt b/source/test/testdata/metaZones.txt
index 0b57cab..8c15451 100644 index 0b57cab..8c15451 100644

14
icu.spec
View File

@ -1,13 +1,13 @@
Name: icu Name: icu
Version: 73.2 Version: 74.1
Release: 3 Release: 1
Summary: International Components for Unicode Summary: International Components for Unicode
License: MIT and UCD and Public Domain License: MIT and UCD and Public Domain
URL: http://site.icu-project.org/ URL: http://site.icu-project.org/
Source0: https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-src.tgz Source0: https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz
Source1: icu-config.sh Source1: icu-config.sh
BuildRequires: gcc gcc-c++ doxygen autoconf python3 git BuildRequires: gcc gcc-c++ doxygen autoconf python3 git libicu
Requires: lib%{name} = %{version}-%{release} Requires: lib%{name} = %{version}-%{release}
Patch1: gennorm2-man.patch Patch1: gennorm2-man.patch
@ -19,7 +19,6 @@ Patch4: 0001-add-support-loongarch64.patch
%ifarch sw_64 %ifarch sw_64
Patch5: icu-Add-sw64-architecture.patch Patch5: icu-Add-sw64-architecture.patch
%endif %endif
Patch6000: backport-Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch
Patch9000: delete-taboo-words.patch Patch9000: delete-taboo-words.patch
%description %description
@ -84,6 +83,8 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
) )
install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/icu-config install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/icu-config
cp -a %{_libdir}/libicu*.so.73* %{buildroot}%{_libdir}
%check %check
if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; then if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; then
exit 1 exit 1
@ -134,6 +135,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
%changelog %changelog
* Wed Jan 24 2024 zhangpan<zhangpan103@h-partners.com> - 74.1-1
- update to 74.1
* Tue Sep 19 2023 zhouwenpei<zhouwenpei@h-partners.com> - 73.2-3 * Tue Sep 19 2023 zhouwenpei<zhouwenpei@h-partners.com> - 73.2-3
- Fix broken TestHebrewCalendarInTemporalLeapYear - Fix broken TestHebrewCalendarInTemporalLeapYear

BIN
icu4c-73_2-src.tgz → icu4c-74_1-src.tgz
View File

Binary file not shown.