diff options
Diffstat (limited to 'Build/source/libs/icu/TLpatches')
-rw-r--r-- | Build/source/libs/icu/TLpatches/TL-Changes | 27 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-14-xopen | 10 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-16-putil | 52 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-17-cygwin-no-w32api | 3 | ||||
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-19-netbsd | 8 |
5 files changed, 34 insertions, 66 deletions
diff --git a/Build/source/libs/icu/TLpatches/TL-Changes b/Build/source/libs/icu/TLpatches/TL-Changes index 6315dca3b62..6483b62cf3d 100644 --- a/Build/source/libs/icu/TLpatches/TL-Changes +++ b/Build/source/libs/icu/TLpatches/TL-Changes @@ -1,11 +1,11 @@ -Changes applied to the icu-58.2 tree as obtained from: - http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz - and icu4c-58_2-data.zip - -cd /tmp # or wherever -tar xf icu4c-*-src.tgz # should unpack into icu/* -cd $Build/source/libs/icu/icu-src # for whatever $Build directory -\cp -arf /tmp/icu/* . +Changes applied to the icu-60.2 tree as obtained from: + http://download.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz + and icu4c-60_2-data.zip + +cd $Build/source/libs/icu # for whatever $Build directory +tar xf /tmp/icu4c-*-src.tgz # should unpack into icu/* +mv icu icu-src +cd icu-src rm -r as_is packaging # don't bother including these in our tree # # files to add: @@ -14,21 +14,22 @@ svn add `!!` svn status | sed -n 's/^\?//p' # rerun, should be empty now # # files to remove: -diff -qr . /tmp/icu/ | sed -n -e 's,^Only in \./\(.*\): ,\1/,p' +svn status | sed -n 's/^\!//p' svn rm `!!` -diff ... # rerun, should be empty now +svn status | sed -n 's/^\!//p' # rerun, should be empty now # update generic files (still in icu-src): aux=$Build/source/build-aux -cp -p $aux/config.guess $aux/config.sub $aux/install-sh source/ +cp -p $aux/config.guess $aux/config.sub $aux/install-sh source # patch -p0 for all ../TLpatches/patch-* files, as needed. -# Run svn diff after each, update patch-* file. +# Save original and diff after each, update patch-* file. # Don't lose our leading comments. # autoreconf in the TL directory; don't run autoreconf in the # icu-src/source/ directory, it fails due to missing pkg-config -# prerequisites. (Thus we must patch configure, not just configure.ac.) +# prerequisites. (Thus we must patch configure, not just configure.ac; +# not worth more effort for our small change of preferring gcc.) # # rebuild; must rerun configure (not just config.status), # so easiest is to just do a whole new build. diff --git a/Build/source/libs/icu/TLpatches/patch-14-xopen b/Build/source/libs/icu/TLpatches/patch-14-xopen index 853840ac955..78975642ef2 100644 --- a/Build/source/libs/icu/TLpatches/patch-14-xopen +++ b/Build/source/libs/icu/TLpatches/patch-14-xopen @@ -1,10 +1,8 @@ Do not define _XOPEN_SOURCE_EXTENDED on Solaris, notwithstanding comments in icu source. -Index: source/common/uposixdefs.h -=================================================================== ---- source/common/uposixdefs.h (revision 43491) -+++ source/common/uposixdefs.h (working copy) +--- /tmp/up 2018-01-11 11:05:06.218484133 -0800 ++++ source/common/uposixdefs.h 2018-01-11 11:07:11.006686446 -0800 @@ -51,10 +51,13 @@ * Make sure things like readlink and such functions work. * Poorly upgraded Solaris machines can't have this defined. @@ -15,8 +13,8 @@ Index: source/common/uposixdefs.h * * z/OS needs this definition for timeval and to get usleep. */ --#if !defined(_XOPEN_SOURCE_EXTENDED) -+#if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sun) +-#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-16-putil b/Build/source/libs/icu/TLpatches/patch-16-putil index 9d2bce224ed..e8f9e1ee34d 100644 --- a/Build/source/libs/icu/TLpatches/patch-16-putil +++ b/Build/source/libs/icu/TLpatches/patch-16-putil @@ -1,49 +1,15 @@ tzset and mingw/cygwin. -Index: source/common/putil.cpp -=================================================================== ---- source/common/putil.cpp (revision 43491) -+++ source/common/putil.cpp (working copy) -@@ -43,6 +43,20 @@ - // Must be before any other #includes. - #include "uposixdefs.h" +--- /tmp/putil.cpp 2017-10-31 12:04:49.000000000 -0700 ++++ source/common/putil.cpp 2018-01-11 11:10:30.895806863 -0800 +@@ -46,8 +46,8 @@ + // First, the platform type. Need this for U_PLATFORM. + #include "unicode/platform.h" -+#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) +-#if U_PLATFORM == U_PF_MINGW && defined __STRICT_ANSI__ +-/* tzset isn't defined in strict ANSI on MinGW. */ ++#if (U_PF_CYGWIN <= U_PLATFORM && defined(__STRICT_ANSI__) +/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ -+#undef __STRICT_ANSI__ -+#endif -+ -+/* -+ * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. -+ */ -+#include <time.h> -+ -+#if !U_PLATFORM_USES_ONLY_WIN32_API -+#include <sys/time.h> -+#endif -+ - /* include ICU headers */ - #include "unicode/utypes.h" - #include "unicode/putil.h" -@@ -104,21 +118,7 @@ - # include <sys/neutrino.h> + #undef __STRICT_ANSI__ #endif --#if (U_PF_MINGW <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__) --/* tzset isn't defined in strict ANSI on Cygwin and MinGW. */ --#undef __STRICT_ANSI__ --#endif -- - /* -- * Cygwin with GCC requires inclusion of time.h after the above disabling strict asci mode statement. -- */ --#include <time.h> -- --#if !U_PLATFORM_USES_ONLY_WIN32_API --#include <sys/time.h> --#endif -- --/* - * Only include langinfo.h if we have a way to get the codeset. If we later - * depend on more feature, we can test on U_HAVE_NL_LANGINFO. - * diff --git a/Build/source/libs/icu/TLpatches/patch-17-cygwin-no-w32api b/Build/source/libs/icu/TLpatches/patch-17-cygwin-no-w32api index 89b6d67005c..2a83208c438 100644 --- a/Build/source/libs/icu/TLpatches/patch-17-cygwin-no-w32api +++ b/Build/source/libs/icu/TLpatches/patch-17-cygwin-no-w32api @@ -1,5 +1,8 @@ _HAS_ -> _USES_ONLY_ for WIN32_API and Cygwin. +Not applied for icu-60.2, since it seems some (but not all) of changes +have been installed upstream. + Index: source/common/umutex.h =================================================================== --- source/common/umutex.h (revision 43491) diff --git a/Build/source/libs/icu/TLpatches/patch-19-netbsd b/Build/source/libs/icu/TLpatches/patch-19-netbsd index 46b8b8a4349..3df67b21456 100644 --- a/Build/source/libs/icu/TLpatches/patch-19-netbsd +++ b/Build/source/libs/icu/TLpatches/patch-19-netbsd @@ -1,9 +1,9 @@ Per Marc Baudoin, tlbuild 17 Mar 2017 10:03:03. -Index: digitlst.cpp -=================================================================== ---- digitlst.cpp (revision 43522) -+++ digitlst.cpp (working copy) +Not applied for icu-60.2, since they have a new U_HAVE_XLOCALE_H. + +--- source/i18n/digitlst.cpp (revision 43522) ++++ source/i18n/digitlst.cpp (working copy) @@ -61,7 +61,7 @@ #endif |