summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
Diffstat (limited to 'external')
-rw-r--r--external/icu/README2
-rw-r--r--external/icu/UnpackedTarball_icu.mk1
-rw-r--r--external/icu/icu4c-khmerbreakengine.patch.123
-rw-r--r--external/icu/ubsan.patch.131
4 files changed, 13 insertions, 44 deletions
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) {
generated by cgit (git 2.34.1) at 2025-01-24 14:26:28 +0000