configure.ac | 4 +--
download.lst | 8 +++----
external/icu/README | 2 -
external/icu/UnpackedTarball_icu.mk | 1
external/icu/icu4c-khmerbreakengine.patch.1 | 23 ++++++++++----------
external/icu/ubsan.patch.1 | 31 ----------------------------
6 files changed, 19 insertions(+), 50 deletions(-)
New commits:
commit f8fbfd9b6504fbbe6cd1de839a08848466e196e5
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jun 26 01:57:09 2023 +0900
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Jun 27 21:38:11 2023 +0200
Update ICU to 73.2
Remove external/icu/ubsan.patch.1 that was applied upstream.
See https://icu.unicode.org/download/73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153574
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit 05c6cdb144d1732ca51d463845fa6ddef7c08265)
Conflicts:
configure.ac
Change-Id: Ic2bc450b093f1c0ddb09ebe915a9c3e70d7e0964
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153640
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 7625ad603eee..014cef7845c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10746,8 +10746,8 @@ fi
dnl ===================================================================
dnl Check for system icu
dnl ===================================================================
-ICU_MAJOR=72
-ICU_MINOR=1
+ICU_MAJOR=73
+ICU_MINOR=2
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
diff --git a/download.lst b/download.lst
index b89efb00a776..8d9f83b8db7a 100644
--- a/download.lst
+++ b/download.lst
@@ -242,10 +242,10 @@ HYPHEN_TARBALL :=
5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-ICU_SHA256SUM :=
a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
-ICU_TARBALL := icu4c-72_1-src.tgz
-ICU_DATA_SHA256SUM :=
ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea
-ICU_DATA_TARBALL := icu4c-72_1-data.zip
+ICU_SHA256SUM :=
818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
+ICU_TARBALL := icu4c-73_2-src.tgz
+ICU_DATA_SHA256SUM :=
ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701
+ICU_DATA_TARBALL := icu4c-73_2-data.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/icu/README b/external/icu/README
index 484de1f41536..23cf5f0524ae 100644
--- a/external/icu/README
+++ b/external/icu/README
@@ -1 +1 @@
-Library providing Unicode support, from [http://site.icu-project.org/].
+Library providing Unicode support, from [https://icu.unicode.org/].
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index b5b072b1e1e6..655614447d53 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-clang-cl.patch.1 \
external/icu/gcc9.patch \
external/icu/c++20-comparison.patch.1 \
- external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
external/icu/icu4c-emscripten-cross.patch.1 \
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1
b/external/icu/icu4c-khmerbreakengine.patch.1
index ea8f20f443ff..605914014e96 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -1,6 +1,6 @@
diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
---- icu.org/source/common/dictbe.cpp 2022-04-08 00:41:55.000000000 +0200
-+++ icu/source/common/dictbe.cpp 2022-05-16 13:56:43.426870900 +0200
+--- icu.org/source/common/dictbe.cpp 2023-06-14 06:23:55.000000000 +0900
++++ icu/source/common/dictbe.cpp 2023-06-26 17:43:53.034173100 +0900
@@ -35,7 +35,19 @@
******************************************************************
*/
@@ -211,8 +211,8 @@ diff -ur icu.org/source/common/dictbe.cpp
icu/source/common/dictbe.cpp
int32_t start = (int32_t)utext_getNativeIndex(text);
if (start != offset) {
offset = start;
-- count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths),
cuLengths, cpLengths, NULL, &prefix);
-+ count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths),
cuLengths, cpLengths, NULL, &prefix, ignoreSet, minLength);
+- count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths),
cuLengths, cpLengths, nullptr, &prefix);
++ count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths),
cuLengths, cpLengths, nullptr, &prefix, ignoreSet, minLength);
// Dictionary leaves text after longest prefix, not longest word.
Back up.
if (count <= 0) {
utext_setNativeIndex(text, start);
@@ -748,8 +748,8 @@ diff -ur icu.org/source/common/dictbe.h
icu/source/common/dictbe.h
public:
diff -ur icu.org/source/common/dictionarydata.cpp
icu/source/common/dictionarydata.cpp
---- icu.org/source/common/dictionarydata.cpp 2022-04-08 00:41:55.000000000
+0200
-+++ icu/source/common/dictionarydata.cpp 2022-05-16 13:49:33.821459892
+0200
+--- icu.org/source/common/dictionarydata.cpp 2023-06-14 06:23:55.000000000
+0900
++++ icu/source/common/dictionarydata.cpp 2023-06-26 02:18:05.709454400
+0900
@@ -44,7 +44,7 @@
int32_t UCharsDictionaryMatcher::matches(UText *text, int32_t maxLength,
int32_t limit,
@@ -771,7 +771,7 @@ diff -ur icu.org/source/common/dictionarydata.cpp
icu/source/common/dictionaryda
+ continue;
+ }
if (wordCount < limit) {
- if (values != NULL) {
+ if (values != nullptr) {
values[wordCount] = uct.getValue();
@@ -112,7 +118,7 @@
@@ -794,11 +794,12 @@ diff -ur icu.org/source/common/dictionarydata.cpp
icu/source/common/dictionaryda
+ continue;
+ }
if (wordCount < limit) {
- if (values != NULL) {
+ if (values != nullptr) {
values[wordCount] = bt.getValue();
+
diff -ur icu.org/source/common/dictionarydata.h
icu/source/common/dictionarydata.h
---- icu.org/source/common/dictionarydata.h 2022-04-08 00:41:55.000000000
+0200
-+++ icu/source/common/dictionarydata.h 2022-05-16 13:49:33.822459891 +0200
+--- icu.org/source/common/dictionarydata.h 2023-06-14 06:23:55.000000000
+0900
++++ icu/source/common/dictionarydata.h 2023-06-26 17:43:53.097724900 +0900
@@ -21,6 +21,7 @@
#include "unicode/utext.h"
#include "unicode/udata.h"
@@ -824,7 +825,7 @@ diff -ur icu.org/source/common/dictionarydata.h
icu/source/common/dictionarydata
+ int32_t *prefix, UnicodeSet const* ignoreSet =
NULL, int32_t minLength = 0) const override;
virtual int32_t getType() const override;
private:
- const UChar *characters;
+ const char16_t *characters;
@@ -125,7 +126,7 @@
virtual ~BytesDictionaryMatcher();
virtual int32_t matches(UText *text, int32_t maxLength, int32_t limit,
diff --git a/external/icu/ubsan.patch.1 b/external/icu/ubsan.patch.1
deleted file mode 100644
index 1c10f8cefcc2..000000000000
--- a/external/icu/ubsan.patch.1
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur icu.org/source/tools/genrb/rbutil.c icu/source/tools/genrb/rbutil.c
---- icu.org/source/tools/genrb/rbutil.c 2020-10-28 22:21:12.000000000
+0100
-+++ icu/source/tools/genrb/rbutil.c 2020-11-16 19:50:44.005119253 +0100
-@@ -30,7 +30,12 @@
- get_dirname(char *dirname,
- const char *filename)
- {
-- const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1;
-+ const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR);
-+ if(lastSlash == NULL) {
-+ lastSlash = filename;
-+ } else {
-+ ++lastSlash;
-+ }
-
- if(lastSlash>filename) {
- uprv_strncpy(dirname, filename, (lastSlash - filename));
-@@ -46,7 +51,12 @@
- const char *filename)
- {
- /* strip off any leading directory portions */
-- const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1;
-+ const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR);
-+ if(lastSlash == NULL) {
-+ lastSlash = filename;
-+ } else {
-+ ++lastSlash;
-+ }
- char *lastDot;
-
- if(lastSlash>filename) {
