!66 [sync] PR-63: Modify arch support

From: @openeuler-sync-bot 
Reviewed-by: @licihua 
Signed-off-by: @licihua

backport-remove-TestJitterbug6175.patch

@@ -0,0 +1,112 @@
+From d4774599b63f72c887cf449d02b3d1e5b0acc960 Mon Sep 17 00:00:00 2001
+From: Peter Edberg <pedberg@unicode.org>
+Date: Wed, 12 Mar 2008 23:22:07 +0000
+Subject: [PATCH] ICU-6175 Test detecting empty segments in ISO-2022-x & HZ
+ with UConverterCallbackReason==UCNV_IRREGULAR
+
+X-SVN-Rev: 23572
+
+revert d4774599b63f72c887cf449d02b3d1e5b0acc960
+
+---
+ source/test/cintltst/nucnvtst.c | 70 ---------------------------------
+ 1 file changed, 70 deletions(-)
+
+diff --git a/source/test/cintltst/nucnvtst.c b/source/test/cintltst/nucnvtst.c
+index 73e0fde..1f96ded 100644
+--- a/source/test/cintltst/nucnvtst.c
++++ b/source/test/cintltst/nucnvtst.c
+@@ -101,7 +101,6 @@ static void TestJitterbug2346(void);
+ static void TestJitterbug2411(void);
+ static void TestJB5275(void);
+ static void TestJB5275_1(void);
+-static void TestJitterbug6175(void);
+ 
+ static void TestIsFixedWidth(void);
+ #endif
+@@ -329,7 +328,6 @@ void addTestNewConvert(TestNode** root)
+ #if !UCONFIG_NO_LEGACY_CONVERSION
+    addTest(root, &TestJitterbug2346, "tsconv/nucnvtst/TestJitterbug2346");
+    addTest(root, &TestJitterbug2411, "tsconv/nucnvtst/TestJitterbug2411");
+-   addTest(root, &TestJitterbug6175, "tsconv/nucnvtst/TestJitterbug6175");
+ 
+    addTest(root, &TestIsFixedWidth, "tsconv/nucnvtst/TestIsFixedWidth");
+ #endif
+@@ -4591,74 +4589,6 @@ cleanup:
+     free(offsets);
+ }
+ 
+-/* Tests for empty segments in ISO-2022-JP/KR/CN, HZ, check that UConverterCallbackReason is UCNV_IRREGULAR */
+-typedef struct {
+-    const char *    converterName;
+-    const char *    inputText;
+-    int             inputTextLength;
+-} EmptySegmentTest;
+-
+-/* Callback for TestJitterbug6175, should only get called for empty segment errors */
+-static void UCNV_TO_U_CALLBACK_EMPTYSEGMENT( const void *context, UConverterToUnicodeArgs *toArgs, const char* codeUnits,
+-                                             int32_t length, UConverterCallbackReason reason, UErrorCode * err ) {
+-    // suppress compiler warnings about unused variables
+-    (void)context;
+-    (void)codeUnits;
+-    (void)length;
+-    if (reason > UCNV_IRREGULAR) {
+-        return;
+-    }
+-    if (reason != UCNV_IRREGULAR) {
+-        log_err("toUnicode callback invoked for empty segment but reason is not UCNV_IRREGULAR\n");
+-    }
+-    /* Standard stuff below from UCNV_TO_U_CALLBACK_SUBSTITUTE */
+-    *err = U_ZERO_ERROR;
+-    ucnv_cbToUWriteSub(toArgs,0,err);
+-}
+-
+-enum { kEmptySegmentToUCharsMax = 64 };
+-static void TestJitterbug6175(void) {
+-    static const char  iso2022jp_a[] = { 0x61, 0x62, 0x1B,0x24,0x42, 0x1B,0x28,0x42, 0x63, 0x64, 0x0D, 0x0A };
+-    static const char  iso2022kr_a[] = { 0x1B,0x24,0x29,0x43, 0x61, 0x0E, 0x0F, 0x62, 0x0D, 0x0A };
+-    static const char  iso2022cn_a[] = { 0x61, 0x1B,0x24,0x29,0x41, 0x62, 0x0E, 0x0F, 0x1B,0x24,0x2A,0x48, 0x1B,0x4E, 0x6A,0x65, 0x63, 0x0D, 0x0A };
+-    static const char  iso2022cn_b[] = { 0x61, 0x1B,0x24,0x29,0x41, 0x62, 0x0E, 0x1B,0x24,0x29,0x47, 0x68,0x64, 0x0F, 0x63, 0x0D, 0x0A };
+-    static const char  hzGB2312_a[]  = { 0x61, 0x62, 0x7E,0x7B, 0x7E,0x7D, 0x63, 0x64 };
+-    static const EmptySegmentTest emptySegmentTests[] = {
+-        /* converterName inputText    inputTextLength */
+-        { "ISO-2022-JP", iso2022jp_a, sizeof(iso2022jp_a) },
+-        { "ISO-2022-KR", iso2022kr_a, sizeof(iso2022kr_a) },
+-        { "ISO-2022-CN", iso2022cn_a, sizeof(iso2022cn_a) },
+-        { "ISO-2022-CN", iso2022cn_b, sizeof(iso2022cn_b) },
+-        { "HZ-GB-2312",  hzGB2312_a,  sizeof(hzGB2312_a)  },
+-        /* terminator: */
+-        { NULL,          NULL,        0,                  }
+-    };
+-    const EmptySegmentTest * testPtr;
+-    for (testPtr = emptySegmentTests; testPtr->converterName != NULL; ++testPtr) {
+-        UErrorCode   err = U_ZERO_ERROR;
+-        UConverter * cnv = ucnv_open(testPtr->converterName, &err);
+-        if (U_FAILURE(err)) {
+-            log_data_err("Unable to open %s converter: %s\n", testPtr->converterName, u_errorName(err));
+-            return;
+-        }
+-        ucnv_setToUCallBack(cnv, UCNV_TO_U_CALLBACK_EMPTYSEGMENT, NULL, NULL, NULL, &err);
+-        if (U_FAILURE(err)) {
+-            log_data_err("Unable to setToUCallBack for %s converter: %s\n", testPtr->converterName, u_errorName(err));
+-            ucnv_close(cnv);
+-            return;
+-        }
+-        {
+-            UChar         toUChars[kEmptySegmentToUCharsMax];
+-            UChar *       toUCharsPtr = toUChars;
+-            const UChar * toUCharsLimit = toUCharsPtr + kEmptySegmentToUCharsMax;
+-            const char *  inCharsPtr = testPtr->inputText;
+-            const char *  inCharsLimit = inCharsPtr + testPtr->inputTextLength;
+-            ucnv_toUnicode(cnv, &toUCharsPtr, toUCharsLimit, &inCharsPtr, inCharsLimit, NULL, true, &err);
+-        }
+-        ucnv_close(cnv);
+-    }
+-}
+-
+ static void
+ TestEBCDIC_STATEFUL() {
+     /* test input */
+-- 
+2.33.0
+

delete-taboo-words.patch

@@ -0,0 +1,117 @@
+From c8daa564361cb7648def8bfa3ee9133c9b110230 Mon Sep 17 00:00:00 2001
+From: wuchaochao <wuchaochao4@h-partners.com>
+Date: Sat, 4 Jun 2022 18:54:52 +0800
+Subject: [PATCH] delete-taboo-words.patch
+
+---
+ source/data/in/icudt72l.dat           | Bin 31251968 -> 31251968 bytes
+ source/test/testdata/metaZones.txt    |  10 +++++-----
+ source/test/testdata/structLocale.txt |   2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/source/data/in/icudt72l.dat b/source/data/in/icudt72l.dat
+index 61e0723997887ace8ff8736c187f4fb6cea805d6..419ff67973cfa83171429ebc17d1954664167ac4 100644
+GIT binary patch
+delta 1589
+zcmYk*Rag~h7)9advr)koyRfmly9)!m<)C1I-GRDP#9y&nu{*E}JtlhW?&<Dvm}H!A
+z-+8g$%YC<El2QU<G>kN)B^~L>Kt?j*M`p5+6@LQAMs{+LlU(E`4|xeBANeUjK?+fr
+zA{3<<#VJ7$B`HN|%21YalqZ-9RHPD>sX|q%QJospq!zWQLtW}op9VCf5shg=Q<~A7
+z7PO=lt!YDB+R>g4bfgm@bfybk=|(8s=|N9=(VIT>r62tnz(58um?4DWA)KKMBZ5eV
+zGlG$fB8q56GlsE@V>}a>$Rs8+g{e$qIy0EbEMl0=9OeS^n9l-YSx6j<a4cpC@hoK-
+z%UQunR<W8jtYsbR*}z6Nv6%$6u$66WX9qjk#cuYnmwoK#00%k5VG=pQQI2t(6P)A}
+zr#Zt}&XL4<F5u-Nm$=Lou5yiJu5$w)H@U@a?r@iT+~)xgdBkI$@RVmf=LIi$#cMv`
+zLq6hTKH*b7<8!{?OTOZ3zTsQG<9mMKM}FdG-tY@4{K{|q&L8~AU!?LkZ~2FR`7hR-
+znM-3Xt+{mO(woa*E~B|j=KRcMHkZX*R&)O50?cJIm)%?rb2-iBGMC$29&>rk1)9re
+zF2A_~<_elCWUjEeBIb&kD`u{^xf14r%#}1(%3Nu4Wz3Z|SI%5{OA59(9>0(%PjpyB
+zWK?*3swddqQ9)D`l|*GxMN}2lM0HU^)D*QuZBa+m74<}Y(Lgj5jYMP7L^Ku6M03$X
+zv=psGYtcru741ZO(Lr<+okWP}EV_uUqMHa6-9-=4Q}hzOMIX^u^b`HX05MPu5`)DM
+z5hgq$TnrV%M1+VG!^H?OQj8K&B3g_VW5if7PK*~5#6&SkOcqnbR549V7c<06F-ydV
+z*<y~ED-iR<e6c{piiILhED}yE7E46DSSpr@<zj_cDOQQqVvSfU)`|6EgV-oGiOnKG
+zY!O?<HnCmo5Ie;#v0LmBd&NGnUmOqz#UXK6B#I;As5mB$ixc9cI3-StGvcf`Cz8Z@
+zaY1;+MR7@77FWboaZMzP>*9uaQ$0QldM}d%|KukY7oX_!**k8ETjI93BkqcO;=Xtw
+m9*RfiP4qps(6{eJr?+_j<fr19crIRum*SOq{gYo?O5pz{MCmmE
+
+delta 1589
+zcmYk*Rag~h7)9advr)koyRfmlyRZX0k)whEb_eQG5r4&Q#qPi^^qA<eyQjOyVUlse
+zedon~FZbPwNlFQb(J<1GmUN^i0~yJLADPKQR{RMd8`;T0PI8f(Jme*ieB`G91t~;f
+zicpkd6sH71l%y1;DMMMxQJ!EbP?1VhrV3T5Ms;dXlUmfK4t1$VeHze^Ml_}gO=(7R
+zTF{bKw5AOqw51*G=|D$1(U~rEr5mAirw2XhMQ{4hmwxnT00S9B7=sDN!w`ltj0hqb
+z&Im>_iYTHP%^1cqj`2)jB9oZR6s9tb>C9jzvxs3fbC?UvV?GOrWg&4a!m*eo#IuxT
+zEN2BPS;cDBu$FbKX9FAA#AXuM!dAAiogM6C7rWWRUiPt{103WKhe_lJM>)oEPH>V_
+zoaPK?IY$!bxqz38T;eiUxXLw>xy}uI+~gLwxx-!Vai0e~<Pnc~!c(5{oEN<06|eb#
+z5BZ3X`GimTjL-RkFZqhE`G#-#j_>(_ANh%&dBZQH@GHOZJAd#ef04@HyyYMM<-b^S
+zW-g7nwC2*8OK&cNxs2vAne#K3*<2QLS<U&I3ow_>Ty}Fg%;hwf%Uo`AdCcWC7icb@
+zx%}n|m@8<mkh#L<ikK^Eu9&&v=1Q0gGFQ@EDRZUGl`&V=Tsd>)Eh*UEc>F@5JkjA1
+zkx^mssh(haM+H$)R1%d%6;V}G6V*ixQB%|swM89KSJV^rMFY`LG!l(P6VX&O6U{{n
+z(NeS$twkFVBHD^}qP^%KI*LxBv*;qaif$rQbQe8DPti;C7JWot(NFXj1H?cvNQ8;O
+zB3yXH5HVB?6A>a(3>PEBNHI!8iD)rej1gnSI5A#K5EI2DF<DFzQ^hnfUCa<O#Vipc
+zW{Wvuu0YHa^Th%YD;A14u}C<vSS%6oVyRdrmWvf)rC23ai#1}cSSQwt4Pv9%BsPl#
+zu|;eZ+r)OUL+lj0#BQ-i>=paOesMq?6o<rNktmLcqvDu2E>4J(;*>Zo&WN+(oJbPq
+z#RcIN7sVxUSzHlU#Wj&Eu8SMyP4)OJ=)Fu5{F9$pTzsO>XYaTvZi(CCj<_rCiTmP#
+ncqks3H_`XlLf^g@o!;X8lb?!b;<<PsUW!-d^-q3nDS`h3`u*t_
+
+diff --git a/source/test/testdata/metaZones.txt b/source/test/testdata/metaZones.txt
+index 0b57cab..8c15451 100644
+--- a/source/test/testdata/metaZones.txt
++++ b/source/test/testdata/metaZones.txt
+@@ -403,7 +403,7 @@ metaZones:table(nofallback){
+         Indian_Ocean{
+             001{"Indian/Chagos"}
+         }
+-        Indochina{
++        Ondochine{
+             001{"Asia/Saigon"}
+             KH{"Asia/Phnom_Penh"}
+             LA{"Asia/Vientiane"}
+@@ -2684,7 +2684,7 @@ metaZones:table(nofallback){
+         }
+         "Asia:Bangkok"{
+             {
+-                "Indochina",
++                "Ondochine",
+             }
+         }
+         "Asia:Beirut"{
+@@ -3047,7 +3047,7 @@ metaZones:table(nofallback){
+         }
+         "Asia:Phnom_Penh"{
+             {
+-                "Indochina",
++                "Ondochine",
+             }
+         }
+         "Asia:Pontianak"{
+@@ -3108,7 +3108,7 @@ metaZones:table(nofallback){
+         }
+         "Asia:Saigon"{
+             {
+-                "Indochina",
++                "Ondochine",
+             }
+         }
+         "Asia:Sakhalin"{
+@@ -3240,7 +3240,7 @@ metaZones:table(nofallback){
+         }
+         "Asia:Vientiane"{
+             {
+-                "Indochina",
++                "Ondochine",
+             }
+         }
+         "Asia:Vladivostok"{
+diff --git a/source/test/testdata/structLocale.txt b/source/test/testdata/structLocale.txt
+index 52b0aae..9938a5b 100644
+--- a/source/test/testdata/structLocale.txt
++++ b/source/test/testdata/structLocale.txt
+@@ -51819,7 +51819,7 @@ structLocale:table(nofallback){
+             ss{""}
+             //ec{""} // Metazones have no exemplar city
+         }
+-        "meta:Indochina"{
++        "meta:Ondochine"{
+             ld{""}
+             lg{""}
+             ls{""}
+-- 
+2.33.0
+

icu-Add-sw64-architecture.patch

@@ -0,0 +1,26 @@
+From ff578091c9a4caf0fa8ae777959eaa79587ae00b Mon Sep 17 00:00:00 2001
+From: yangchenguang <yangchenguang@kylinsec.com.cn>
+Date: Sun, 4 Feb 2024 10:48:30 +0800
+Subject: [PATCH] Add sw_64 support
+
+Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
+---
+ source/i18n/double-conversion-utils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h
+index 303668f..786b0f8 100644
+--- a/source/i18n/double-conversion-utils.h
++++ b/source/i18n/double-conversion-utils.h
+@@ -154,7 +154,7 @@ int main(int argc, char** argv) {
+     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
+     defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
+     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+-    defined(__SH4__) || defined(__alpha__) || \
++    defined(__SH4__) || defined(__alpha__) || defined(__sw_64__) || \
+     defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\
+     defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
+     defined(__riscv) || defined(__e2k__) || \
+-- 
+2.39.1
+

icu.spec

@@ -1,17 +1,22 @@
 Name:      icu
-Version:   69.1
-Release:   2
+Version:   72.1
+Release:   7
 Summary:   International Components for Unicode
 License:   MIT and UCD and Public Domain
 URL:       http://site.icu-project.org/
-Source0:   https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz
+Source0:   https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.tgz
 Source1:   icu-config.sh
 
-BuildRequires: gcc gcc-c++ doxygen autoconf python3
+BuildRequires: gcc gcc-c++ doxygen autoconf python3 git
 Requires:      lib%{name} = %{version}-%{release}
 
 Patch1:    gennorm2-man.patch
 Patch2:    icuinfo-man.patch
+Patch3:    backport-remove-TestJitterbug6175.patch
+
+Patch1000: icu-Add-sw64-architecture.patch
+
+Patch9000: delete-taboo-words.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -35,7 +40,7 @@ header files for libicu
 # " this line just fixes syntax highlighting for vim that is confused by the above and continues literal
 
 %prep
-%autosetup -n %{name} -p1
+%autosetup -n %{name} -p1 -S git
 
 %build
 pushd source
@@ -96,6 +101,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
 %{_bindir}/makeconv
 %{_bindir}/pkgdata
 %{_bindir}/uconv
+%{_bindir}/icuexportdata
 %{_sbindir}/*
 
 %files -n libicu
@@ -105,7 +111,6 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
 
 %files -n libicu-devel
 %defattr(-,root,root)
-%doc source/samples/
 %{_bindir}/%{name}-config*
 %{_bindir}/icuinfo
 %{_includedir}/unicode
@@ -125,12 +130,36 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
 
 
 %changelog
+* Sun Feb 04 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 72.1-7
+- icu already supports loongarch64 architecture
+- Remove loongarch64 patch and modify sw_64 support patch to use all arch
+
+* Tue Jun 13 2023 zhangpan<zhangpan103@h-partners.com> - 72.1-6
+- delete taboo words
+
+* Thu Dec 15 2022 zhouwenpei<zhouwenpei1@h-partners.com> - 72.1-5
+- delete redundant files
+
+* Mon Nov 21 2022 zhouwenpei<zhouwenpei1@h-partners.com> - 72.1-4
+- Optimize the patch for add loongarch64 architecture
+
+* Mon Nov 21 2022 wuzx <wuzx1226@qq.com> - 72.1-3
+- Add sw64 architecture
+
+* Fri Nov 18 2022 huajingyun <huajingyun@loongson.cn> - 72.1-2
+- add loongarch64 support
+
+* Tue Nov 15 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 72.1-1
+- update to icu4c-72.1
+
+* Thu Jun 25 2020 hanhui <hanhui15@h-partners.com> - 69.1-3
+- fix build failed
+
 * Thu Jul 16 2020 hanhui <hanhui15@h-partners.com> - 69.1-2
 - delete libicu*.so.67*
 
-* Mon Nov 29 2021 xingxing <xingxing9@huawei.com> - 69.1-1
+* Sun Nov 07 2021 sdlzx <hdu_sdlzx@163.com> - 69.1
 - update to icu4c-69.1
-- replate libicu*.so.62*whith libicu*.so.67*
 
 * Wed Oct 21 2020 jinzhimin<jinzhimin2@huawei.com> - 67.1-2
 - modify buildrequire to python3