- Update to release 73.2

OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=168

icu-UCHAR-uint16t.patch

@@ -1,117 +0,0 @@
-From 4fd9d6ce9a951e66e727b296138f22cd05479de1 Mon Sep 17 00:00:00 2001
-From: Fredrik Roubert <roubert@google.com>
-Date: Tue, 18 Apr 2023 23:39:28 +0200
-Subject: [PATCH] ICU-22356 Use ConstChar16Ptr to safely cast from UChar* to
- char16_t*.
-
-This is necessary for this header file to be usable by clients that
-define UCHAR_TYPE as a type not compatible with char16_t, eg. uint16_t.
----
- icu4c/source/common/unicode/ures.h                   | 9 +++++----
- icu4c/source/test/intltest/Makefile.in               | 2 +-
- icu4c/source/test/intltest/intltest.vcxproj          | 1 +
- icu4c/source/test/intltest/intltest.vcxproj.filters  | 3 +++
- icu4c/source/test/intltest/uchar_type_build_test.cpp | 7 +++++++
- 5 files changed, 17 insertions(+), 5 deletions(-)
- create mode 100644 icu4c/source/test/intltest/uchar_type_build_test.cpp
-
-diff --git a/icu4c/source/common/unicode/ures.h b/icu4c/source/common/unicode/ures.h
-index cc25b6e49cd..babc01d426a 100644
---- icu4c/source/common/unicode/ures.h
-+++ icu4c/source/common/unicode/ures.h
-@@ -25,6 +25,7 @@
- #ifndef URES_H
- #define URES_H
- 
-+#include "unicode/char16ptr.h"
- #include "unicode/utypes.h"
- #include "unicode/uloc.h"
- 
-@@ -812,7 +813,7 @@ inline UnicodeString
- ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t *r = ures_getString(resB, &len, status);
-+    const char16_t *r = ConstChar16Ptr(ures_getString(resB, &len, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
-@@ -837,7 +838,7 @@ inline UnicodeString
- ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t* r = ures_getNextString(resB, &len, key, status);
-+    const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, &len, key, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
-@@ -859,7 +860,7 @@ inline UnicodeString
- ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status);
-+    const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, &len, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
-@@ -882,7 +883,7 @@ inline UnicodeString
- ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) {
-     UnicodeString result;
-     int32_t len = 0;
--    const char16_t* r = ures_getStringByKey(resB, key, &len, status);
-+    const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, &len, status));
-     if(U_SUCCESS(*status)) {
-         result.setTo(true, r, len);
-     } else {
-diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in
-index 8007d3c1880..f57f8d995f4 100644
---- icu4c/source/test/intltest/Makefile.in
-+++ icu4c/source/test/intltest/Makefile.in
-@@ -70,7 +70,7 @@ numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \
- static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o \
- formattedvaluetest.o formatted_string_builder_test.o numbertest_permutation.o \
- units_data_test.o units_router_test.o units_test.o displayoptions_test.o \
--numbertest_simple.o
-+numbertest_simple.o uchar_type_build_test.o
- 
- DEPS = $(OBJECTS:.o=.d)
- 
-diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
-index 0985ba1e808..71ce1254038 100644
---- icu4c/source/test/intltest/intltest.vcxproj
-+++ icu4c/source/test/intltest/intltest.vcxproj
-@@ -291,6 +291,7 @@
-     <ClCompile Include="units_data_test.cpp" />
-     <ClCompile Include="units_router_test.cpp" />
-     <ClCompile Include="units_test.cpp" />
-+    <ClCompile Include="uchar_type_build_test.cpp" />
-   </ItemGroup>
-   <ItemGroup>
-     <ClInclude Include="colldata.h" />
-diff --git a/icu4c/source/test/intltest/intltest.vcxproj.filters b/icu4c/source/test/intltest/intltest.vcxproj.filters
-index ffe9bc1467d..5d8777c5aaf 100644
---- icu4c/source/test/intltest/intltest.vcxproj.filters
-+++ icu4c/source/test/intltest/intltest.vcxproj.filters
-@@ -568,6 +568,9 @@
-     <ClCompile Include="units_test.cpp">
-       <Filter>formatting</Filter>
-     </ClCompile>
-+    <ClCompile Include="uchar_type_build_test.cpp">
-+      <Filter>configuration</Filter>
-+    </ClCompile>
-   </ItemGroup>
-   <ItemGroup>
-     <ClInclude Include="itrbbi.h">
-diff --git a/icu4c/source/test/intltest/uchar_type_build_test.cpp b/icu4c/source/test/intltest/uchar_type_build_test.cpp
-new file mode 100644
-index 00000000000..ca9335441a3
---- /dev/null
-+++ icu4c/source/test/intltest/uchar_type_build_test.cpp
-@@ -0,0 +1,7 @@
-+// © 2023 and later: Unicode, Inc. and others.
-+// License & terms of use: http://www.unicode.org/copyright.html#License
-+
-+// ICU-22356 Test that client code can be built with UCHAR_TYPE redefined.
-+#undef UCHAR_TYPE
-+#define UCHAR_TYPE uint16_t
-+#include "unicode/ures.h"

icu.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jun 14 00:08:48 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 73.2
+  * CLDR extends the support for “short” Chinese sort orders to
+    cover some additional, required characters for Level 2. This
+    is carried over into ICU collation.
+  * ICU has a modified character conversion table, mapping some
+    GB18030 characters to Unicode characters that were encoded
+    after GB18030-2005.
+- Delete icu-UCHAR-uint16t.patch (merged)
+
 -------------------------------------------------------------------
 Thu May 25 12:52:50 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
 

icu.spec

@@ -26,16 +26,16 @@
 %endif
 # icu-versioning.diff needs update for new Version too
 Name:           icu
-Version:        73.1
+Version:        73.2
 Release:        0
 Summary:        International Components for Unicode
 License:        ICU
 Group:          Development/Libraries/C and C++
 URL:            https://icu.unicode.org/
-Source:         https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
+Source:         https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-src.tgz
-Source2:        https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz.asc
+Source2:        https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-src.tgz.asc
-Source3:        https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-docs.zip
+Source3:        https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-docs.zip
-Source4:        https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-docs.zip.asc
+Source4:        https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-docs.zip.asc
 Source5:        %name.keyring
 Source100:      baselibs.conf
 Patch4:         icu-fix-install-mode-files.diff
@@ -43,7 +43,6 @@ Patch6:         icu-error-reporting.diff
 Patch7:         icu-avoid-x87-excess-precision.diff
 Patch8:         locale.diff
 Patch9:         nan-undefined-conversion.patch
-Patch10:        icu-UCHAR-uint16t.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config

icu4c-73_1-docs.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:296dbf8113f4269ec0e057c3c2148e758137dad92672706996e100d01f628617
-size 8516388

icu4c-73_1-docs.zip.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE/6kSmhgNdlt6W+ocm0MrJ9G6INcFAmQ4ep8ACgkQm0MrJ9G6
-INdLDA//ZkZffBOHFjJNK+fOM6XxUNF4O/NIUGuvU286qmx06NkPS50CPEs8PN4l
-ug0xYraTBOzbv/ZBWiMnMKPhr3Rc6qgLlXt0XUBKiKQj6AAp2AXB0XDrB2/Ehsy8
-R6bEDZJeslLT/GXEWee3NjN+vqqeFbTo/YA5Igxn8c4CQk+164m4wX0Q46zt6uSA
-kIvvYhz2H46rv5Lu6CVRlZzPU9ViYiq14vooKcwkxgt0IRffi8onMOktuSayPmqd
-89HuCNpT6GFQYZvMcHaYDty//PIEjjoGK4/nGNbUytupQvG9D1OeVnxQ0bgI3jPm
-DD2Rt2WPV9c6S31fIkfZwbQ8j3dtZ0CR4SKOd1GeGNYxLSuNHFeL+8ywNu2NsdtZ
-KPOq6jJjZnERNFZ1XbHe6cq5V0Hrpr/JsN8QaQKgO7nkwKHfC4epoIR+p54WNUAz
-mJmC7Hc5I4I2NEwhG3VfR8Xqb8M7J/psLj6E0tC1xGiGx8p+pEZKdZnCKkVIva7f
-jbWxYKLiBPKq8Uf6RJNmuMnitx4uyzcPjk91T0PdHnKzJtqEAb/MfzPbWGd1GynI
-hzt5yp6gWpsdclU7CGy7pTYjdASwOJ4ANkkzGEE/Wg4b6G+SWECposcUQmWPIVvh
-I9qTQ9REGnEYBVI5uIEd2c0a77/eJuRGWWZzTMc7Tq7BLowUya0=
-=sDiT
------END PGP SIGNATURE-----

icu4c-73_1-src.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45
-size 26512935

icu4c-73_1-src.tgz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE/6kSmhgNdlt6W+ocm0MrJ9G6INcFAmQ4ep8ACgkQm0MrJ9G6
-INcv0g/8CZon+MBUh17EBKOSmKkmFD0m7JmIbWXA0fnIqNBCQIDgzmc6E6csspS+
-cSq4tExQZ/tINlgYPZfwuDlRMQhTTLVrUQ5jTiKvroe8rXFOowNjjstLQR4ItMnb
-5gfcPS+ZRjvdhvecMK0WALX4LCIZOyDkNwCQW6aOxHnhu85nmr3xA3CDS6pXXzSo
-xDjWV7TgWOjT3SVX+tPuUxAb7qW9t0xTQ0i7wlP4ikp03CboghYwWBMGwI9ChcW/
-MK8xUXSf76Z6+ZdfEG7rZjkFnWU3ixz9HZfh96XrcilZPqGBvb31F3PEloHzZqF6
-8TM2bXLs4gRWa/3tZQzjbqkpptLGh5Hdxudy4Fb02DQn80hrsMc5zbxzPqtjrA2U
-e40dx2BDglu7jNzdPQlkawWmiLIEP5DEDWXiGiVeDCzPNnFz4DSH4qjfC0naO1Xd
-DfTbvIR6KAsPh6y5Ce/l0vZLn5BlXy1pPy10cslRECEpgcI4MUIJhEOIWikRmkq7
-n8DECy2Jycd114QlddojkrkBptxO0bJtomjkBfQwjGmG4we3IlzmizT4zHywnxtc
-PRMyNsP9AzIVlu8Q8M8IMPwdF+DR2oC4VQazts8ciD58G12wco5BUU/ghfMMm4Li
-OOGdS3h3Y7XfXzelY0OAY1J5kHafZ0xoQA3cCMXqPvEhZ0xnLEY=
-=gvDN
------END PGP SIGNATURE-----

icu4c-73_2-docs.zip.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEPaNTAafDMCV7h1V1QFj2dAbqpqsFAmSI4zYACgkQQFj2dAbq
+pqvNbAwA1VRn+rZ7mqeLtCIcz/3FPbjvwcxaEZQwOzPD2MkCsn7E063sWnODTHz9
+KAhTz513AQUgXr4xU+FFHD55SJq7JBu+gWjB+h6gi/ZmJCHJmZaWzkDzitARlYXP
+7QVn7GYyimdZgMCZ1enrwrjLUumqILwK8GkKdp8KudbP+h9xq3pMOzcBi8Q7zLnM
+PAt1vQFcqTcwmKCUlutyO0KUcsqBYqywVf29qP+zspKdK+sUJAIHG6n38yQb4Vif
+/UoECKj3isI/8pOXUuAT9SLkBv9E0u4ATGoCLHczMA+MBvxCjnXXXWhSqz23L5cu
+8XKBT/UJzxtWjqEmIv5irENkxHwnxzUApdrqTy9ftZ2ljWVVxbf06aaMabttzd2Q
+GmtHHMUzTDz68ca20s+mCflJTAQxvwTEdlx3tAxzn7LQumd3cQyHyzSeKUv8RDTS
+MNZZTybLw24aIqfgTtQANNkK0Ne/mf7QlOjiPaRmcx4id55ubbCLd06nbLZ4l6K3
+5tja3wWM
+=wUBf
+-----END PGP SIGNATURE-----

icu4c-73_2-src.tgz.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEPaNTAafDMCV7h1V1QFj2dAbqpqsFAmSI4zsACgkQQFj2dAbq
+pqsKGwwAxpfoDLHqOZu6yRiEJhj5wZAA155ejz0Al3q5JlS8fCaMs/93OyGSwntJ
+GG0BdntqfrXdQPXk1I4XW0fevVTIC7yUXA0SOnBL42s3KrteDWCNd/bfInIgpAq8
+JjphOVYWxt5vG2dzSTs66dHEU4cBUHtzpb4xrcC8K4zKR+dOkxr0abrpSJOISZrP
+56PJduW4Tk+SFklFrn2WkP3IIu9d92ajjJnj2bbRDsHvaW+AN7zWG0tzIKs+zkwM
+GmvtDzyMSPDeKy1MDF6Pa6wStGuQpznsS9UyADjW00ozpzB7mhdDcWUSPfeItyaL
+uDofHfEjk6jP4jfDXyvo0gHPPvtJQ9RQPb/+3ZlMqEGv/UVxfOyhrJdYhBmZ4a8a
+A8g59sWB8O/bN23rwlJGvPmpqHHuB0H+spmrXhg77WkMdUFn9FthAmndlsVnuRK3
+rWPNuQTvXLLK8UlNvcy0qU3IXE865XsH99S4zLJy9k3rHjrU0zvF8dRMVotLX0aS
+PLV6lKmB
+=LkuT
+-----END PGP SIGNATURE-----