icu 61.1

git-svn-id: svn://tug.org/texlive/trunk@47166 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 71 insertions, 511 deletions

diff --git a/Build/source/libs/icu/TLpatches/TL-Changes b/Build/source/libs/icu/TLpatches/TL-Changes
index b6b2426cc45..409568b33d1 100644
--- a/Build/source/libs/icu/TLpatches/TL-Changes
+++ b/Build/source/libs/icu/TLpatches/TL-Changes
@@ -1,21 +1,23 @@
-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
+Changes applied to the icu tree as obtained from:
+	http://download.icu-project.org/files/icu4c/61.1/icu4c-61_1-src.tgz
+        and icu4c-61_1-data.zip
 
 cd $Build/source/libs/icu       # for whatever $Build directory
+# update version.ac
 tar xf /tmp/icu4c-*-src.tgz     # should unpack into icu/*
+mv icu-src icu-prev
 mv icu icu-src
 cd icu-src
 rm -r as_is packaging		# don't bother including these in our tree
 #
 # files to add:
 svn status | sed -n 's/^\?//p'
-svn add `!!`
+svn add `!!`                    # if looks reasonable
 svn status | sed -n 's/^\?//p'  # rerun, should be empty now
 #
 # files to remove:
 svn status | sed -n 's/^\!//p'
-svn rm `!!`
+svn rm `!!`                     # if looks reasonable
 svn status | sed -n 's/^\!//p'  # rerun, should be empty now
 
 # update generic files (still in icu-src):
@@ -26,10 +28,10 @@ cp -p $aux/config.guess $aux/config.sub $aux/install-sh source
 # 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;
-# not worth more effort for our small change of preferring gcc.)
+# autoreconf in the TL directory (Build/source/libs/icu); 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; 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.
@@ -39,8 +41,8 @@ cp -p $aux/config.guess $aux/config.sub $aux/install-sh source
 # to decrease data segment size, e.g., for old BSD.  First, check
 # that we successfully built the full .dat:
 srcdat=$Build/source/libs/icu/icu-src/source/data/in/icudt60l.dat 
-cd $Work/libs/icu/icu-build/data/out/build/icudt60l
-indat=../../tmp/icudt60l.dat
+cd $Work/libs/icu/icu-build/data/out/build/icudt61l
+indat=../../tmp/icudt61l.dat
 diff $srcdat $indat
 # should be identical, amazingly enough.
 
@@ -48,14 +50,14 @@ diff $srcdat $indat
 # C++ binary and we didn't cxx-hack it.
 icupkg="env LD_LIBRARY_PATH=$gnu/lib ../../../../bin/icupkg"
 
-# then remove some elements unused by the icu clients in our tree, namely
+# then remove some elements unused by the icu clients in our tree, which are
 # bibtexu (in texk/bibtex-x), upmendex, and xetex (in texk/web2c/xetexdir).
-outdat=icudt60l.dat
-$icupkg -r 'curr/*' $indat $outdat && mv $outdat $indat
-$icupkg -r 'lang/*' $indat $outdat && mv $outdat $indat
-$icupkg -r 'region/*' $indat $outdat && mv $outdat $indat
-$icupkg -r 'rfc*.spp' $indat $outdat && mv $outdat $indat
-$icupkg -r 'zone/*' $indat $outdat && mv $outdat $indat
+outdat=icudt61l.dat
+$icupkg -r 'curr/*' $indat $outdat && \mv $outdat $indat
+$icupkg -r 'lang/*' $indat $outdat && \mv $outdat $indat
+$icupkg -r 'region/*' $indat $outdat && \mv $outdat $indat
+$icupkg -r 'rfc*.spp' $indat $outdat && \mv $outdat $indat
+$icupkg -r 'zone/*' $indat $outdat && \mv $outdat $indat
 ls -l $indat $srcdat # indat should be much smaller
 cp $indat $srcdat
 
diff --git a/Build/source/libs/icu/TLpatches/patch-01-configure-gcc b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc
index c88942972a3..e3a50823a64 100644
--- a/Build/source/libs/icu/TLpatches/patch-01-configure-gcc
+++ b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc
@@ -3,9 +3,9 @@
 
 Index: source/configure
 ===================================================================
---- source/configure	(revision 43491)
+--- source/configure	(revision 47155)
 +++ source/configure	(working copy)
