summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2022-10-25 00:34:34 +0200
committerEike Rathke <erack@redhat.com>2022-10-25 01:39:21 +0200
commit20ebccd6b349a1d9d3e057de55933c2805ff5d1a (patch)
treeb6ee8a736db05180aca202a975d6ccf71ad28ea8 /external
parent0692cd8d199c31f761a4c7b0c16a94d3e195b2dc (diff)
Update to ICU 72.1
https://icu.unicode.org/download/72 Unicode 15 https://blog.unicode.org/2022/09/announcing-unicode-standard-version-150.html CLDR 42 https://blog.unicode.org/2022/10/unicode-cldr-v42-available.html New scripts: USCRIPT_KAWI USCRIPT_NAG_MUNDARI New Unicode blocks: UBLOCK_ARABIC_EXTENDED_C UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_H UBLOCK_CYRILLIC_EXTENDED_D UBLOCK_DEVANAGARI_EXTENDED_A UBLOCK_KAKTOVIK_NUMERALS UBLOCK_KAWI UBLOCK_NAG_MUNDARI Change-Id: I8822791e914e6700358b817a1af94b7dcd16b26d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141788 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'external')
-rw-r--r--external/icu/UnpackedTarball_icu.mk2
-rw-r--r--external/icu/c++20-comparison.patch.130
-rw-r--r--external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.237
-rw-r--r--external/icu/strict_ansi.patch15
4 files changed, 15 insertions, 69 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index ccb1a1a8b9b2..f58223d5bc5f 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -36,11 +36,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/c++20-comparison.patch.1 \
external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
- external/icu/strict_ansi.patch \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
external/icu/icu4c-emscripten-cross.patch.1 \
external/icu/icu4c-use-pkgdata-single-ccode-file-mode.patch.1 \
- external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2 \
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
diff --git a/external/icu/c++20-comparison.patch.1 b/external/icu/c++20-comparison.patch.1
index 3d2d7c042951..fa10b048ce41 100644
--- a/external/icu/c++20-comparison.patch.1
+++ b/external/icu/c++20-comparison.patch.1
@@ -1,6 +1,6 @@
diff -ur icu.org/source/i18n/unicode/rbtz.h icu/source/i18n/unicode/rbtz.h
---- icu.org/source/i18n/unicode/rbtz.h 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/i18n/unicode/rbtz.h 2021-11-15 18:56:24.364137609 +0100
+--- icu.org/source/i18n/unicode/rbtz.h 2022-10-19 02:53:21.000000000 +0200
++++ icu/source/i18n/unicode/rbtz.h 2022-10-24 22:20:10.889969185 +0200
@@ -87,6 +87,7 @@
* @stable ICU 3.8
*/
@@ -10,8 +10,8 @@ diff -ur icu.org/source/i18n/unicode/rbtz.h icu/source/i18n/unicode/rbtz.h
/**
* Adds the `TimeZoneRule` which represents time transitions.
diff -ur icu.org/source/i18n/unicode/simpletz.h icu/source/i18n/unicode/simpletz.h
---- icu.org/source/i18n/unicode/simpletz.h 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/i18n/unicode/simpletz.h 2021-11-15 19:01:41.774487719 +0100
+--- icu.org/source/i18n/unicode/simpletz.h 2022-10-19 02:53:21.000000000 +0200
++++ icu/source/i18n/unicode/simpletz.h 2022-10-24 22:20:10.890969183 +0200
@@ -112,6 +112,7 @@
* @stable ICU 2.0
*/
@@ -21,8 +21,8 @@ diff -ur icu.org/source/i18n/unicode/simpletz.h icu/source/i18n/unicode/simpletz
/**
* Constructs a SimpleTimeZone with the given raw GMT offset and time zone ID,
diff -ur icu.org/source/i18n/unicode/smpdtfmt.h icu/source/i18n/unicode/smpdtfmt.h
---- icu.org/source/i18n/unicode/smpdtfmt.h 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/i18n/unicode/smpdtfmt.h 2021-11-15 19:02:47.382353381 +0100
+--- icu.org/source/i18n/unicode/smpdtfmt.h 2022-10-19 02:53:21.000000000 +0200
++++ icu/source/i18n/unicode/smpdtfmt.h 2022-10-24 22:20:10.891969181 +0200
@@ -877,6 +877,7 @@
* @stable ICU 2.0
*/
@@ -32,8 +32,8 @@ diff -ur icu.org/source/i18n/unicode/smpdtfmt.h icu/source/i18n/unicode/smpdtfmt
using DateFormat::format;
diff -ur icu.org/source/i18n/unicode/stsearch.h icu/source/i18n/unicode/stsearch.h
---- icu.org/source/i18n/unicode/stsearch.h 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/i18n/unicode/stsearch.h 2021-11-15 19:03:27.014272230 +0100
+--- icu.org/source/i18n/unicode/stsearch.h 2022-10-19 02:53:21.000000000 +0200
++++ icu/source/i18n/unicode/stsearch.h 2022-10-24 22:20:10.892969178 +0200
@@ -298,6 +298,7 @@
* @stable ICU 2.0
*/
@@ -43,8 +43,8 @@ diff -ur icu.org/source/i18n/unicode/stsearch.h icu/source/i18n/unicode/stsearch
// public get and set methods ----------------------------------------
diff -ur icu.org/source/i18n/unicode/tzrule.h icu/source/i18n/unicode/tzrule.h
---- icu.org/source/i18n/unicode/tzrule.h 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/i18n/unicode/tzrule.h 2021-11-15 19:14:52.191331967 +0100
+--- icu.org/source/i18n/unicode/tzrule.h 2022-10-19 02:53:21.000000000 +0200
++++ icu/source/i18n/unicode/tzrule.h 2022-10-24 22:30:23.298744116 +0200
@@ -257,6 +257,7 @@
* @stable ICU 3.8
*/
@@ -52,8 +52,8 @@ diff -ur icu.org/source/i18n/unicode/tzrule.h icu/source/i18n/unicode/tzrule.h
+ bool operator!=(const InitialTimeZoneRule& that) const {return !operator==(that);}
/**
- * Gets the time when this rule takes effect in the given year.
-@@ -468,6 +469,7 @@
+ * Returns if this rule represents the same rule and offsets as another.
+@@ -454,6 +455,7 @@
* @stable ICU 3.8
*/
virtual bool operator!=(const TimeZoneRule& that) const override;
@@ -61,7 +61,7 @@ diff -ur icu.org/source/i18n/unicode/tzrule.h icu/source/i18n/unicode/tzrule.h
/**
* Gets the start date/time rule used by this rule.
-@@ -684,6 +686,7 @@
+@@ -670,6 +672,7 @@
* @stable ICU 3.8
*/
virtual bool operator!=(const TimeZoneRule& that) const override;
@@ -70,8 +70,8 @@ diff -ur icu.org/source/i18n/unicode/tzrule.h icu/source/i18n/unicode/tzrule.h
/**
* Gets the time type of the start times used by this rule. The return value
diff -ur icu.org/source/i18n/unicode/vtzone.h icu/source/i18n/unicode/vtzone.h
---- icu.org/source/i18n/unicode/vtzone.h 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/i18n/unicode/vtzone.h 2021-11-15 19:16:07.461130004 +0100
+--- icu.org/source/i18n/unicode/vtzone.h 2022-10-19 02:53:21.000000000 +0200
++++ icu/source/i18n/unicode/vtzone.h 2022-10-24 22:20:10.895969172 +0200
@@ -83,6 +83,7 @@
* @stable ICU 3.8
*/
diff --git a/external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2 b/external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2
deleted file mode 100644
index bd7fe74fb42a..000000000000
--- a/external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2
+++ /dev/null
@@ -1,37 +0,0 @@
-From 34b2f7174ba187d99dfb8704b9cf19d369accc13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@centrum.cz>
-Date: Wed, 16 Mar 2022 10:54:03 +0100
-Subject: [PATCH] do not reset useful cache to empty in populateNear()
-
----
- icu4c/source/common/rbbi_cache.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/icu4c/source/common/rbbi_cache.cpp b/icu4c/source/common/rbbi_cache.cpp
-index 26d82df781..54a77c97c6 100644
---- a/icu/source/common/rbbi_cache.cpp
-+++ b/icu/source/common/rbbi_cache.cpp
-@@ -352,7 +352,7 @@ UBool RuleBasedBreakIterator::BreakCache
- if ((position < fBoundaries[fStartBufIdx] - 15) || position > (fBoundaries[fEndBufIdx] + 15)) {
- int32_t aBoundary = 0;
- int32_t ruleStatusIndex = 0;
-- if (position > 20) {
-+ if (position > 20 && false) { // handleSafePrevious() is broken and always returns 0
- int32_t backupPos = fBI->handleSafePrevious(position);
-
- if (backupPos > 0) {
-@@ -376,7 +376,10 @@ UBool RuleBasedBreakIterator::BreakCache::populateNear(int32_t position, UErrorC
- ruleStatusIndex = fBI->fRuleStatusIndex;
- }
- }
-- reset(aBoundary, ruleStatusIndex); // Reset cache to hold aBoundary as a single starting point.
-+ // Reset cache to hold aBoundary as a single starting point.
-+ // Do not do so if what's in the cache is still more useful than an empty cache.
-+ if (!(aBoundary == 0 && position > fBoundaries[fEndBufIdx]))
-+ reset(aBoundary, ruleStatusIndex);
- }
-
- // Fill in boundaries between existing cache content and the new requested position.
---
-2.34.1
-
diff --git a/external/icu/strict_ansi.patch b/external/icu/strict_ansi.patch
deleted file mode 100644
index 972f0e65b1f1..000000000000
--- a/external/icu/strict_ansi.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- source/io/ufile.cpp
-+++ source/io/ufile.cpp
-@@ -21,12 +21,6 @@
- */
-
- #include "unicode/platform.h"
--#if defined(__GNUC__) && !defined(__clang__) && defined(__STRICT_ANSI__)
--// g++, fileno isn't defined if __STRICT_ANSI__ is defined.
--// clang fails to compile the <string> header unless __STRICT_ANSI__ is defined.
--// __GNUC__ is set by both gcc and clang.
--#undef __STRICT_ANSI__
--#endif
-
- #include "locmap.h"
- #include "unicode/ustdio.h"