diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-16 23:21:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-16 23:21:19 +0000 |
commit | e5a4f2edfd4df595b47990d5228aba0c4dc038bd (patch) | |
tree | 80259a729122ee1f04a33a2f960c6b993156a528 /Build/source/libs/icu/TLpatches | |
parent | 5176866c6a12a2d1d36fe4fd7892573dd0de81c6 (diff) |
icu 70.1
git-svn-id: svn://tug.org/texlive/trunk@61625 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/TLpatches')
-rw-r--r-- | Build/source/libs/icu/TLpatches/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/TL-Changes | 6 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-01-configure-gcc | 12 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-02-configure-solaris | 6 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-10-ES | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-12-mingw | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX | 8 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-14-xopen | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-19-netbsd | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-20-private | 8 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-22-max_align_t | 51 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-24-simulator | 13 |
12 files changed, 36 insertions, 91 deletions
diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog index 65f6ed5f9b7..a575ccb1f6b 100644 --- a/Build/source/libs/icu/TLpatches/ChangeLog +++ b/Build/source/libs/icu/TLpatches/ChangeLog @@ -1,3 +1,10 @@ +2022-01-16 Karl Berry <karl@freefriends.org> + + * Update for icu-70.1. + * patch-24-simulator: remove, applied upstream. + * patch-22-max_align_t: remove, not needed since we have to use a + newer compiler anyway. + 2021-03-01 Mojca Miklavec <mojca.miklavec.lists@gmail.com> * patch-24-simulator: new patch. diff --git a/Build/source/libs/icu/TLpatches/TL-Changes b/Build/source/libs/icu/TLpatches/TL-Changes index adf53a6443b..e826e9d7a76 100644 --- a/Build/source/libs/icu/TLpatches/TL-Changes +++ b/Build/source/libs/icu/TLpatches/TL-Changes @@ -1,6 +1,8 @@ Changes applied to the icu tree as obtained from: - https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz + github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz + github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz and icu4c-68_2-data.zip + icu4c-70_1-data.zip cd $Build/source/libs/icu # for whatever $Build directory # update version.ac @@ -41,7 +43,7 @@ cp -p $aux/config.guess $aux/config.sub $aux/install-sh source # Assuming all seems ok, reduce size of source/data/in/icudt*.dat # to decrease data segment size, e.g., for old BSD. First, check # that we successfully built the full .dat: -ver=68 +ver=70 srcdat=$Build/source/libs/icu/icu-src/source/data/in/icudt${ver}l.dat cd $Work/libs/icu/icu-build/data/out/build/icudt${ver}l indat=../../tmp/icudt${ver}l.dat diff --git a/Build/source/libs/icu/TLpatches/patch-01-configure-gcc b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc index 8799cc7feee..b7420e6530b 100644 --- a/Build/source/libs/icu/TLpatches/patch-01-configure-gcc +++ b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc @@ -1,30 +1,30 @@ For TL, we do not want to prefer clang(++) for ICU when the whole rest of the tree prefers gcc. ---- source/configure~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/configure 2021-02-13 08:16:36.271761526 -0800 -@@ -2913,5 +2913,5 @@ +--- source/configure~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/configure 2022-01-16 14:43:05.441342307 -0800 +@@ -2925,5 +2925,5 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc + for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -@@ -2957,5 +2957,5 @@ +@@ -2969,5 +2969,5 @@ if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc + for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -3516,5 +3516,5 @@ +@@ -3528,5 +3528,5 @@ else if test -n "$ac_tool_prefix"; then - for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC + for ac_prog in g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -@@ -3560,5 +3560,5 @@ +@@ -3572,5 +3572,5 @@ if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC diff --git a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris index add9412f2df..858278325c9 100644 --- a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris +++ b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris @@ -1,8 +1,8 @@ Do not disable C++11 on Solaris, since we don't use the Sun compiler. ---- source/configure~ 2021-02-13 08:16:36.271761526 -0800 -+++ source/configure 2021-02-13 08:18:10.826136078 -0800 -@@ -6149,9 +6149,10 @@ +--- source/configure~ 2022-01-16 14:43:05.441342307 -0800 ++++ source/configure 2022-01-16 14:44:14.808693105 -0800 +@@ -6161,9 +6161,10 @@ CXXFLAGS="$OLD_CXXFLAGS" fi - case "${host}" in diff --git a/Build/source/libs/icu/TLpatches/patch-10-ES b/Build/source/libs/icu/TLpatches/patch-10-ES index eff82c545a2..9e2f2c23480 100644 --- a/Build/source/libs/icu/TLpatches/patch-10-ES +++ b/Build/source/libs/icu/TLpatches/patch-10-ES @@ -3,8 +3,8 @@ https://tug.org/pipermail/tlbuild/2020q1/004599.html https://tug.org/pipermail/tlbuild/2020q1/004599.html ---- source/common/ubidiimp.h~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/common/ubidiimp.h 2021-02-13 08:20:09.076105678 -0800 +--- source/common/ubidiimp.h~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/common/ubidiimp.h 2022-01-16 14:44:51.081353714 -0800 @@ -42,4 +42,6 @@ See UCharDirection in uchar.h . */ diff --git a/Build/source/libs/icu/TLpatches/patch-12-mingw b/Build/source/libs/icu/TLpatches/patch-12-mingw index 59b9ecb87f4..d7bb47f1b50 100644 --- a/Build/source/libs/icu/TLpatches/patch-12-mingw +++ b/Build/source/libs/icu/TLpatches/patch-12-mingw @@ -1,7 +1,7 @@ We don't want this for TeX Live cross compilation. ---- source/config/mh-mingw~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/config/mh-mingw 2021-02-13 08:20:54.167330952 -0800 +--- source/config/mh-mingw~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/config/mh-mingw 2022-01-16 14:45:28.817000693 -0800 @@ -76,25 +76,7 @@ STATIC_O = ao diff --git a/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX b/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX index 9949c1f7287..ae6e5094ba2 100644 --- a/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX +++ b/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX @@ -1,7 +1,7 @@ No `s' for STATIC_PREFIX. ---- source/config/Makefile.inc.in~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/config/Makefile.inc.in 2021-02-13 08:22:35.895582151 -0800 +--- source/config/Makefile.inc.in~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/config/Makefile.inc.in 2022-01-16 14:46:07.352640250 -0800 @@ -47,5 +47,5 @@ # Static library prefix and file extension @@ -9,8 +9,8 @@ +STATIC_PREFIX = LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) A = a ---- source/icudefs.mk.in~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/icudefs.mk.in 2021-02-13 08:22:35.895582151 -0800 +--- source/icudefs.mk.in~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/icudefs.mk.in 2022-01-16 14:46:07.352640250 -0800 @@ -214,5 +214,5 @@ ## If we can't use the shared libraries, use the static libraries ifneq ($(ENABLE_SHARED),YES) diff --git a/Build/source/libs/icu/TLpatches/patch-14-xopen b/Build/source/libs/icu/TLpatches/patch-14-xopen index 6d510df9b60..dbcefa6dcce 100644 --- a/Build/source/libs/icu/TLpatches/patch-14-xopen +++ b/Build/source/libs/icu/TLpatches/patch-14-xopen @@ -1,8 +1,8 @@ Do not define _XOPEN_SOURCE_EXTENDED on Solaris, notwithstanding comments in icu source. ---- source/common/uposixdefs.h~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/common/uposixdefs.h 2021-02-13 08:29:38.779298547 -0800 +--- source/common/uposixdefs.h~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/common/uposixdefs.h 2022-01-16 14:46:51.036231730 -0800 @@ -52,8 +52,11 @@ * Poorly upgraded Solaris machines can't have this defined. * Cleanly installed Solaris can use this #define. diff --git a/Build/source/libs/icu/TLpatches/patch-19-netbsd b/Build/source/libs/icu/TLpatches/patch-19-netbsd index 635e6214fbb..a87c2043a24 100644 --- a/Build/source/libs/icu/TLpatches/patch-19-netbsd +++ b/Build/source/libs/icu/TLpatches/patch-19-netbsd @@ -2,8 +2,8 @@ From: Marc Baudoin <babafou@babafou.eu.org> tlbuild ---- source/common/uposixdefs.h~ 2021-02-13 08:29:38.779298547 -0800 -+++ source/common/uposixdefs.h 2021-02-13 08:30:06.076827650 -0800 +--- source/common/uposixdefs.h~ 2022-01-16 14:46:51.036231730 -0800 ++++ source/common/uposixdefs.h 2022-01-16 14:47:26.072904130 -0800 @@ -78,3 +78,7 @@ #endif diff --git a/Build/source/libs/icu/TLpatches/patch-20-private b/Build/source/libs/icu/TLpatches/patch-20-private index 8ebf2a2c091..c31db0e24b8 100644 --- a/Build/source/libs/icu/TLpatches/patch-20-private +++ b/Build/source/libs/icu/TLpatches/patch-20-private @@ -5,8 +5,8 @@ http://tug.org/pipermail/tlbuild/2016q1/003438.html (and starting at http://tug.org/pipermail/tlbuild/2016q1/003433.html) ---- source/i18n/dayperiodrules.h~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/i18n/dayperiodrules.h 2021-02-13 08:30:53.116015999 -0800 +--- source/i18n/dayperiodrules.h~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/i18n/dayperiodrules.h 2022-01-16 14:47:58.135604382 -0800 @@ -56,5 +56,5 @@ double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const; @@ -14,8 +14,8 @@ +/* nothing private to placate old compilers --karl/koch private: */ DayPeriodRules(); ---- source/i18n/unicode/dtitvinf.h~ 2020-12-17 11:34:38.000000000 -0800 -+++ source/i18n/unicode/dtitvinf.h 2021-02-13 08:30:53.116015999 -0800 +--- source/i18n/unicode/dtitvinf.h~ 2021-10-28 09:04:57.000000000 -0700 ++++ source/i18n/unicode/dtitvinf.h 2022-01-16 14:47:58.136604372 -0800 @@ -330,5 +330,5 @@ diff --git a/Build/source/libs/icu/TLpatches/patch-22-max_align_t b/Build/source/libs/icu/TLpatches/patch-22-max_align_t deleted file mode 100644 index e321bd35331..00000000000 --- a/Build/source/libs/icu/TLpatches/patch-22-max_align_t +++ /dev/null @@ -1,51 +0,0 @@ - As of ICU 68.2, they required max_align_t to be in the std:: - namespace, which it isn't with the CentOS 7 g++. - ---- icu/source/tools/toolutil/toolutil.cpp 2020-12-17 11:34:38.000000000 -0800 -+++ icu-src/source/tools/toolutil/toolutil.cpp 2021-02-13 09:21:20.320506318 -0800 -@@ -243,5 +243,5 @@ - int32_t capacity, maxCapacity, size, idx; - void *array; -- alignas(std::max_align_t) char staticArray[1]; -+ alignas(max_align_t) char staticArray[1]; - }; - ---- icu/source/common/utext.cpp 2020-12-17 11:34:38.000000000 -0800 -+++ icu-src/source/common/utext.cpp 2021-02-13 09:15:58.637913024 -0800 -@@ -570,5 +570,5 @@ - struct ExtendedUText { - UText ut; -- std::max_align_t extension; -+ max_align_t extension; - }; - -@@ -585,5 +585,5 @@ - int32_t spaceRequired = sizeof(UText); - if (extraSpace > 0) { -- spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(std::max_align_t); -+ spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(max_align_t); - } - ut = (UText *)uprv_malloc(spaceRequired); ---- icu/source/common/uarrsort.cpp 2020-12-17 11:34:38.000000000 -0800 -+++ icu-src/source/common/uarrsort.cpp 2021-02-13 09:14:58.120928533 -0800 -@@ -38,5 +38,5 @@ - - static constexpr int32_t sizeInMaxAlignTs(int32_t sizeInBytes) { -- return (sizeInBytes + sizeof(std::max_align_t) - 1) / sizeof(std::max_align_t); -+ return (sizeInBytes + sizeof(max_align_t) - 1) / sizeof(max_align_t); - } - -@@ -142,5 +142,5 @@ - UComparator *cmp, const void *context, UErrorCode *pErrorCode) { - -- icu::MaybeStackArray<std::max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE)> v; -+ icu::MaybeStackArray<max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE)> v; - if (sizeInMaxAlignTs(itemSize) > v.getCapacity() && - v.resize(sizeInMaxAlignTs(itemSize)) == nullptr) { -@@ -236,5 +236,5 @@ - UComparator *cmp, const void *context, UErrorCode *pErrorCode) { - /* allocate two intermediate item variables (x and w) */ -- icu::MaybeStackArray<std::max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE) * 2> xw; -+ icu::MaybeStackArray<max_align_t, sizeInMaxAlignTs(STACK_ITEM_SIZE) * 2> xw; - if(sizeInMaxAlignTs(itemSize)*2 > xw.getCapacity() && - xw.resize(sizeInMaxAlignTs(itemSize) * 2) == nullptr) { diff --git a/Build/source/libs/icu/TLpatches/patch-24-simulator b/Build/source/libs/icu/TLpatches/patch-24-simulator deleted file mode 100644 index accc7d749c3..00000000000 --- a/Build/source/libs/icu/TLpatches/patch-24-simulator +++ /dev/null @@ -1,13 +0,0 @@ -Index: putil.cpp -=================================================================== ---- putil.cpp (revision 58009) -+++ putil.cpp (working copy) -@@ -1361,7 +1361,7 @@ uprv_pathIsAbsolute(const char *path) - - /* Backup setting of ICU_DATA_DIR_PREFIX_ENV_VAR - (needed for some Darwin ICU build environments) */ --#if U_PLATFORM_IS_DARWIN_BASED && TARGET_OS_SIMULATOR -+#if U_PLATFORM_IS_DARWIN_BASED && defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR - # if !defined(ICU_DATA_DIR_PREFIX_ENV_VAR) - # define ICU_DATA_DIR_PREFIX_ENV_VAR "IPHONE_SIMULATOR_ROOT" - # endif |