-@@ -2830,7 +2830,7 @@
+@@ -2842,7 +2842,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
@@ -14,7 +14,7 @@ Index: source/configure
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -2874,7 +2874,7 @@
+@@ -2886,7 +2886,7 @@
  fi
  if test -z "$CC"; then
    ac_ct_CC=$CC
@@ -23,7 +23,7 @@ Index: source/configure
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -3433,7 +3433,7 @@
+@@ -3445,7 +3445,7 @@
      CXX=$CCC
    else
      if test -n "$ac_tool_prefix"; then
@@ -32,7 +32,7 @@ Index: source/configure
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -3477,7 +3477,7 @@
+@@ -3489,7 +3489,7 @@
  fi
  if test -z "$CXX"; then
    ac_ct_CXX=$CXX
@@ -43,7 +43,7 @@ Index: source/configure
  set dummy $ac_prog; ac_word=$2
 Index: source/configure.ac
 ===================================================================
---- source/configure.ac	(revision 43491)
+--- source/configure.ac	(revision 47155)
 +++ source/configure.ac	(working copy)
 @@ -133,10 +133,10 @@
  : ${CXXFLAGS=""}
diff --git a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
index c7b16e37aa1..c157ebde1f3 100644
--- a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
+++ b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
@@ -1,7 +1,26 @@
 	Do not disable C++11 on Solaris.
 
---- configure	(revision 46316)
-+++ configure	(working copy)
+--- source/configure.ac.ORIG1	2018-03-28 15:30:22.811845893 -0700
++++ source/configure.ac	2018-03-28 15:35:13.365156771 -0700
+@@ -509,11 +509,12 @@
+         else
+             CXXFLAGS="$OLD_CXXFLAGS"
+         fi
+-        case "${host}" in
+-        *-*-solaris*)
+-            CXXFLAGS="$OLD_CXXFLAGS"
+-            ;;
+-        esac
++# TL: why? http://bugs.icu-project.org/trac/ticket/13543
++#        case "${host}" in
++#        *-*-solaris*)
++#            CXXFLAGS="$OLD_CXXFLAGS"
++#            ;;
++#        esac
+     fi
+ fi
+--- source/configure.ORIG1	2018-03-28 15:30:22.810845905 -0700
++++ source/configure	2018-03-28 15:34:43.093541126 -0700
 @@ -6033,11 +6033,12 @@
          else
              CXXFLAGS="$OLD_CXXFLAGS"
diff --git a/Build/source/libs/icu/TLpatches/patch-12-mingw b/Build/source/libs/icu/TLpatches/patch-12-mingw
index 3b414e4a21e..21b655ae324 100644
--- a/Build/source/libs/icu/TLpatches/patch-12-mingw
+++ b/Build/source/libs/icu/TLpatches/patch-12-mingw
@@ -1,11 +1,8 @@
 	We don't want this for TeX Live cross compilation.
 
-Index: source/config/mh-mingw
-===================================================================
---- source/config/mh-mingw	(revision 43491)
-+++ source/config/mh-mingw	(working copy)
-@@ -61,27 +61,9 @@
- ## Non-shared intermediate object suffix
+--- source/config/mh-mingw.ORIG	2018-03-26 06:38:44.000000000 -0700
++++ source/config/mh-mingw	2018-03-28 15:37:03.292751066 -0700
+@@ -66,25 +66,7 @@
  STATIC_O = ao
  
 -ifeq ($(ENABLE_SHARED),YES)
@@ -31,4 +28,3 @@ Index: source/config/mh-mingw
 -
  #SH### copied from Makefile.inc
  #SH## for icu-config to test with
