summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorMojca Miklavec <mojca.miklavec@gmail.com>2022-01-26 22:13:30 +0000
committerMojca Miklavec <mojca.miklavec@gmail.com>2022-01-26 22:13:30 +0000
commit92b656a610f2b7bc4b4abfd23a41f2a49fc6896f (patch)
tree735934628040f0be4a6ee53592d3ea0bc0382121 /Build/source
parent9f17197f227405d9869844897955dd6ea9156ff8 (diff)
icu: remove obsolete patches, add links to upstream tickets
git-svn-id: svn://tug.org/texlive/trunk@61753 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/icu/TLpatches/ChangeLog13
-rw-r--r--Build/source/libs/icu/TLpatches/patch-02-configure-solaris2
-rw-r--r--Build/source/libs/icu/TLpatches/patch-10-ES14
-rw-r--r--Build/source/libs/icu/TLpatches/patch-14-xopen18
-rw-r--r--Build/source/libs/icu/TLpatches/patch-15-pow3
-rw-r--r--Build/source/libs/icu/TLpatches/patch-20-private42
-rw-r--r--Build/source/libs/icu/icu-src/source/common/ubidiimp.h2
-rw-r--r--Build/source/libs/icu/icu-src/source/common/uposixdefs.h4
-rw-r--r--Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h2
-rw-r--r--Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h9
10 files changed, 24 insertions, 85 deletions
diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog
index a575ccb1f6b..dc6a4b8f1bd 100644
--- a/Build/source/libs/icu/TLpatches/ChangeLog
+++ b/Build/source/libs/icu/TLpatches/ChangeLog
@@ -1,3 +1,16 @@
+2022-01-26 Mojca Miklavec <mojca.miklavec.lists@gmail.com>
+
+ * patch-10-ES: remove, applied upstream
+ * patch-14-xopen: remove, no longer needed
+ https://unicode-org.atlassian.net/browse/ICU-12629
+ * patch-20-private: remove, no longer relevant since
+ gcc 4.2 can no longer compile the sources anyway
+
+2022-01-19 Karl Berry <karl@freefriends.org>
+
+ * patch-15-pow: new patch
+ https://unicode-org.atlassian.net/browse/ICU-21896
+
2022-01-16 Karl Berry <karl@freefriends.org>
* Update for icu-70.1.
diff --git a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
index 858278325c9..e486a80199d 100644
--- a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
+++ b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
@@ -1,3 +1,5 @@
+ https://unicode-org.atlassian.net/browse/ICU-13543 (fixed upstream in 71.1)
+
Do not disable C++11 on Solaris, since we don't use the Sun compiler.
--- source/configure~ 2022-01-16 14:43:05.441342307 -0800
diff --git a/Build/source/libs/icu/TLpatches/patch-10-ES b/Build/source/libs/icu/TLpatches/patch-10-ES
deleted file mode 100644
index 9e2f2c23480..00000000000
--- a/Build/source/libs/icu/TLpatches/patch-10-ES
+++ /dev/null
@@ -1,14 +0,0 @@
- Otherwise fails on x86_64-solaris(10) due to (crazy?)
- system definition of registers.
- https://tug.org/pipermail/tlbuild/2020q1/004599.html
- https://tug.org/pipermail/tlbuild/2020q1/004599.html
-
---- 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 .
- */
-+#undef ES
-+#undef CS
- enum {
- L= U_LEFT_TO_RIGHT, /* 0 */
diff --git a/Build/source/libs/icu/TLpatches/patch-14-xopen b/Build/source/libs/icu/TLpatches/patch-14-xopen
deleted file mode 100644
index dbcefa6dcce..00000000000
--- a/Build/source/libs/icu/TLpatches/patch-14-xopen
+++ /dev/null
@@ -1,18 +0,0 @@
- Do not define _XOPEN_SOURCE_EXTENDED on Solaris,
- notwithstanding comments in icu source.
-
---- 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.
-+ * [Experience with TeX Live is that it always causes failure.
-+ * http://tug.org/pipermail/tlbuild/2013q1/002493.html
-+ * http://tug.org/pipermail/tlbuild/2013q1/002536.html ]
- *
- * z/OS needs this definition for timeval and to get usleep.
- */
--#if !defined(_XOPEN_SOURCE_EXTENDED) && defined(__TOS_MVS__)
-+#if !defined(_XOPEN_SOURCE_EXTENDED) && defined(__TOS_MVS__) && !defined(sun)
- # define _XOPEN_SOURCE_EXTENDED 1
- #endif
diff --git a/Build/source/libs/icu/TLpatches/patch-15-pow b/Build/source/libs/icu/TLpatches/patch-15-pow
index cb410d0e99b..6511855195d 100644
--- a/Build/source/libs/icu/TLpatches/patch-15-pow
+++ b/Build/source/libs/icu/TLpatches/patch-15-pow
@@ -1,8 +1,9 @@
+ https://unicode-org.atlassian.net/browse/ICU-21896 (fixed upstream in 71.1)
+
Else Solaris gets
libs/icu/icu-src/source/i18n/plurrule.cpp:1884:90:
error: call of overloaded 'pow(int, const int32_t&)' is ambiguous
per https://tug.org/pipermail/tlbuild/2022q1/005020.html.
- -> https://github.com/unicode-org/icu/pull/1961
--- plurrule.cpp (revision 61625)
+++ plurrule.cpp (working copy)
diff --git a/Build/source/libs/icu/TLpatches/patch-20-private b/Build/source/libs/icu/TLpatches/patch-20-private
deleted file mode 100644
index c31db0e24b8..00000000000
--- a/Build/source/libs/icu/TLpatches/patch-20-private
+++ /dev/null
@@ -1,42 +0,0 @@
- The supplied g++-4.2 compiler on 32-bit MacOSX apparently
- mishandled private enum in the implementation (since newer
- compilers are ok with it). This can be removed when we drop
- support for 32-bit MacOSX.
- http://tug.org/pipermail/tlbuild/2016q1/003438.html
- (and starting at http://tug.org/pipermail/tlbuild/2016q1/003433.html)
-
---- 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;
-
--private:
-+/* nothing private to placate old compilers --karl/koch private: */
- DayPeriodRules();
-
---- 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 @@
-
-
--private:
-+/* nothing private to placate old compilers --karl/koch private: */
- /**
- * DateIntervalFormat will need access to
-@@ -365,5 +365,6 @@
- };
- public:
--#ifndef U_HIDE_INTERNAL_API
-+/* nothing private to placate old compilers --karl/koch */
-+/* ifndef U_HIDE_INTERNAL_API */
- /**
- * Max index for stored interval patterns
-@@ -373,6 +374,6 @@
- kMaxIntervalPatternIndex = kIPI_MAX_INDEX
- };
--#endif /* U_HIDE_INTERNAL_API */
--private:
-+/* endif */ /* U_HIDE_INTERNAL_API */
-+/* nothing private to placate old compilers --karl/koch private: */
-
-
diff --git a/Build/source/libs/icu/icu-src/source/common/ubidiimp.h b/Build/source/libs/icu/icu-src/source/common/ubidiimp.h
index a319964afda..e48fc6f9416 100644
--- a/Build/source/libs/icu/icu-src/source/common/ubidiimp.h
+++ b/Build/source/libs/icu/icu-src/source/common/ubidiimp.h
@@ -41,8 +41,6 @@ typedef uint32_t Flags;
is easier with the same names for the BiDi types in the code as there.
See UCharDirection in uchar.h .
*/
-#undef ES
-#undef CS
enum {
L= U_LEFT_TO_RIGHT, /* 0 */
R= U_RIGHT_TO_LEFT, /* 1 */
diff --git a/Build/source/libs/icu/icu-src/source/common/uposixdefs.h b/Build/source/libs/icu/icu-src/source/common/uposixdefs.h
index 4a0de995762..2ac6ac48cf4 100644
--- a/Build/source/libs/icu/icu-src/source/common/uposixdefs.h
+++ b/Build/source/libs/icu/icu-src/source/common/uposixdefs.h
@@ -1,4 +1,4 @@
-// © 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others
// License & terms of use: http://www.unicode.org/copyright.html
/*
*******************************************************************************
@@ -57,7 +57,7 @@
*
* z/OS needs this definition for timeval and to get usleep.
*/
-#if !defined(_XOPEN_SOURCE_EXTENDED) && defined(__TOS_MVS__) && !defined(sun)
+#if !defined(_XOPEN_SOURCE_EXTENDED) && defined(__TOS_MVS__)
# define _XOPEN_SOURCE_EXTENDED 1
#endif
diff --git a/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h b/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h
index 730ac256c3c..4bfca762b80 100644
--- a/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h
+++ b/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h
@@ -55,7 +55,7 @@ public:
// Returns the center of dayPeriod. Half hours are indicated with a .5 .
double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const;
-/* nothing private to placate old compilers --karl/koch private: */
+private:
DayPeriodRules();
// Translates "morning1" to DAYPERIOD_MORNING1, for example.
diff --git a/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h b/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h
index d8de6a75ad5..b5afc064678 100644
--- a/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h
+++ b/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h
@@ -329,7 +329,7 @@ public:
static UClassID U_EXPORT2 getStaticClassID();
-/* nothing private to placate old compilers --karl/koch private: */
+private:
/**
* DateIntervalFormat will need access to
* getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex,
@@ -364,8 +364,7 @@ public:
kIPI_MAX_INDEX
};
public:
-/* nothing private to placate old compilers --karl/koch */
-/* ifndef U_HIDE_INTERNAL_API */
+#ifndef U_HIDE_INTERNAL_API
/**
* Max index for stored interval patterns
* @internal ICU 4.4
@@ -373,8 +372,8 @@ public:
enum {
kMaxIntervalPatternIndex = kIPI_MAX_INDEX
};
-/* endif */ /* U_HIDE_INTERNAL_API */
-/* nothing private to placate old compilers --karl/koch private: */
+#endif /* U_HIDE_INTERNAL_API */
+private:
/**