- #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
diff --git a/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX b/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX
index 93123626b6e..4b2ae37459b 100644
--- a/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX
+++ b/Build/source/libs/icu/TLpatches/patch-13-STATIC_PREFIX
@@ -1,35 +1,27 @@
 	No `s' for STATIC_PREFIX.
 
-Index: source/config/Makefile.inc.in
-===================================================================
---- source/config/Makefile.inc.in	(revision 43491)
-+++ source/config/Makefile.inc.in	(working copy)
-@@ -46,7 +46,7 @@
- LIBICU = lib$(ICUPREFIX)
+--- source/config/Makefile.inc.in.ORIG	2018-03-26 06:38:44.000000000 -0700
++++ source/config/Makefile.inc.in	2018-03-28 15:38:02.418994808 -0700
+@@ -47,5 +47,5 @@
  
  # Static library prefix and file extension
 -STATIC_PREFIX = s
 +STATIC_PREFIX =
  LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
  A = a
- 
-Index: source/icudefs.mk.in
-===================================================================
---- source/icudefs.mk.in	(revision 43491)
-+++ source/icudefs.mk.in	(working copy)
-@@ -209,13 +209,13 @@
- 
+--- source/icudefs.mk.in.ORIG	2018-03-26 06:38:44.000000000 -0700
++++ source/icudefs.mk.in	2018-03-28 15:38:02.418994808 -0700
+@@ -211,5 +211,5 @@
  ## If we can't use the shared libraries, use the static libraries
  ifneq ($(ENABLE_SHARED),YES)
 -STATIC_PREFIX_WHEN_USED = s
 +STATIC_PREFIX_WHEN_USED = 
  else
  STATIC_PREFIX_WHEN_USED = 
- endif
+@@ -217,5 +217,5 @@
  
  # Static library prefix and file extension
 -STATIC_PREFIX = s
 +STATIC_PREFIX = 
  LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
  A = a
- SOBJ = $(SO)
diff --git a/Build/source/libs/icu/TLpatches/patch-14-xopen b/Build/source/libs/icu/TLpatches/patch-14-xopen
index 78975642ef2..45a85eb0b97 100644
--- a/Build/source/libs/icu/TLpatches/patch-14-xopen
+++ b/Build/source/libs/icu/TLpatches/patch-14-xopen
@@ -1,10 +1,9 @@
 	Do not define _XOPEN_SOURCE_EXTENDED on Solaris,
 	notwithstanding comments in icu source.
 
---- /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.
+--- source/common/uposixdefs.h.ORIG	2018-03-26 06:38:30.000000000 -0700
++++ source/common/uposixdefs.h	2018-03-28 15:39:29.245884244 -0700
+@@ -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.
@@ -17,4 +16,3 @@
 +#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-17-cygwin-no-w32api b/Build/source/libs/icu/TLpatches/patch-17-cygwin-no-w32api
deleted file mode 100644
index 2a83208c438..00000000000
--- a/Build/source/libs/icu/TLpatches/patch-17-cygwin-no-w32api
+++ /dev/null
@@ -1,434 +0,0 @@
-	_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)
-+++ source/common/umutex.h	(working copy)
-@@ -76,7 +76,7 @@
- }
- U_NAMESPACE_END
- 
--#elif U_PLATFORM_HAS_WIN32_API
-+#elif U_PLATFORM_USES_ONLY_WIN32_API
- 
- // MSVC compiler. Reads and writes of volatile variables have
- //                acquire and release memory semantics, respectively.
-Index: source/common/wintz.c
-===================================================================
---- source/common/wintz.c	(revision 43491)
-+++ source/common/wintz.c	(working copy)
-@@ -13,7 +13,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- #include "wintz.h"
- #include "cmemory.h"
-@@ -438,4 +438,4 @@
-     return icuid;
- }
- 
--#endif /* U_PLATFORM_HAS_WIN32_API */
-+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
-Index: source/common/wintz.h
-===================================================================
---- source/common/wintz.h	(revision 43491)
-+++ source/common/wintz.h	(working copy)
-@@ -16,7 +16,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- /**
-  * \file 
-@@ -31,6 +31,6 @@
- U_CFUNC const char* U_EXPORT2
- uprv_detectWindowsTimeZone();
- 
--#endif /* U_PLATFORM_HAS_WIN32_API */
-+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
- 
- #endif /* __WINTZ */
-Index: source/i18n/datefmt.cpp
-===================================================================
---- source/i18n/datefmt.cpp	(revision 43491)
-+++ source/i18n/datefmt.cpp	(working copy)
-@@ -498,7 +498,7 @@
- DateFormat::create(EStyle timeStyle, EStyle dateStyle, const Locale& locale)
- {
-     UErrorCode status = U_ZERO_ERROR;
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-     char buffer[8];
-     int32_t count = locale.getKeywordValue("compat", buffer, sizeof(buffer), status);
- 
-Index: source/i18n/windtfmt.cpp
-===================================================================
---- source/i18n/windtfmt.cpp	(revision 43491)
-+++ source/i18n/windtfmt.cpp	(working copy)
-@@ -13,7 +13,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- #if !UCONFIG_NO_FORMATTING
- 
-@@ -314,5 +314,5 @@
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
- 
--#endif // U_PLATFORM_HAS_WIN32_API
-+#endif // U_PLATFORM_USES_ONLY_WIN32_API
- 
-Index: source/i18n/windtfmt.h
-===================================================================
---- source/i18n/windtfmt.h	(revision 43491)
-+++ source/i18n/windtfmt.h	(working copy)
-@@ -16,7 +16,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- #if !UCONFIG_NO_FORMATTING
- 
-@@ -133,6 +133,6 @@
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
- 
--#endif // U_PLATFORM_HAS_WIN32_API
-+#endif // U_PLATFORM_USES_ONLY_WIN32_API
- 
- #endif // __WINDTFMT
-Index: source/i18n/wintzimpl.cpp
-===================================================================
---- source/i18n/wintzimpl.cpp	(revision 43491)
-+++ source/i18n/wintzimpl.cpp	(working copy)
-@@ -13,7 +13,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API && !UCONFIG_NO_FORMATTING 
-+#if U_PLATFORM_USES_ONLY_WIN32_API && !UCONFIG_NO_FORMATTING 
- 
- #include "wintzimpl.h"
- 
-Index: source/i18n/wintzimpl.h
-===================================================================
---- source/i18n/wintzimpl.h	(revision 43491)
-+++ source/i18n/wintzimpl.h	(working copy)
-@@ -16,7 +16,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- /**
-  * \file 
-  * \brief C API: Utilities for dealing w/ Windows time zones.
-@@ -34,6 +34,6 @@
- uprv_getWindowsTimeZoneInfo(TIME_ZONE_INFORMATION *zoneInfo, const UChar *icuid, int32_t length);
- 
- 
--#endif /* U_PLATFORM_HAS_WIN32_API */
-+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
- 
- #endif /* __WINTZIMPL */
-Index: source/test/intltest/dtfmttst.cpp
-===================================================================
---- source/test/intltest/dtfmttst.cpp	(revision 43491)
-+++ source/test/intltest/dtfmttst.cpp	(working copy)
-@@ -25,7 +25,7 @@
- #include "caltest.h"  // for fieldName
- #include <stdio.h> // for sprintf
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- #include "windttst.h"
- #endif
- 
-@@ -2374,7 +2374,7 @@
- 
- void DateFormatTest::TestHost(void)
- {
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-     Win32DateTimeTest::testLocales(this);
- #endif
- }
-Index: source/test/intltest/uobjtest.cpp
-===================================================================
---- source/test/intltest/uobjtest.cpp	(revision 43491)
-+++ source/test/intltest/uobjtest.cpp	(working copy)
-@@ -384,13 +384,11 @@
-     TESTCLASSID_FACTORY(IndianCalendar, Calendar::createInstance(Locale("@calendar=indian"), status));
-     TESTCLASSID_FACTORY(ChineseCalendar, Calendar::createInstance(Locale("@calendar=chinese"), status));
-     TESTCLASSID_FACTORY(TaiwanCalendar, Calendar::createInstance(Locale("@calendar=roc"), status));
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-     TESTCLASSID_FACTORY(Win32DateFormat, DateFormat::createDateInstance(DateFormat::kFull, Locale("@compat=host")));
--#if U_PLATFORM_USES_ONLY_WIN32_API
-     TESTCLASSID_FACTORY(Win32NumberFormat, NumberFormat::createInstance(Locale("@compat=host"), status));
- #endif
- #endif
--#endif
- 
- #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILE_IO
-     /* TESTCLASSID_ABSTRACT(BreakIterator); No staticID!  */
-Index: source/test/intltest/windttst.cpp
-===================================================================
---- source/test/intltest/windttst.cpp	(revision 43491)
-+++ source/test/intltest/windttst.cpp	(working copy)
-@@ -13,7 +13,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- #if !UCONFIG_NO_FORMATTING
- 
-@@ -193,4 +193,4 @@
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
- 
--#endif /* U_PLATFORM_HAS_WIN32_API */
-+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
-Index: source/test/intltest/windttst.h
-===================================================================
---- source/test/intltest/windttst.h	(revision 43491)
-+++ source/test/intltest/windttst.h	(working copy)
-@@ -16,7 +16,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- #if !UCONFIG_NO_FORMATTING
- 
-@@ -38,6 +38,6 @@
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
- 
--#endif // U_PLATFORM_HAS_WIN32_API
-+#endif // U_PLATFORM_USES_ONLY_WIN32_API
- 
- #endif // __WINDTTST
-Index: source/test/intltest/winutil.cpp
-===================================================================
---- source/test/intltest/winutil.cpp	(revision 43491)
-+++ source/test/intltest/winutil.cpp	(working copy)
-@@ -13,7 +13,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- #if !UCONFIG_NO_FORMATTING
- 
-@@ -95,4 +95,4 @@
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
- 
--#endif /* U_PLATFORM_HAS_WIN32_API */
-+#endif /* U_PLATFORM_USES_ONLY_WIN32_API */
-Index: source/test/intltest/winutil.h
-===================================================================
---- source/test/intltest/winutil.h	(revision 43491)
-+++ source/test/intltest/winutil.h	(working copy)
-@@ -16,7 +16,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- #if !UCONFIG_NO_FORMATTING
- 
-@@ -43,6 +43,6 @@
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
- 
--#endif // U_PLATFORM_HAS_WIN32_API
-+#endif // U_PLATFORM_USES_ONLY_WIN32_API
- 
- #endif // __WINUTIL
-Index: source/test/perf/collperf/collperf.cpp
-===================================================================
---- source/test/perf/collperf/collperf.cpp	(revision 43491)
-+++ source/test/perf/collperf/collperf.cpp	(working copy)
-@@ -118,7 +118,7 @@
-             ucol_getSortKey(col, data[i].icu_data, data[i].icu_data_len, icu_key, MAX_KEY_LENGTH);
-         }
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         // pre-generated in CollPerfTest::prepareData(), need not to check error here
-         void win_key_null(int32_t i){
-             //LCMAP_SORTsk             0x00000400  // WC sort sk (normalize)
-@@ -300,7 +300,7 @@
-         return strcmp((char *) da->icu_key, (char *) db->icu_key); 
-     }
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-     static int win_cmp_null(const void *a, const void *b) {
-         QCAST();
-         //CSTR_LESS_THAN		1
-@@ -335,7 +335,7 @@
- 
-     QFUNC(posix_strcoll_null, strcoll, posix_data)
-         QFUNC(posix_cmpkey, strcmp, posix_key)
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         QFUNC(win_cmpkey, strcmp, win_key)
-         QFUNC(win_wcscmp, wcscmp, win_data)
- #endif
-@@ -455,7 +455,7 @@
-             return strcmp( (char *) rnd[i].icu_key, (char *) ord[j].icu_key );
-         }
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         int win_cmp_null(int32_t i, int32_t j) {
-             int t = CompareStringW(win_langid, 0, rnd[i].win_data, -1, ord[j].win_data, -1);
-             if (t == 0){
-@@ -592,7 +592,7 @@
-             locale = "en_US";   // set default locale
-         }
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         if (options[i].doesOccur) {
-             char *endp;
-             int tmp = strtol(options[i].value, &endp, 0);
-@@ -692,7 +692,7 @@
-         TEST_KEYGEN(TestIcu_KeyGen_null, icu_key_null);
-         TEST_KEYGEN(TestIcu_KeyGen_len,  icu_key_len);
-         TEST_KEYGEN(TestPosix_KeyGen_null, posix_key_null);
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         TEST_KEYGEN(TestWin_KeyGen_null, win_key_null);
-         TEST_KEYGEN(TestWin_KeyGen_len, win_key_len);
- #endif
-@@ -718,7 +718,7 @@
-         TEST_QSORT(TestIcu_qsort_usekey, icu_cmpkey);
-         TEST_QSORT(TestPosix_qsort_strcoll_null, posix_strcoll_null);
-         TEST_QSORT(TestPosix_qsort_usekey, posix_cmpkey);
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         TEST_QSORT(TestWin_qsort_CompareStringW_null, win_cmp_null);
-         TEST_QSORT(TestWin_qsort_CompareStringW_len, win_cmp_len);
-         TEST_QSORT(TestWin_qsort_usekey, win_cmpkey);
-@@ -733,7 +733,7 @@
-         TEST_BIN(TestIcu_BinarySearch_cmpCPO, icu_cmpcpo);
-         TEST_BIN(TestPosix_BinarySearch_strcoll_null, posix_strcoll_null);
-         TEST_BIN(TestPosix_BinarySearch_usekey, posix_cmpkey);
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         TEST_BIN(TestWin_BinarySearch_CompareStringW_null, win_cmp_null);
-         TEST_BIN(TestWin_BinarySearch_CompareStringW_len, win_cmp_len);
- #endif
-@@ -833,7 +833,7 @@
-             t = strxfrm(posix_key->last(), posix_data->dataOf(i), s);
-             if (t != s) {status = U_INVALID_FORMAT_ERROR;return;}
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-             // Win data
-             s = icu_data->lengthOf(i) + 1; // plus terminal NULL
-             win_data->append_one(s);
-@@ -856,7 +856,7 @@
-             rnd_index[i].posix_key = posix_key->last();
-             rnd_index[i].posix_data = posix_data->dataOf(i);
-             rnd_index[i].posix_data_len = posix_data->lengthOf(i);
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-             rnd_index[i].win_key = win_key->dataOf(i);
-             rnd_index[i].win_data = win_data->dataOf(i);
-             rnd_index[i].win_data_len = win_data->lengthOf(i);
-@@ -875,7 +875,7 @@
-         SORT(ord_icu_key, icu_cmpkey);
-         SORT(ord_posix_data, posix_strcoll_null);
-         SORT(ord_posix_key, posix_cmpkey);
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-         SORT(ord_win_data, win_cmp_len);
-         SORT(ord_win_key, win_cmpkey);
-         SORT(ord_win_wcscmp, win_wcscmp);
-Index: source/test/perf/normperf/normperf.h
-===================================================================
---- source/test/perf/normperf/normperf.h	(revision 43491)
-+++ source/test/perf/normperf/normperf.h	(working copy)
-@@ -319,7 +319,7 @@
- }
- #endif
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
- int32_t WinNormNFD(const UChar* src, int32_t srcLen, UChar* dest, int32_t dstLen, int32_t options, UErrorCode* status) {
-     return FoldStringW(MAP_COMPOSITE,src,srcLen,dest,dstLen);
-Index: source/tools/ctestfw/unicode/utimer.h
-===================================================================
---- source/tools/ctestfw/unicode/utimer.h	(revision 43491)
-+++ source/tools/ctestfw/unicode/utimer.h	(working copy)
-@@ -12,7 +12,7 @@
- 
- #include "unicode/utypes.h"
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- #   define VC_EXTRALEAN
- #   define WIN32_LEAN_AND_MEAN
- #   include <windows.h>
-@@ -162,7 +162,7 @@
- typedef void FuntionToBeTimed(void* param);
- 
- 
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
- 
-     struct UTimer{
-         LARGE_INTEGER start;
-Index: source/tools/genrb/derb.cpp
-===================================================================
---- source/tools/genrb/derb.cpp	(revision 43491)
-+++ source/tools/genrb/derb.cpp	(working copy)
-@@ -206,7 +206,7 @@
-         UBool fromICUData = !uprv_strcmp(inputDir, "-");
-         if (!fromICUData) {
-             UBool absfilename = *arg == U_FILE_SEP_CHAR;
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_HAS_WIN32_API && U_PLATFORM != U_PF_CYGWIN
-             if (!absfilename) {
-                 absfilename = (uprv_strlen(arg) > 2 && isalpha(arg[0])
-                     && arg[1] == ':' && arg[2] == U_FILE_SEP_CHAR);
-Index: source/tools/toolutil/udbgutil.cpp
-===================================================================
---- source/tools/toolutil/udbgutil.cpp	(revision 43491)
-+++ source/tools/toolutil/udbgutil.cpp	(working copy)
-@@ -351,8 +351,10 @@
-  */
- U_CAPI const char *udbg_getPlatform(void)
- {
--#if U_PLATFORM_HAS_WIN32_API
-+#if U_PLATFORM_USES_ONLY_WIN32_API
-     return "Windows";
-+#elif U_PLATFORM == U_PF_CYGWIN
-+    return "Cygwin";
- #elif U_PLATFORM == U_PF_UNKNOWN
-     return "unknown";
- #elif U_PLATFORM == U_PF_DARWIN
diff --git a/Build/source/libs/icu/TLpatches/patch-19-netbsd b/Build/source/libs/icu/TLpatches/patch-19-netbsd
index 2c44d8141e0..23c5a31f0ae 100644
--- a/Build/source/libs/icu/TLpatches/patch-19-netbsd
+++ b/Build/source/libs/icu/TLpatches/patch-19-netbsd
@@ -2,10 +2,9 @@
 	From: Marc Baudoin <babafou@babafou.eu.org>
 	tlbuild
 
---- icu-src/source/common/uposixdefs.h	(revision 46329)
-+++ icu-src/source/common/uposixdefs.h	(working copy)
-@@ -71,4 +71,8 @@
- #   define _STDC_C99
+--- source/common/uposixdefs.h.ORIG1	2018-03-28 15:39:29.245884244 -0700
++++ source/common/uposixdefs.h	2018-03-28 15:40:40.027978901 -0700
+@@ -72,3 +72,7 @@
  #endif
  
 +#if defined(__cplusplus) && defined(__NetBSD__)
diff --git a/Build/source/libs/icu/TLpatches/patch-20-private b/Build/source/libs/icu/TLpatches/patch-20-private
index ec7ade078de..3991494affe 100644
--- a/Build/source/libs/icu/TLpatches/patch-20-private
+++ b/Build/source/libs/icu/TLpatches/patch-20-private
@@ -5,34 +5,25 @@
 	http://tug.org/pipermail/tlbuild/2016q1/003438.html
 	(and starting at http://tug.org/pipermail/tlbuild/2016q1/003433.html)
 
-Index: source/i18n/dayperiodrules.h
-===================================================================
---- source/i18n/dayperiodrules.h	(revision 43491)
-+++ source/i18n/dayperiodrules.h	(working copy)
-@@ -55,7 +55,7 @@
-     // Returns the center of dayPeriod. Half hours are indicated with a .5 .
+--- source/i18n/dayperiodrules.h.ORIG	2018-03-26 06:38:30.000000000 -0700
++++ source/i18n/dayperiodrules.h	2018-03-28 15:41:21.288451156 -0700
+@@ -56,5 +56,5 @@
      double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const;
  
 -private:
 +/* nothing private to placate old compilers --karl/koch private: */
      DayPeriodRules();
  
-     // Translates "morning1" to DAYPERIOD_MORNING1, for example.
-Index: source/i18n/unicode/dtitvinf.h
-===================================================================
---- source/i18n/unicode/dtitvinf.h	(revision 43491)
-+++ source/i18n/unicode/dtitvinf.h	(working copy)
-@@ -330,7 +330,7 @@
-     static UClassID U_EXPORT2 getStaticClassID();
+--- source/i18n/unicode/dtitvinf.h.ORIG	2018-03-26 06:38:30.000000000 -0700
++++ source/i18n/unicode/dtitvinf.h	2018-03-28 15:41:21.288451156 -0700
+@@ -329,5 +329,5 @@
  
  
 -private:
 +/* nothing private to placate old compilers --karl/koch private: */
      /**
       * DateIntervalFormat will need access to
-      * getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex,
-@@ -364,7 +364,8 @@
-         kIPI_MAX_INDEX
+@@ -363,5 +363,6 @@
      };
  public:
 -#ifndef U_HIDE_INTERNAL_API
@@ -40,9 +31,7 @@ Index: source/i18n/unicode/dtitvinf.h
 +/* ifndef U_HIDE_INTERNAL_API */
      /**
       * Max index for stored interval patterns
-      * @internal ICU 4.4
-@@ -372,8 +373,8 @@
-      enum {
+@@ -371,6 +372,6 @@
           kMaxIntervalPatternIndex = kIPI_MAX_INDEX
       };
 -#endif  /* U_HIDE_INTERNAL_API */
@@ -51,4 +40,3 @@ Index: source/i18n/unicode/dtitvinf.h
 +/* nothing private to placate old compilers --karl/koch private: */
  
  
-     /**