summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-22 09:50:28 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-22 09:50:28 +0000
commitcf89c4d7cfcb615a58a5129ac594267ebfc78e6e (patch)
tree667018699537a99938d35243d9aec7ec9e2b3730 /Build
parentd4529efc2d52147931fd1b8fbfff4d10cd21204d (diff)
icu 49.1 (release)
git-svn-id: svn://tug.org/texlive/trunk@25728 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/README2
-rw-r--r--Build/source/libs/icu/ChangeLog5
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog9
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/TL-Changes2
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-01-UVoidFunction15
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-02-AC_CHECK_TOOL18
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-03-U_PF_UNKNOWN15
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD23
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting6
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string6
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-08-avoid-rebuild24
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated136
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-11-CURR_FULL_DIR12
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-12-mingw6
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-13-STATIC_PREFIX12
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-14-GENCCODE_ASSEMBLY6
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam42
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-50-Vertical12
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-60-KernPair18
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic18
-rw-r--r--Build/source/libs/icu/icu-49.1/common/putilimp.h2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/Makefile.in6
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/az_Cyrl.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/de.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/en.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/es.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/it.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/pa_Arab.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/ps.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/pt.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/root.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/vai.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/vai_Latn.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/vai_Vaii.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/vi.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/curr/zh.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/in/icudt49l.datbin17957440 -> 17953808 bytes
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/az_Cyrl.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/de.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/en.txt3
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/es.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/it.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/pa_Arab.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/ps.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/pt.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/root.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/vai.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/vai_Latn.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/vai_Vaii.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/vi.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/lang/zh.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/az_Cyrl.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/de.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/en.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/es.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/it.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/pa_Arab.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/ps.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/pt.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/root.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/vai.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/vai_Latn.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/vai_Vaii.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/vi.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/region/zh.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/az_Cyrl.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/de.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/en.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/es.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/it.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/pa_Arab.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/ps.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/pt.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/root.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/vai.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/vai_Latn.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/vai_Vaii.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/vi.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/data/zone/zh.txt2
-rw-r--r--Build/source/libs/icu/icu-49.1/i18n/calendar.cpp2
-rw-r--r--Build/source/libs/icu/icu-49.1/i18n/unicode/datefmt.h16
-rw-r--r--Build/source/libs/icu/icu-49.1/i18n/unicode/smpdtfmt.h5
-rw-r--r--Build/source/libs/icu/icu-49.1/i18n/unicode/udat.h8
-rw-r--r--Build/source/libs/icu/icu-49.1/test/intltest/caltest.cpp28
-rw-r--r--Build/source/libs/icu/icu-49.1/test/intltest/caltest.h2
-rw-r--r--Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp52
-rw-r--r--Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgtypes.h3
-rw-r--r--Build/source/libs/icu/license.html2
88 files changed, 269 insertions, 357 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 4bec473938d..e86a98317a1 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -24,7 +24,7 @@ graphite 2.4 - checked 16mar12
http://scripts.sil.org/svn-public/graphite/graphite/trunk
(svn r1250 2012-03-1419:45:41 UTC).
-icu 49.1 (49_rc) - http://download.icu-project.org/files/icu4c/
+icu 49.1 (49.1 release) - http://download.icu-project.org/files/icu4c/
with modifications required for xetex, also used by bibtexu
libpng 1.5.9 - checked 23feb12
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 67158951b3d..da67f0884d5 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Update icu-49.1 (release).
+ * license.html: Update.
+
2012-03-03 Peter Breitenlohner <peb@mppmu.mpg.de>
Import icu-49.1 (49_rc).
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
index 24fb7e0b1d3..0be4b2ed35e 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Updated icu-49.1 source tree (icu4c-49_1-src.tgz) from:
+ http://download.icu-project.org/files/icu4c/49.1/
+
+ * patch-{01,02,03,04}-*: Removed, now in icu-49.1.
+
+ * patch-{05,07,08,09,11,12,13,14,40,50,60,70}-*: Adapted.
+
2012-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-05-m4-quoting (new): Correct m4 quoting in configure.in.
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/TL-Changes b/Build/source/libs/icu/icu-49.1-PATCHES/TL-Changes
index 7eb1a30e98c..6c692350d86 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/TL-Changes
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
Changes applied to the icu-49.1/ tree as obtained from:
- http://download.icu-project.org/files/icu4c/49rc/icu4c-49_rc-src.tgz
+ http://download.icu-project.org/files/icu4c/49rc/icu4c-49_1-src.tgz
Regenerated:
configure -- should use autoconf 2.68.
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-01-UVoidFunction b/Build/source/libs/icu/icu-49.1-PATCHES/patch-01-UVoidFunction
deleted file mode 100644
index d7ac675c3a0..00000000000
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-01-UVoidFunction
+++ /dev/null
@@ -1,15 +0,0 @@
- UVoidFunction is used independent of U_ENABLE_DYLOAD,
- so also declare it independently.
-
-diff -ur icu-49.rc.orig/source/common/putilimp.h icu-49.rc/source/common/putilimp.h
---- icu-49.rc.orig/source/common/putilimp.h 2012-03-02 23:12:00.000000000 +0100
-+++ icu-49.rc/source/common/putilimp.h 2012-03-03 18:19:56.000000000 +0100
-@@ -513,7 +513,7 @@
- # endif
- #endif
-
--#if U_ENABLE_DYLOAD
-+#if U_ENABLE_DYLOAD || 1
- /* Dynamic Library Functions */
-
- typedef void (UVoidFunction)(void);
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-02-AC_CHECK_TOOL b/Build/source/libs/icu/icu-49.1-PATCHES/patch-02-AC_CHECK_TOOL
deleted file mode 100644
index 7d9bbe43f95..00000000000
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-02-AC_CHECK_TOOL
+++ /dev/null
@@ -1,18 +0,0 @@
- Here we need AC_CHECK_TOOL, not AC_CHECK_TARGET_TOOL!
-
- AC_CHECK_TARGET_TOOL is, e.g., for a compiler built on BUILD,
- executing on HOST and creating executable code for TARGET.
-
-
-diff -ur icu-49.rc.orig/source/configure.in icu-49.rc/source/configure.in
---- icu-49.rc.orig/source/configure.in 2012-03-02 23:14:56.000000000 +0100
-+++ icu-49.rc/source/configure.in 2012-03-03 17:20:02.000000000 +0100
-@@ -354,7 +354,7 @@
- AC_PROG_RANLIB
-
- # look for 'ar' the proper way
--AC_CHECK_TARGET_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(AR, ar, false)
-
- AC_MSG_CHECKING([whether to enable renaming of symbols])
- enabled=yes
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-03-U_PF_UNKNOWN b/Build/source/libs/icu/icu-49.1-PATCHES/patch-03-U_PF_UNKNOWN
deleted file mode 100644
index 71ad3005a86..00000000000
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-03-U_PF_UNKNOWN
+++ /dev/null
@@ -1,15 +0,0 @@
- Building ICU on the FreeBSD kernel arch included in Debian.
- Reported by Hilmar Preusse <hille42@web.de>.
-
-diff -ur icu-49.rc.orig/source/tools/toolutil/udbgutil.cpp icu-49.rc/source/tools/toolutil/udbgutil.cpp
---- icu-49.rc.orig/source/tools/toolutil/udbgutil.cpp 2012-03-02 23:12:06.000000000 +0100
-+++ icu-49.rc/source/tools/toolutil/udbgutil.cpp 2012-03-12 14:27:29.000000000 +0100
-@@ -341,7 +341,7 @@
- #if U_PLATFORM_HAS_WIN32_API
- return "Windows";
- #elif U_PLATFORM == U_PF_UNKNOWN
-- return "unknown"
-+ return "unknown";
- #else
- return "Other (POSIX-like)";
- #endif
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD b/Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD
deleted file mode 100644
index 11454e8cc9c..00000000000
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD
+++ /dev/null
@@ -1,23 +0,0 @@
- Patch from ICU for ticket 9197
-
-diff -ur icu-49.rc.orig/source/common/unicode/platform.h icu-49.rc/source/common/unicode/platform.h
---- icu-49.rc.orig/source/common/unicode/platform.h 2012-03-02 23:11:48.000000000 +0100
-+++ icu-49.rc/source/common/unicode/platform.h 2012-03-17 10:45:22.000000000 +0100
-@@ -1,7 +1,7 @@
- /*
- ******************************************************************************
- *
--* Copyright (C) 1997-2011, International Business Machines
-+* Copyright (C) 1997-2012, International Business Machines
- * Corporation and others. All Rights Reserved.
- *
- ******************************************************************************
-@@ -131,7 +131,7 @@
- # include <android/api-level.h>
- #elif defined(linux) || defined(__linux__) || defined(__linux)
- # define U_PLATFORM U_PF_LINUX
--#elif defined(BSD)
-+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- # define U_PLATFORM U_PF_BSD
- #elif defined(sun) || defined(__sun)
- /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting b/Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting
index 87a4d7c6931..b9ab520b25d 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-05-m4-quoting
@@ -5,9 +5,9 @@
sed: can't read conftest.c: No such file or directory
-diff -ur icu-49.rc.orig/source/configure.in icu-49.rc/source/configure.in
---- icu-49.rc.orig/source/configure.in 2012-03-03 17:20:02.000000000 +0100
-+++ icu-49.rc/source/configure.in 2012-03-20 20:40:28.000000000 +0100
+diff -ur icu-49.1.orig/source/configure.in icu-49.1/source/configure.in
+--- icu-49.1.orig/source/configure.in 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/configure.in 2012-03-22 09:54:23.000000000 +0100
@@ -285,7 +285,7 @@
;;
esac
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string b/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string
index 2ef18282949..b53fcf80547 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-07-configure-utf16-string
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/configure.in icu-49.rc/source/configure.in
---- icu-49.rc.orig/source/configure.in 2012-03-20 20:40:28.000000000 +0100
-+++ icu-49.rc/source/configure.in 2012-03-03 19:43:45.000000000 +0100
+diff -ur icu-49.1.orig/source/configure.in icu-49.1/source/configure.in
+--- icu-49.1.orig/source/configure.in 2012-03-22 09:54:23.000000000 +0100
++++ icu-49.1/source/configure.in 2012-03-22 09:57:38.000000000 +0100
@@ -912,7 +912,27 @@
fi
fi
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-08-avoid-rebuild b/Build/source/libs/icu/icu-49.1-PATCHES/patch-08-avoid-rebuild
index 3ac341e5b88..183fd38d162 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-08-avoid-rebuild
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-08-avoid-rebuild
@@ -1,9 +1,9 @@
Avoid to run pkgdata again and again.
-diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.in
---- icu-49.rc.orig/source/data/Makefile.in 2012-03-02 23:14:48.000000000 +0100
-+++ icu-49.rc/source/data/Makefile.in 2012-03-03 17:22:06.000000000 +0100
-@@ -104,7 +104,7 @@
+diff -ur icu-49.1.orig/source/data/Makefile.in icu-49.1/source/data/Makefile.in
+--- icu-49.1.orig/source/data/Makefile.in 2012-03-21 18:38:02.000000000 +0100
++++ icu-49.1/source/data/Makefile.in 2012-03-22 10:00:52.000000000 +0100
+@@ -105,7 +105,7 @@
.PHONY : all all-local all-recursive install install-local install-files \
install-recursive clean clean-local clean-recursive distclean \
distclean-local distclean-recursive dist dist-local dist-recursive \
@@ -12,7 +12,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
check-exhaustive
## Clear suffix list
-@@ -134,6 +134,7 @@
+@@ -135,6 +135,7 @@
-test -z *.map || $(RMV) *.map
clean-local: cleanpackage cleanfiles clean-map
@@ -20,7 +20,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
cleanfiles:
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
-@@ -178,6 +179,7 @@
+@@ -182,6 +183,7 @@
else
$(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(OUTDIR)
endif
@@ -28,7 +28,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
## Install ICU data.
install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL)
-@@ -422,6 +424,7 @@
+@@ -426,6 +428,7 @@
ifneq ($(INCLUDE_UNI_CORE_DATA),)
MISC_FILES_LIST+=$(UNI_CORE_DATA)
build-local: uni-core-data
@@ -36,7 +36,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
endif
#####################################################
-@@ -432,6 +435,7 @@
+@@ -436,6 +439,7 @@
ifeq ($(ICUDATA_SOURCE_ARCHIVE),)
build-local: build-dir $(SO_VERSION_DATA) $(ALL_FILES) $(PKGDATA_LIST) $(OS390LIST)
@@ -44,7 +44,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
$(PKGDATA_LIST): $(SRCLISTDEPS)
@echo "generating $@ (list of data files)"
@-$(RMV) $@
-@@ -449,6 +453,7 @@
+@@ -453,6 +457,7 @@
done;
else
build-local: build-dir $(SO_VERSION_DATA) $(PKGDATA_LIST) $(OS390LIST)
@@ -52,7 +52,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
$(PKGDATA_LIST): $(SRCLISTDEPS) $(ICUDATA_SOURCE_ARCHIVE)
ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
@echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)"
-@@ -463,6 +468,8 @@
+@@ -467,6 +472,8 @@
$(BUILD_DIRS): build-dir
build-dir:
@@ -61,7 +61,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
@list='$(BUILD_DIRS)'; \
for dir in $$list; do \
if ! test -d $$dir; then \
-@@ -470,6 +477,7 @@
+@@ -474,6 +481,7 @@
$(MKINSTALLDIRS) $(BUILD_DIRS); \
fi; \
done
@@ -69,7 +69,7 @@ diff -ur icu-49.rc.orig/source/data/Makefile.in icu-49.rc/source/data/Makefile.i
# The | is an order-only prerequisite. This helps when the -j option is used,
# and we don't want the files to be built before the directories are built.
-@@ -767,6 +775,7 @@
+@@ -771,6 +779,7 @@
# when updating the Unicode data.
uni-core-data: build-dir $(UNI_CORE_TARGET_DATA)
@echo Unicode .icu files built to $(BUILDDIR)
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated b/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated
index 47bd6382dae..c2ed94ab4f6 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-09-generated
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
---- icu-49.rc.orig/source/configure 2012-03-02 23:14:56.000000000 +0100
-+++ icu-49.rc/source/configure 2012-03-20 21:19:48.000000000 +0100
+diff -ur icu-49.1.orig/source/configure icu-49.1/source/configure
+--- icu-49.1.orig/source/configure 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/configure 2012-03-22 09:59:10.000000000 +0100
@@ -623,6 +623,7 @@
EXTRAS_TRUE
U_CHECK_UTF16_STRING
@@ -9,18 +9,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
U_HAVE_WCSCPY
U_HAVE_WCHAR_H
U_TIMEZONE
-@@ -651,10 +652,6 @@
- U_ENABLE_TRACING
- U_DISABLE_RENAMING
- AR
--target_os
--target_vendor
--target_cpu
--target
- RANLIB
- U_DEFAULT_SHOW_DRAFT
- UCLN_NO_AUTO_CLEANUP
-@@ -758,6 +755,7 @@
+@@ -754,6 +755,7 @@
enable_rpath
enable_threads
enable_weak_threads
@@ -28,15 +17,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
enable_extras
enable_icuio
enable_layout
-@@ -1380,7 +1378,6 @@
- System types:
- --build=BUILD configure for building on BUILD [guessed]
- --host=HOST cross-compile to build programs to run on HOST [BUILD]
-- --target=TARGET configure for building compilers for TARGET [HOST]
- _ACEOF
- fi
-
-@@ -1406,6 +1403,7 @@
+@@ -1401,6 +1403,7 @@
--enable-rpath use rpath when linking default is only if necessary
--enable-threads build ICU with thread safety default=yes
--enable-weak-threads weakly reference the threading library default=no
@@ -44,7 +25,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
--enable-extras build ICU extras default=yes
--enable-icuio build ICU's icuio library default=yes
--enable-layout build ICU's layout library default=yes
-@@ -5271,13 +5269,24 @@
+@@ -5266,13 +5269,24 @@
;;
esac
@@ -71,108 +52,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_STATIC_OPT_FLAG" >&5
$as_echo "$CHECK_STATIC_OPT_FLAG" >&6; }
if test "$CHECK_STATIC_OPT_FLAG" = no; then
-@@ -5460,47 +5469,9 @@
-
-
- # look for 'ar' the proper way
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
--$as_echo_n "checking target system type... " >&6; }
--if ${ac_cv_target+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test "x$target_alias" = x; then
-- ac_cv_target=$ac_cv_host
--else
-- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
--fi
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
--$as_echo "$ac_cv_target" >&6; }
--case $ac_cv_target in
--*-*-*) ;;
--*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
--esac
--target=$ac_cv_target
--ac_save_IFS=$IFS; IFS='-'
--set x $ac_cv_target
--shift
--target_cpu=$1
--target_vendor=$2
--shift; shift
--# Remember, the first character of IFS is used to create $*,
--# except with old shells:
--target_os=$*
--IFS=$ac_save_IFS
--case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
--
--
--# The aliases save the names the user supplied, while $host etc.
--# will get canonicalized.
--test -n "$target_alias" &&
-- test "$program_prefix$program_suffix$program_transform_name" = \
-- NONENONEs,x,x, &&
-- program_prefix=${target_alias}-
--# Extract the first word of "$target_alias-ar", so it can be a program name with args.
--set dummy $target_alias-ar; ac_word=$2
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
-@@ -5516,7 +5487,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_AR="$target_alias-ar"
-+ ac_cv_prog_AR="${ac_tool_prefix}ar"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5536,10 +5507,10 @@
- fi
-
-
-+fi
- if test -z "$ac_cv_prog_AR"; then
-- if test "$build" = "$target"; then
-- ac_ct_AR=$AR
-- # Extract the first word of "ar", so it can be a program name with args.
-+ ac_ct_AR=$AR
-+ # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
-@@ -5564,7 +5535,6 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
-@@ -5576,9 +5546,16 @@
- $as_echo "no" >&6; }
- fi
-
-- AR=$ac_ct_AR
-- else
-+ if test "x$ac_ct_AR" = x; then
- AR="false"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
- fi
- else
- AR="$ac_cv_prog_AR"
-@@ -7140,8 +7117,31 @@
+@@ -7103,8 +7117,31 @@
fi
fi
@@ -204,7 +84,7 @@ diff -ur icu-49.rc.orig/source/configure icu-49.rc/source/configure
U_CHECK_UTF16_STRING=1
CHECK_UTF16_STRING_RESULT="unknown"
-@@ -7274,6 +7274,7 @@
+@@ -7237,6 +7274,7 @@
fi
fi
fi
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-11-CURR_FULL_DIR b/Build/source/libs/icu/icu-49.1-PATCHES/patch-11-CURR_FULL_DIR
index 90da4f41268..c3b62ac44f1 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-11-CURR_FULL_DIR
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-11-CURR_FULL_DIR
@@ -2,9 +2,9 @@
certainly be that for the native (Unix) system and not that for
the build (mingw) system.
-diff -ur icu-49.rc.orig/source/Makefile.in icu-49.rc/source/Makefile.in
---- icu-49.rc.orig/source/Makefile.in 2012-03-02 23:14:56.000000000 +0100
-+++ icu-49.rc/source/Makefile.in 2012-03-03 17:25:30.000000000 +0100
+diff -ur icu-49.1.orig/source/Makefile.in icu-49.1/source/Makefile.in
+--- icu-49.1.orig/source/Makefile.in 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/Makefile.in 2012-03-22 10:11:21.000000000 +0100
@@ -221,6 +221,8 @@
config/icucross.mk: $(top_builddir)/icudefs.mk $(top_builddir)/Makefile
@echo rebuilding $@
@@ -14,9 +14,9 @@ diff -ur icu-49.rc.orig/source/Makefile.in icu-49.rc/source/Makefile.in
echo "TOOLEXEEXT=$(EXEEXT)" \
) > $@
@(echo 'TOOLBINDIR=$$(cross_buildroot)/bin' ;\
-diff -ur icu-49.rc.orig/source/icudefs.mk.in icu-49.rc/source/icudefs.mk.in
---- icu-49.rc.orig/source/icudefs.mk.in 2012-03-02 23:14:56.000000000 +0100
-+++ icu-49.rc/source/icudefs.mk.in 2012-03-03 17:25:30.000000000 +0100
+diff -ur icu-49.1.orig/source/icudefs.mk.in icu-49.1/source/icudefs.mk.in
+--- icu-49.1.orig/source/icudefs.mk.in 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/icudefs.mk.in 2012-03-22 10:11:21.000000000 +0100
@@ -221,6 +221,7 @@
TOOLBINDIR=$(BINDIR)
TOOLLIBDIR=$(LIBDIR)
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-12-mingw b/Build/source/libs/icu/icu-49.1-PATCHES/patch-12-mingw
index 53fe0e9d0ef..7672c33276a 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-12-mingw
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-12-mingw
@@ -1,8 +1,8 @@
We don't want this for TeX Live cross compilation.
-diff -ur icu-49.rc.orig/source/config/mh-mingw icu-49.rc/source/config/mh-mingw
---- icu-49.rc.orig/source/config/mh-mingw 2012-03-02 23:12:16.000000000 +0100
-+++ icu-49.rc/source/config/mh-mingw 2012-03-03 17:27:40.000000000 +0100
+diff -ur icu-49.1.orig/source/config/mh-mingw icu-49.1/source/config/mh-mingw
+--- icu-49.1.orig/source/config/mh-mingw 2012-03-21 18:35:32.000000000 +0100
++++ icu-49.1/source/config/mh-mingw 2012-03-22 10:13:01.000000000 +0100
@@ -55,21 +55,10 @@
SO = dll
## Non-shared intermediate object suffix
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-13-STATIC_PREFIX b/Build/source/libs/icu/icu-49.1-PATCHES/patch-13-STATIC_PREFIX
index a36dcdd9951..c80388367ba 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-13-STATIC_PREFIX
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-13-STATIC_PREFIX
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/config/Makefile.inc.in icu-49.rc/source/config/Makefile.inc.in
---- icu-49.rc.orig/source/config/Makefile.inc.in 2012-03-02 23:12:16.000000000 +0100
-+++ icu-49.rc/source/config/Makefile.inc.in 2012-03-03 17:29:38.000000000 +0100
+diff -ur icu-49.1.orig/source/config/Makefile.inc.in icu-49.1/source/config/Makefile.inc.in
+--- icu-49.1.orig/source/config/Makefile.inc.in 2012-03-21 18:35:32.000000000 +0100
++++ icu-49.1/source/config/Makefile.inc.in 2012-03-22 10:14:29.460517925 +0100
@@ -44,7 +44,7 @@
LIBICU = lib$(ICUPREFIX)
@@ -10,9 +10,9 @@ diff -ur icu-49.rc.orig/source/config/Makefile.inc.in icu-49.rc/source/config/Ma
LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
A = a
-diff -ur icu-49.rc.orig/source/icudefs.mk.in icu-49.rc/source/icudefs.mk.in
---- icu-49.rc.orig/source/icudefs.mk.in 2012-03-03 17:25:30.000000000 +0100
-+++ icu-49.rc/source/icudefs.mk.in 2012-03-03 17:29:38.000000000 +0100
+diff -ur icu-49.1.orig/source/icudefs.mk.in icu-49.1/source/icudefs.mk.in
+--- icu-49.1.orig/source/icudefs.mk.in 2012-03-22 10:11:21.000000000 +0100
++++ icu-49.1/source/icudefs.mk.in 2012-03-22 10:14:29.000000000 +0100
@@ -190,13 +190,13 @@
## If we can't use the shared libraries, use the static libraries
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-14-GENCCODE_ASSEMBLY b/Build/source/libs/icu/icu-49.1-PATCHES/patch-14-GENCCODE_ASSEMBLY
index 8e19a31930d..73b63c83e93 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-14-GENCCODE_ASSEMBLY
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-14-GENCCODE_ASSEMBLY
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/config/mh-linux icu-49.rc/source/config/mh-linux
---- icu-49.rc.orig/source/config/mh-linux 2012-03-02 23:12:16.000000000 +0100
-+++ icu-49.rc/source/config/mh-linux 2012-03-03 17:31:06.000000000 +0100
+diff -ur icu-49.1.orig/source/config/mh-linux icu-49.1/source/config/mh-linux
+--- icu-49.1.orig/source/config/mh-linux 2012-03-21 18:35:32.000000000 +0100
++++ icu-49.1/source/config/mh-linux 2012-03-22 10:15:47.000000000 +0100
@@ -37,6 +37,9 @@
## Non-shared intermediate object suffix
STATIC_O = ao
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam b/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam
index 913bb9757a2..33ef42dcdf7 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-40-auxParam
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/layout/AlternateSubstSubtables.cpp icu-49.rc/source/layout/AlternateSubstSubtables.cpp
---- icu-49.rc.orig/source/layout/AlternateSubstSubtables.cpp 2012-03-02 23:14:52.000000000 +0100
-+++ icu-49.rc/source/layout/AlternateSubstSubtables.cpp 2012-03-03 17:32:24.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/AlternateSubstSubtables.cpp icu-49.1/source/layout/AlternateSubstSubtables.cpp
+--- icu-49.1.orig/source/layout/AlternateSubstSubtables.cpp 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/AlternateSubstSubtables.cpp 2012-03-22 10:16:50.000000000 +0100
@@ -27,13 +27,19 @@
Offset alternateSetTableOffset = SWAPW(alternateSetTableOffsetArray[coverageIndex]);
const AlternateSetTable *alternateSetTable =
@@ -25,9 +25,9 @@ diff -ur icu-49.rc.orig/source/layout/AlternateSubstSubtables.cpp icu-49.rc/sour
}
// XXXX If we get here, the table's mal-formed...
-diff -ur icu-49.rc.orig/source/layout/GlyphIterator.cpp icu-49.rc/source/layout/GlyphIterator.cpp
---- icu-49.rc.orig/source/layout/GlyphIterator.cpp 2012-03-02 23:14:52.000000000 +0100
-+++ icu-49.rc/source/layout/GlyphIterator.cpp 2012-03-03 17:32:24.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/GlyphIterator.cpp icu-49.1/source/layout/GlyphIterator.cpp
+--- icu-49.1.orig/source/layout/GlyphIterator.cpp 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/GlyphIterator.cpp 2012-03-22 10:16:50.000000000 +0100
@@ -19,7 +19,7 @@
FeatureMask theFeatureMask, const GlyphDefinitionTableHeader *theGlyphDefinitionTableHeader)
: direction(1), position(-1), nextLimit(-1), prevLimit(-1),
@@ -122,9 +122,9 @@ diff -ur icu-49.rc.orig/source/layout/GlyphIterator.cpp icu-49.rc/source/layout/
}
le_bool GlyphIterator::findFeatureTag()
-diff -ur icu-49.rc.orig/source/layout/GlyphIterator.h icu-49.rc/source/layout/GlyphIterator.h
---- icu-49.rc.orig/source/layout/GlyphIterator.h 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/GlyphIterator.h 2012-03-03 17:32:24.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/GlyphIterator.h icu-49.1/source/layout/GlyphIterator.h
+--- icu-49.1.orig/source/layout/GlyphIterator.h 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/layout/GlyphIterator.h 2012-03-22 10:16:50.000000000 +0100
@@ -28,7 +28,7 @@
GlyphIterator(GlyphIterator &that);
@@ -160,9 +160,9 @@ diff -ur icu-49.rc.orig/source/layout/GlyphIterator.h icu-49.rc/source/layout/Gl
le_int32 glyphGroup;
const GlyphClassDefinitionTable *glyphClassDefinitionTable;
-diff -ur icu-49.rc.orig/source/layout/LEGlyphStorage.cpp icu-49.rc/source/layout/LEGlyphStorage.cpp
---- icu-49.rc.orig/source/layout/LEGlyphStorage.cpp 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/LEGlyphStorage.cpp 2012-03-03 17:32:24.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/LEGlyphStorage.cpp icu-49.1/source/layout/LEGlyphStorage.cpp
+--- icu-49.1.orig/source/layout/LEGlyphStorage.cpp 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/layout/LEGlyphStorage.cpp 2012-03-22 10:16:50.000000000 +0100
@@ -20,7 +20,7 @@
LEGlyphStorage::LEGlyphStorage()
@@ -295,9 +295,9 @@ diff -ur icu-49.rc.orig/source/layout/LEGlyphStorage.cpp icu-49.rc/source/layout
while (fSrcIndex > atPosition) {
fGlyphs[fDestIndex] = fGlyphs[fSrcIndex];
fCharIndices[fDestIndex] = fCharIndices[fSrcIndex];
-diff -ur icu-49.rc.orig/source/layout/LEGlyphStorage.h icu-49.rc/source/layout/LEGlyphStorage.h
---- icu-49.rc.orig/source/layout/LEGlyphStorage.h 2012-03-02 23:14:52.000000000 +0100
-+++ icu-49.rc/source/layout/LEGlyphStorage.h 2012-03-15 09:11:30.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/LEGlyphStorage.h icu-49.1/source/layout/LEGlyphStorage.h
+--- icu-49.1.orig/source/layout/LEGlyphStorage.h 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/LEGlyphStorage.h 2012-03-22 10:16:50.000000000 +0100
@@ -63,12 +63,12 @@
float *fPositions;
@@ -358,9 +358,9 @@ diff -ur icu-49.rc.orig/source/layout/LEGlyphStorage.h icu-49.rc/source/layout/L
U_NAMESPACE_END
#endif
-diff -ur icu-49.rc.orig/source/layout/OpenTypeLayoutEngine.cpp icu-49.rc/source/layout/OpenTypeLayoutEngine.cpp
---- icu-49.rc.orig/source/layout/OpenTypeLayoutEngine.cpp 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/OpenTypeLayoutEngine.cpp 2012-03-03 17:32:24.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/OpenTypeLayoutEngine.cpp icu-49.1/source/layout/OpenTypeLayoutEngine.cpp
+--- icu-49.1.orig/source/layout/OpenTypeLayoutEngine.cpp 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/OpenTypeLayoutEngine.cpp 2012-03-22 10:16:50.000000000 +0100
@@ -78,7 +78,7 @@
OpenTypeLayoutEngine::OpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode,
le_int32 typoFlags, const GlyphSubstitutionTableHeader *gsubTable, LEErrorCode &success)
@@ -379,9 +379,9 @@ diff -ur icu-49.rc.orig/source/layout/OpenTypeLayoutEngine.cpp icu-49.rc/source/
}
return count;
-diff -ur icu-49.rc.orig/source/layout/OpenTypeLayoutEngine.h icu-49.rc/source/layout/OpenTypeLayoutEngine.h
---- icu-49.rc.orig/source/layout/OpenTypeLayoutEngine.h 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/OpenTypeLayoutEngine.h 2012-03-03 17:32:24.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/OpenTypeLayoutEngine.h icu-49.1/source/layout/OpenTypeLayoutEngine.h
+--- icu-49.1.orig/source/layout/OpenTypeLayoutEngine.h 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/OpenTypeLayoutEngine.h 2012-03-22 10:16:50.000000000 +0100
@@ -194,6 +194,13 @@
le_bool fFeatureOrder;
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-50-Vertical b/Build/source/libs/icu/icu-49.1-PATCHES/patch-50-Vertical
index 7bdf118af6b..9ad4f1febf7 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-50-Vertical
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-50-Vertical
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/layout/LEFontInstance.h icu-49.rc/source/layout/LEFontInstance.h
---- icu-49.rc.orig/source/layout/LEFontInstance.h 2012-03-02 23:14:52.000000000 +0100
-+++ icu-49.rc/source/layout/LEFontInstance.h 2012-03-03 17:34:01.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/LEFontInstance.h icu-49.1/source/layout/LEFontInstance.h
+--- icu-49.1.orig/source/layout/LEFontInstance.h 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/LEFontInstance.h 2012-03-22 10:19:05.000000000 +0100
@@ -509,6 +509,10 @@
*/
static UClassID getStaticClassID();
@@ -24,9 +24,9 @@ diff -ur icu-49.rc.orig/source/layout/LEFontInstance.h icu-49.rc/source/layout/L
U_NAMESPACE_END
#endif
-diff -ur icu-49.rc.orig/source/layout/ValueRecords.cpp icu-49.rc/source/layout/ValueRecords.cpp
---- icu-49.rc.orig/source/layout/ValueRecords.cpp 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/ValueRecords.cpp 2012-03-03 17:34:01.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/ValueRecords.cpp icu-49.1/source/layout/ValueRecords.cpp
+--- icu-49.1.orig/source/layout/ValueRecords.cpp 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/layout/ValueRecords.cpp 2012-03-22 10:19:05.000000000 +0100
@@ -48,8 +48,12 @@
fontInstance->transformFunits(value, 0, pixels);
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-60-KernPair b/Build/source/libs/icu/icu-49.1-PATCHES/patch-60-KernPair
index df05b3703ce..55e2fc8fede 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-60-KernPair
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-60-KernPair
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/layout/LEFontInstance.cpp icu-49.rc/source/layout/LEFontInstance.cpp
---- icu-49.rc.orig/source/layout/LEFontInstance.cpp 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/LEFontInstance.cpp 2012-03-03 17:35:31.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/LEFontInstance.cpp icu-49.1/source/layout/LEFontInstance.cpp
+--- icu-49.1.orig/source/layout/LEFontInstance.cpp 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/layout/LEFontInstance.cpp 2012-03-22 10:20:24.000000000 +0100
@@ -145,5 +145,10 @@
return getAscent() + getDescent() + getLeading();
}
@@ -12,9 +12,9 @@ diff -ur icu-49.rc.orig/source/layout/LEFontInstance.cpp icu-49.rc/source/layout
+
U_NAMESPACE_END
-diff -ur icu-49.rc.orig/source/layout/LEFontInstance.h icu-49.rc/source/layout/LEFontInstance.h
---- icu-49.rc.orig/source/layout/LEFontInstance.h 2012-03-03 17:34:01.000000000 +0100
-+++ icu-49.rc/source/layout/LEFontInstance.h 2012-03-03 17:35:31.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/LEFontInstance.h icu-49.1/source/layout/LEFontInstance.h
+--- icu-49.1.orig/source/layout/LEFontInstance.h 2012-03-22 10:19:05.000000000 +0100
++++ icu-49.1/source/layout/LEFontInstance.h 2012-03-22 10:20:24.000000000 +0100
@@ -510,6 +510,11 @@
static UClassID getStaticClassID();
@@ -27,9 +27,9 @@ diff -ur icu-49.rc.orig/source/layout/LEFontInstance.h icu-49.rc/source/layout/L
* Returns true if writing direction is vertical.
*/
virtual inline bool getLayoutDirVertical() const;
-diff -ur icu-49.rc.orig/source/layout/LayoutEngine.cpp icu-49.rc/source/layout/LayoutEngine.cpp
---- icu-49.rc.orig/source/layout/LayoutEngine.cpp 2012-03-02 23:14:52.000000000 +0100
-+++ icu-49.rc/source/layout/LayoutEngine.cpp 2012-03-03 17:35:31.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/LayoutEngine.cpp icu-49.1/source/layout/LayoutEngine.cpp
+--- icu-49.1.orig/source/layout/LayoutEngine.cpp 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/LayoutEngine.cpp 2012-03-22 10:20:24.000000000 +0100
@@ -369,9 +369,25 @@
if (fTypoFlags & 0x1) { /* kerning enabled */
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic b/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic
index 5aefbcead1d..4a65c41e509 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-70-Arabic
@@ -1,6 +1,6 @@
-diff -ur icu-49.rc.orig/source/layout/ArabicShaping.cpp icu-49.rc/source/layout/ArabicShaping.cpp
---- icu-49.rc.orig/source/layout/ArabicShaping.cpp 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/ArabicShaping.cpp 2012-03-15 09:11:30.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/ArabicShaping.cpp icu-49.1/source/layout/ArabicShaping.cpp
+--- icu-49.1.orig/source/layout/ArabicShaping.cpp 2012-03-21 18:38:10.000000000 +0100
++++ icu-49.1/source/layout/ArabicShaping.cpp 2012-03-22 10:21:21.000000000 +0100
@@ -24,6 +24,31 @@
ArabicShaping::ST_TRANSPARENT // [T]
};
@@ -150,9 +150,9 @@ diff -ur icu-49.rc.orig/source/layout/ArabicShaping.cpp icu-49.rc/source/layout/
erout = out;
}
-diff -ur icu-49.rc.orig/source/layout/ArabicShaping.h icu-49.rc/source/layout/ArabicShaping.h
---- icu-49.rc.orig/source/layout/ArabicShaping.h 2012-03-02 23:14:54.000000000 +0100
-+++ icu-49.rc/source/layout/ArabicShaping.h 2012-03-03 17:37:09.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/ArabicShaping.h icu-49.1/source/layout/ArabicShaping.h
+--- icu-49.1.orig/source/layout/ArabicShaping.h 2012-03-21 18:38:08.000000000 +0100
++++ icu-49.1/source/layout/ArabicShaping.h 2012-03-22 10:21:21.000000000 +0100
@@ -39,7 +39,10 @@
MASK_SHAPE_RIGHT = 1, // if this bit set, shapes to right
MASK_SHAPE_LEFT = 2, // if this bit set, shapes to left
@@ -184,9 +184,9 @@ diff -ur icu-49.rc.orig/source/layout/ArabicShaping.h icu-49.rc/source/layout/Ar
static void adjustTags(le_int32 outIndex, le_int32 shapeOffset, LEGlyphStorage &glyphStorage);
};
-diff -ur icu-49.rc.orig/source/layout/LayoutEngine.cpp icu-49.rc/source/layout/LayoutEngine.cpp
---- icu-49.rc.orig/source/layout/LayoutEngine.cpp 2012-03-03 17:35:31.000000000 +0100
-+++ icu-49.rc/source/layout/LayoutEngine.cpp 2012-03-03 17:37:09.000000000 +0100
+diff -ur icu-49.1.orig/source/layout/LayoutEngine.cpp icu-49.1/source/layout/LayoutEngine.cpp
+--- icu-49.1.orig/source/layout/LayoutEngine.cpp 2012-03-22 10:20:24.000000000 +0100
++++ icu-49.1/source/layout/LayoutEngine.cpp 2012-03-22 10:21:21.000000000 +0100
@@ -567,6 +567,8 @@
break;
diff --git a/Build/source/libs/icu/icu-49.1/common/putilimp.h b/Build/source/libs/icu/icu-49.1/common/putilimp.h
index 6ec08105323..cbec89bf590 100644
--- a/Build/source/libs/icu/icu-49.1/common/putilimp.h
+++ b/Build/source/libs/icu/icu-49.1/common/putilimp.h
@@ -513,11 +513,11 @@ U_INTERNAL void * U_EXPORT2 uprv_maximumPtr(void *base);
# endif
#endif
-#if U_ENABLE_DYLOAD || 1
/* Dynamic Library Functions */
typedef void (UVoidFunction)(void);
+#if U_ENABLE_DYLOAD
/**
* Load a library
* @internal (ICU 4.4)
diff --git a/Build/source/libs/icu/icu-49.1/data/Makefile.in b/Build/source/libs/icu/icu-49.1/data/Makefile.in
index e7ee8eee0c8..9399f3b3d13 100644
--- a/Build/source/libs/icu/icu-49.1/data/Makefile.in
+++ b/Build/source/libs/icu/icu-49.1/data/Makefile.in
@@ -1,5 +1,5 @@
## Makefile.in for ICU data
-## Copyright (c) 1999-2011, International Business Machines Corporation and
+## Copyright (c) 1999-2012, International Business Machines Corporation and
## others. All Rights Reserved.
## Source directory information
@@ -45,6 +45,7 @@ ifeq ($(CURDIR),)
CURDIR=.
endif
PKGDATA = $(TOOLBINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR)
+OS390_PDS_NAME = -z -L $(BATCH_STUB_TARGET)
ifeq ($(OS390_STUBDATA),1)
OS390PKG=package390
@@ -176,6 +177,9 @@ endif
endif
ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST)
+ifeq ($(OS390BATCH),1)
+ $(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(OS390_PDS_NAME) $(PKGDATA_LIST)
+endif
else
$(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(OUTDIR)
endif
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/az_Cyrl.txt b/Build/source/libs/icu/icu-49.1/data/curr/az_Cyrl.txt
index 49a7f97938a..89daf1820be 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/az_Cyrl.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/az_Cyrl.txt
@@ -16,5 +16,5 @@ az_Cyrl{
"AZN",
}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/de.txt b/Build/source/libs/icu/icu-49.1/data/curr/de.txt
index 91be1aae139..0da84a03774 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/de.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/de.txt
@@ -2109,5 +2109,5 @@ de{
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/en.txt b/Build/source/libs/icu/icu-49.1/data/curr/en.txt
index abbc467439c..c0b381ffe6d 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/en.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/en.txt
@@ -2379,5 +2379,5 @@ en{
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/es.txt b/Build/source/libs/icu/icu-49.1/data/curr/es.txt
index 344177c2a37..ac9b45adaa1 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/es.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/es.txt
@@ -2073,5 +2073,5 @@ es{
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/it.txt b/Build/source/libs/icu/icu-49.1/data/curr/it.txt
index f85e8b39e6e..a84b6cf785a 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/it.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/it.txt
@@ -1698,5 +1698,5 @@ it{
other{"kwacha zambiani"}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/pa_Arab.txt b/Build/source/libs/icu/icu-49.1/data/curr/pa_Arab.txt
index 5431be2df4a..354984b8cf7 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/pa_Arab.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/pa_Arab.txt
@@ -24,5 +24,5 @@ pa_Arab{
"روپئیہ",
}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/ps.txt b/Build/source/libs/icu/icu-49.1/data/curr/ps.txt
index 20816028079..855aa646b8a 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/ps.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/ps.txt
@@ -16,5 +16,5 @@ ps{
"افغانۍ",
}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/pt.txt b/Build/source/libs/icu/icu-49.1/data/curr/pt.txt
index a4bb018a1b0..f882f9edee8 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/pt.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/pt.txt
@@ -2354,5 +2354,5 @@ pt{
one{"{0} {1}"}
other{"{0} {1}"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/root.txt b/Build/source/libs/icu/icu-49.1/data/curr/root.txt
index f741b13a2b8..11340389a33 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/root.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/root.txt
@@ -99,7 +99,7 @@ root{
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
currencySpacing{
afterCurrency{
currencyMatch{"[:letter:]"}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/vai.txt b/Build/source/libs/icu/icu-49.1/data/curr/vai.txt
index dffa3b0ecb7..6199bb58db6 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/vai.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/vai.txt
@@ -220,5 +220,5 @@ vai{
"ꔽꕓꖜꔃ ꕜꕞ",
}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/vai_Latn.txt b/Build/source/libs/icu/icu-49.1/data/curr/vai_Latn.txt
index c7107e7587a..09c9ef873ed 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/vai_Latn.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/vai_Latn.txt
@@ -224,5 +224,5 @@ vai_Latn{
"Zimbhabhuwe Dala",
}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/vai_Vaii.txt b/Build/source/libs/icu/icu-49.1/data/curr/vai_Vaii.txt
index 3bbc7c962ad..25e746b02d0 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/vai_Vaii.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/vai_Vaii.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/vi.txt b/Build/source/libs/icu/icu-49.1/data/curr/vi.txt
index fa3880da883..bd34c4b135a 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/vi.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/vi.txt
@@ -699,5 +699,5 @@ vi{
CurrencyUnitPatterns{
other{"{0} {1}"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/curr/zh.txt b/Build/source/libs/icu/icu-49.1/data/curr/zh.txt
index ade676b4dd2..a86461c2140 100644
--- a/Build/source/libs/icu/icu-49.1/data/curr/zh.txt
+++ b/Build/source/libs/icu/icu-49.1/data/curr/zh.txt
@@ -1080,5 +1080,5 @@ zh{
"津巴布韦元 (2009)",
}
}
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/in/icudt49l.dat b/Build/source/libs/icu/icu-49.1/data/in/icudt49l.dat
index 046fbcd065d..cb86ab4ca54 100644
--- a/Build/source/libs/icu/icu-49.1/data/in/icudt49l.dat
+++ b/Build/source/libs/icu/icu-49.1/data/in/icudt49l.dat
Binary files differ
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/az_Cyrl.txt b/Build/source/libs/icu/icu-49.1/data/lang/az_Cyrl.txt
index a97453f383a..80b6a2de91c 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/az_Cyrl.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/az_Cyrl.txt
@@ -22,5 +22,5 @@ az_Cyrl{
ru{"русҹа"}
zh{"чинҹә"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/de.txt b/Build/source/libs/icu/icu-49.1/data/lang/de.txt
index dcf57e6c102..b9f6d4b6ece 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/de.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/de.txt
@@ -763,7 +763,7 @@ de{
VALENCIA{"Valencianisch"}
WADEGILE{"Wade-Giles"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
codePatterns{
language{"Sprache: {0}"}
script{"Schrift: {0}"}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/en.txt b/Build/source/libs/icu/icu-49.1/data/lang/en.txt
index 75c524ede2f..c105f622134 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/en.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/en.txt
@@ -756,6 +756,7 @@ en{
ducet{"Default Unicode Sort Order"}
gb2312han{"Simplified Chinese Sort Order - GB2312"}
phonebook{"Phonebook Sort Order"}
+ phonetic{"Phonetic Sort Order"}
pinyin{"Pinyin Sort Order"}
reformed{"Reformed Sort Order"}
search{"General-Purpose Search"}
@@ -863,7 +864,7 @@ en{
VALENCIA{"Valencian"}
WADEGILE{"Wade-Giles Romanization"}
}
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
codePatterns{
language{"Language: {0}"}
script{"Script: {0}"}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/es.txt b/Build/source/libs/icu/icu-49.1/data/lang/es.txt
index 5d716ad98df..19e12a6d3b4 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/es.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/es.txt
@@ -732,7 +732,7 @@ es{
VALENCIA{"Valenciano"}
WADEGILE{"Romanización Wade-Giles"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
codePatterns{
language{"Idioma: {0}"}
script{"Dialecto: {0}"}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/it.txt b/Build/source/libs/icu/icu-49.1/data/lang/it.txt
index 198bd147bbe..96da6413676 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/it.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/it.txt
@@ -730,7 +730,7 @@ it{
ROZAJ{"resiano"}
SAAHO{"saho"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
localeDisplayPattern{
pattern{"{0} ({1})"}
separator{", "}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/pa_Arab.txt b/Build/source/libs/icu/icu-49.1/data/lang/pa_Arab.txt
index b4d5f7878a7..7f893641e3d 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/pa_Arab.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/pa_Arab.txt
@@ -17,5 +17,5 @@ pa_Arab{
Arab{"العربية"}
Guru{"گُرمُکھی"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/ps.txt b/Build/source/libs/icu/icu-49.1/data/lang/ps.txt
index b06be596c6d..5a66767a840 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/ps.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/ps.txt
@@ -47,5 +47,5 @@ ps{
Scripts{
Arab{"عربي"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/pt.txt b/Build/source/libs/icu/icu-49.1/data/lang/pt.txt
index 3d7bf8bb795..7b61a337942 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/pt.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/pt.txt
@@ -775,7 +775,7 @@ pt{
VALENCIA{"valenciano"}
WADEGILE{"romanização Wade-Giles"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
codePatterns{
language{"Idioma: {0}"}
script{"Roteiro: {0}"}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/root.txt b/Build/source/libs/icu/icu-49.1/data/lang/root.txt
index 60594d57896..d33d20663d3 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/root.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/root.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/root.xml
*/
root{
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
codePatterns{
language{"{0}"}
script{"{0}"}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/vai.txt b/Build/source/libs/icu/icu-49.1/data/lang/vai.txt
index 42c40f62020..988c4699832 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/vai.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/vai.txt
@@ -57,5 +57,5 @@ vai{
zh{"ꕦꕇꔧ"}
zu{"ꖮꖨ"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/vai_Latn.txt b/Build/source/libs/icu/icu-49.1/data/lang/vai_Latn.txt
index 1eb2c9752dd..f23d629f057 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/vai_Latn.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/vai_Latn.txt
@@ -57,5 +57,5 @@ vai_Latn{
zh{"Chaniĩ"}
zu{"Zúlu"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/vai_Vaii.txt b/Build/source/libs/icu/icu-49.1/data/lang/vai_Vaii.txt
index 3bbc7c962ad..25e746b02d0 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/vai_Vaii.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/vai_Vaii.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/vi.txt b/Build/source/libs/icu/icu-49.1/data/lang/vi.txt
index bdd53ef56e6..875d47fc855 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/vi.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/vi.txt
@@ -297,7 +297,7 @@ vi{
tibt{"Chữ số Tây Tạng"}
}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
codePatterns{
language{"Ngôn ngữ: {0}"}
script{"Chữ viết: {0}"}
diff --git a/Build/source/libs/icu/icu-49.1/data/lang/zh.txt b/Build/source/libs/icu/icu-49.1/data/lang/zh.txt
index 912be56682e..1687e9bd4ba 100644
--- a/Build/source/libs/icu/icu-49.1/data/lang/zh.txt
+++ b/Build/source/libs/icu/icu-49.1/data/lang/zh.txt
@@ -755,7 +755,7 @@ zh{
VALENCIA{"瓦伦西亚文"}
WADEGILE{"WG 威氏拼音法"}
}
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
codePatterns{
language{"语言:{0}"}
script{"脚本:{0}"}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/az_Cyrl.txt b/Build/source/libs/icu/icu-49.1/data/region/az_Cyrl.txt
index 5aac96f0d85..593ec2f3b3d 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/az_Cyrl.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/az_Cyrl.txt
@@ -22,5 +22,5 @@ az_Cyrl{
RU{"Русија"}
US{"Америка Бирләшмиш Штатлары"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/de.txt b/Build/source/libs/icu/icu-49.1/data/region/de.txt
index 7821d3b20bc..5eb4258f2ce 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/de.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/de.txt
@@ -298,5 +298,5 @@ de{
ZW{"Simbabwe"}
ZZ{"Unbekannte Region"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/en.txt b/Build/source/libs/icu/icu-49.1/data/region/en.txt
index 78df1f75da9..6b01c5be347 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/en.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/en.txt
@@ -306,5 +306,5 @@ en{
ZW{"Zimbabwe"}
ZZ{"Unknown Region"}
}
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/es.txt b/Build/source/libs/icu/icu-49.1/data/region/es.txt
index a02aaf06f94..320b838f990 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/es.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/es.txt
@@ -301,5 +301,5 @@ es{
ZW{"Zimbabue"}
ZZ{"Región desconocida"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/it.txt b/Build/source/libs/icu/icu-49.1/data/region/it.txt
index 98db88a626e..a74844dead8 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/it.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/it.txt
@@ -304,5 +304,5 @@ it{
ZW{"Zimbabwe"}
ZZ{"Regione non valida o sconosciuta"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/pa_Arab.txt b/Build/source/libs/icu/icu-49.1/data/region/pa_Arab.txt
index 1fa0d4952a8..49728c6593f 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/pa_Arab.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/pa_Arab.txt
@@ -13,5 +13,5 @@ pa_Arab{
Countries{
PK{"پکستان"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/ps.txt b/Build/source/libs/icu/icu-49.1/data/region/ps.txt
index d3edc87a364..527b85d3ebf 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/ps.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/ps.txt
@@ -75,5 +75,5 @@ ps{
UY{"یوروګوای"}
YE{"یمن"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/pt.txt b/Build/source/libs/icu/icu-49.1/data/region/pt.txt
index aa15eb856c1..0daaddc091c 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/pt.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/pt.txt
@@ -298,5 +298,5 @@ pt{
ZW{"Zimbábue"}
ZZ{"Região desconhecida ou inválida"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/root.txt b/Build/source/libs/icu/icu-49.1/data/region/root.txt
index b6dbe9a133e..dfd55e9c2b1 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/root.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/root.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/root.xml
*/
root{
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/vai.txt b/Build/source/libs/icu/icu-49.1/data/region/vai.txt
index e2f5b40300f..c6947a7bb0a 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/vai.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/vai.txt
@@ -237,5 +237,5 @@ vai{
ZM{"ꕤꔭꕩ"}
ZW{"ꔽꕓꖜꔃ"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/vai_Latn.txt b/Build/source/libs/icu/icu-49.1/data/region/vai_Latn.txt
index 402ab8fb9ad..8aa9a418cc5 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/vai_Latn.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/vai_Latn.txt
@@ -237,5 +237,5 @@ vai_Latn{
ZM{"Zambiya"}
ZW{"Zimbabhuwe"}
}
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/vai_Vaii.txt b/Build/source/libs/icu/icu-49.1/data/region/vai_Vaii.txt
index 3bbc7c962ad..25e746b02d0 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/vai_Vaii.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/vai_Vaii.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/vi.txt b/Build/source/libs/icu/icu-49.1/data/region/vi.txt
index b3bdfbd5eba..65ee4ef8934 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/vi.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/vi.txt
@@ -293,5 +293,5 @@ vi{
ZW{"Dim-ba-bu-ê"}
ZZ{"Vùng Chưa biết hoặc không Hợp lệ"}
}
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/region/zh.txt b/Build/source/libs/icu/icu-49.1/data/region/zh.txt
index 918df231fb1..1f0667332d5 100644
--- a/Build/source/libs/icu/icu-49.1/data/region/zh.txt
+++ b/Build/source/libs/icu/icu-49.1/data/region/zh.txt
@@ -298,5 +298,5 @@ zh{
ZW{"津巴布韦"}
ZZ{"未知地区"}
}
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/az_Cyrl.txt b/Build/source/libs/icu/icu-49.1/data/zone/az_Cyrl.txt
index 6b16649e041..7b5f5c3df96 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/az_Cyrl.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/az_Cyrl.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/az_Cyrl.xml
*/
az_Cyrl{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/de.txt b/Build/source/libs/icu/icu-49.1/data/zone/de.txt
index f7fe29d1831..9fdb042c7db 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/de.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/de.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/de.xml
*/
de{
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
zoneStrings{
"Africa:Accra"{
ec{"Akkra"}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/en.txt b/Build/source/libs/icu/icu-49.1/data/zone/en.txt
index fe520568b1b..859a9ed34af 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/en.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/en.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/en.xml
*/
en{
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
zoneStrings{
"Africa:Sao_Tome"{
ec{"São Tomé"}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/es.txt b/Build/source/libs/icu/icu-49.1/data/zone/es.txt
index b6e202c0c0d..d9bc01df413 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/es.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/es.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/es.xml
*/
es{
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abiyán"}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/it.txt b/Build/source/libs/icu/icu-49.1/data/zone/it.txt
index d1f64f371d0..b33f3280460 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/it.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/it.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/it.xml
*/
it{
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/pa_Arab.txt b/Build/source/libs/icu/icu-49.1/data/zone/pa_Arab.txt
index 501d4b5dfd0..52c75cf8443 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/pa_Arab.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/pa_Arab.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/pa_Arab.xml
*/
pa_Arab{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/ps.txt b/Build/source/libs/icu/icu-49.1/data/zone/ps.txt
index 6c3da79f8b8..44db8a96dd1 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/ps.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/ps.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/ps.xml
*/
ps{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
zoneStrings{
"Asia:Kabul"{
ec{"کابل"}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/pt.txt b/Build/source/libs/icu/icu-49.1/data/zone/pt.txt
index dcda99f4ede..a0408f200d7 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/pt.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/pt.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/pt.xml
*/
pt{
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/root.txt b/Build/source/libs/icu/icu-49.1/data/zone/root.txt
index 553d4fa76e0..7e8852c3c15 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/root.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/root.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/root.xml
*/
root{
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
zoneStrings{
""{
ec{""}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/vai.txt b/Build/source/libs/icu/icu-49.1/data/zone/vai.txt
index cc9a1e62f86..1d90929105c 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/vai.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/vai.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai.xml
*/
vai{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/vai_Latn.txt b/Build/source/libs/icu/icu-49.1/data/zone/vai_Latn.txt
index b34a67b9f22..79cf971e493 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/vai_Latn.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/vai_Latn.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Latn.xml
*/
vai_Latn{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/vai_Vaii.txt b/Build/source/libs/icu/icu-49.1/data/zone/vai_Vaii.txt
index 3bbc7c962ad..25e746b02d0 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/vai_Vaii.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/vai_Vaii.txt
@@ -10,5 +10,5 @@
* ICU <specials> source: <path>/xml/main/vai_Vaii.xml
*/
vai_Vaii{
- Version{"2.0.66.14"}
+ Version{"2.0.67.8"}
}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/vi.txt b/Build/source/libs/icu/icu-49.1/data/zone/vi.txt
index 3f04989777b..18006613925 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/vi.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/vi.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/vi.xml
*/
vi{
- Version{"2.0.65.46"}
+ Version{"2.0.67.6"}
zoneStrings{
"Africa:Abidjan"{
ec{"Abidjan"}
diff --git a/Build/source/libs/icu/icu-49.1/data/zone/zh.txt b/Build/source/libs/icu/icu-49.1/data/zone/zh.txt
index 620aa669a62..ad4fb67f647 100644
--- a/Build/source/libs/icu/icu-49.1/data/zone/zh.txt
+++ b/Build/source/libs/icu/icu-49.1/data/zone/zh.txt
@@ -10,7 +10,7 @@
* ICU <specials> source: <path>/xml/main/zh.xml
*/
zh{
- Version{"2.0.66.10"}
+ Version{"2.0.67.6"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比让"}
diff --git a/Build/source/libs/icu/icu-49.1/i18n/calendar.cpp b/Build/source/libs/icu/icu-49.1/i18n/calendar.cpp
index 7f7cde40c28..202c64aad9a 100644
--- a/Build/source/libs/icu/icu-49.1/i18n/calendar.cpp
+++ b/Build/source/libs/icu/icu-49.1/i18n/calendar.cpp
@@ -783,6 +783,8 @@ Calendar::operator=(const Calendar &right)
fWeekendCease = right.fWeekendCease;
fWeekendCeaseMillis = right.fWeekendCeaseMillis;
fNextStamp = right.fNextStamp;
+ uprv_strcpy(validLocale, right.validLocale);
+ uprv_strcpy(actualLocale, right.actualLocale);
}
return *this;
diff --git a/Build/source/libs/icu/icu-49.1/i18n/unicode/datefmt.h b/Build/source/libs/icu/icu-49.1/i18n/unicode/datefmt.h
index f4b7a9b5c92..6f503cecac0 100644
--- a/Build/source/libs/icu/icu-49.1/i18n/unicode/datefmt.h
+++ b/Build/source/libs/icu/icu-49.1/i18n/unicode/datefmt.h
@@ -543,8 +543,13 @@ public:
* Creates a date formatter with the given formatting style for the given
* const locale.
*
- * @param style The given formatting style. For example,
- * SHORT for "M/d/yy" in the US locale.
+ * @param style The given formatting style. For example, SHORT for "M/d/yy" in the
+ * US locale. As currently implemented, relative date formatting only
+ * affects a limited range of calendar days before or after the
+ * current date, based on the CLDR &lt;field type="day"&gt;/&lt;relative&gt; data:
+ * For example, in English, "Yesterday", "Today", and "Tomorrow".
+ * Outside of this range, dates are formatted using the corresponding
+ * non-relative style.
* @param aLocale The given locale.
* @return A date formatter which the caller owns.
* @stable ICU 2.0
@@ -557,7 +562,12 @@ public:
* given locale.
*
* @param dateStyle The given formatting style for the date portion of the result.
- * For example, SHORT for "M/d/yy" in the US locale.
+ * For example, SHORT for "M/d/yy" in the US locale. As currently
+ * implemented, relative date formatting only affects a limited range
+ * of calendar days before or after the current date, based on the
+ * CLDR &lt;field type="day"&gt;/&lt;relative&gt; data: For example, in English,
+ * "Yesterday", "Today", and "Tomorrow". Outside of this range, dates
+ * are formatted using the corresponding non-relative style.
* @param timeStyle The given formatting style for the time portion of the result.
* For example, SHORT for "h:mm a" in the US locale. Relative
* time styles are not currently supported.
diff --git a/Build/source/libs/icu/icu-49.1/i18n/unicode/smpdtfmt.h b/Build/source/libs/icu/icu-49.1/i18n/unicode/smpdtfmt.h
index f9677d4ea8a..361580aef64 100644
--- a/Build/source/libs/icu/icu-49.1/i18n/unicode/smpdtfmt.h
+++ b/Build/source/libs/icu/icu-49.1/i18n/unicode/smpdtfmt.h
@@ -188,8 +188,9 @@ class TimeZoneFormat;
* <code>Unicode::isDigit()</code>, will be parsed into the default century.
* Any other numeric string, such as a one digit string, a three or more digit
* string, or a two digit string that isn't all digits (for example, "-1"), is
- * interpreted literally. So "01/02/3" or "01/02/003" are parsed, using the
- * same pattern, as Jan 2, 3 AD. Likewise, "01/02/-3" is parsed as Jan 2, 4 BC.
+ * interpreted literally. So "01/02/3" or "01/02/003" are parsed (for the
+ * Gregorian calendar), using the same pattern, as Jan 2, 3 AD. Likewise (but
+ * only in lenient parse mode, the default) "01/02/-3" is parsed as Jan 2, 4 BC.
*
* <p>
* If the year pattern has more than two 'y' characters, the year is
diff --git a/Build/source/libs/icu/icu-49.1/i18n/unicode/udat.h b/Build/source/libs/icu/icu-49.1/i18n/unicode/udat.h
index 3882b28d9f3..c5bf9d68c20 100644
--- a/Build/source/libs/icu/icu-49.1/i18n/unicode/udat.h
+++ b/Build/source/libs/icu/icu-49.1/i18n/unicode/udat.h
@@ -580,10 +580,14 @@ udat_toCalendarDateField(UDateFormatField field);
* and to parse dates in calls to {@link #udat_parse }.
* @param timeStyle The style used to format times; one of UDAT_FULL, UDAT_LONG,
* UDAT_MEDIUM, UDAT_SHORT, UDAT_DEFAULT, or UDAT_NONE (relative time styles
- * are not currently supported)
+ * are not currently supported).
* @param dateStyle The style used to format dates; one of UDAT_FULL, UDAT_LONG,
* UDAT_MEDIUM, UDAT_SHORT, UDAT_DEFAULT, UDAT_FULL_RELATIVE, UDAT_LONG_RELATIVE,
- * UDAT_MEDIUM_RELATIVE, UDAT_SHORT_RELATIVE, or UDAT_NONE
+ * UDAT_MEDIUM_RELATIVE, UDAT_SHORT_RELATIVE, or UDAT_NONE. As currently implemented,
+ * relative date formatting only affects a limited range of calendar days before or
+ * after the current date, based on the CLDR &lt;field type="day"&gt;/&lt;relative&gt; data: For
+ * example, in English, "Yesterday", "Today", and "Tomorrow". Outside of this range,
+ * dates are formatted using the corresponding non-relative style.
* @param locale The locale specifying the formatting conventions
* @param tzID A timezone ID specifying the timezone to use. If 0, use
* the default timezone.
diff --git a/Build/source/libs/icu/icu-49.1/test/intltest/caltest.cpp b/Build/source/libs/icu/icu-49.1/test/intltest/caltest.cpp
index 21fc18cd6fd..018c90f961a 100644
--- a/Build/source/libs/icu/icu-49.1/test/intltest/caltest.cpp
+++ b/Build/source/libs/icu/icu-49.1/test/intltest/caltest.cpp
@@ -18,9 +18,15 @@
#include "unicode/udat.h"
#include "unicode/ustring.h"
#include "cstring.h"
+#include "unicode/localpointer.h"
#define mkcstr(U) u_austrcpy(calloc(8, u_strlen(U) + 1), U)
+#define TEST_CHECK_STATUS {if (U_FAILURE(status)) {errln("%s:%d: Test failure. status=%s", \
+ __FILE__, __LINE__, u_errorName(status)); return;}}
+
+#define TEST_ASSERT(expr) {if ((expr)==FALSE) {errln("%s:%d: Test failure \n", __FILE__, __LINE__);};}
+
// *****************************************************************************
// class CalendarTest
// *****************************************************************************
@@ -265,6 +271,13 @@ void CalendarTest::runIndexedTest( int32_t index, UBool exec, const char* &name,
TestSkippedWallTime();
}
break;
+ case 30:
+ name = "TestCloneLocale";
+ if(exec) {
+ logln("TestCloneLocale---"); logln("");
+ TestCloneLocale();
+ }
+ break;
default: name = ""; break;
}
}
@@ -2649,6 +2662,21 @@ void CalendarTest::TestSkippedWallTime(void) {
}
}
+void CalendarTest::TestCloneLocale(void) {
+ UErrorCode status = U_ZERO_ERROR;
+ LocalPointer<Calendar> cal(Calendar::createInstance(TimeZone::getGMT()->clone(),
+ Locale::createFromName("en"), status));
+ TEST_CHECK_STATUS;
+ Locale l0 = cal->getLocale(ULOC_VALID_LOCALE, status);
+ TEST_CHECK_STATUS;
+ LocalPointer<Calendar> cal2(cal->clone());
+ Locale l = cal2->getLocale(ULOC_VALID_LOCALE, status);
+ if(l0!=l) {
+ errln("Error: cloned locale %s != original locale %s, status %s\n", l0.getName(), l.getName(), u_errorName(status));
+ }
+ TEST_CHECK_STATUS;
+}
+
#endif /* #if !UCONFIG_NO_FORMATTING */
//eof
diff --git a/Build/source/libs/icu/icu-49.1/test/intltest/caltest.h b/Build/source/libs/icu/icu-49.1/test/intltest/caltest.h
index c65ec725d3c..97408df5a36 100644
--- a/Build/source/libs/icu/icu-49.1/test/intltest/caltest.h
+++ b/Build/source/libs/icu/icu-49.1/test/intltest/caltest.h
@@ -235,6 +235,8 @@ public: // package
void TestAmbiguousWallTimeAPIs(void);
void TestRepeatedWallTime(void);
void TestSkippedWallTime(void);
+
+ void TestCloneLocale(void);
};
#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp b/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp
index 91dfa48123a..d8b82b506da 100644
--- a/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp
+++ b/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp
@@ -105,7 +105,8 @@ enum {
FORCE_PREFIX,
LIBNAME,
QUIET,
- WITHOUT_ASSEMBLY
+ WITHOUT_ASSEMBLY,
+ PDS_BUILD
};
/* This sets the modes that are available */
@@ -146,7 +147,8 @@ static UOption options[]={
/*17*/ UOPTION_DEF( "force-prefix", 'f', UOPT_NO_ARG),
/*18*/ UOPTION_DEF( "libname", 'L', UOPT_REQUIRES_ARG),
/*19*/ UOPTION_DEF( "quiet", 'q', UOPT_NO_ARG),
- /*20*/ UOPTION_DEF( "without-assembly", 'w', UOPT_NO_ARG)
+ /*20*/ UOPTION_DEF( "without-assembly", 'w', UOPT_NO_ARG),
+ /*21*/ UOPTION_DEF( "zos-pds-build", 'z', UOPT_NO_ARG)
};
/* This enum and the following char array should be kept in sync. */
@@ -369,6 +371,12 @@ main(int argc, char* argv[]) {
o.quiet = FALSE;
}
+ if(options[PDS_BUILD].doesOccur) {
+ o.pdsbuild = TRUE;
+ } else {
+ o.pdsbuild = FALSE;
+ }
+
o.verbose = options[VERBOSE].doesOccur;
@@ -742,7 +750,13 @@ static int32_t pkg_executeOptions(UPKGOptions *o) {
#if U_PLATFORM != U_PF_OS400
if (!noVersion) {
/* Create symbolic links for the final library file. */
+#if U_PLATFORM == U_PF_OS390
+ if (!o->pdsbuild) {
+ result = pkg_createSymLinks(targetDir, noVersion);
+ }
+#else
result = pkg_createSymLinks(targetDir, noVersion);
+#endif
if (result != 0) {
fprintf(stderr, "Error creating symbolic links of the data library file.\n");
return result;
@@ -864,6 +878,19 @@ static void createFileNames(UPKGOptions *o, const char mode, const char *version
sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s.%s",
libFileNames[LIB_FILE],
pkgDataFlags[SOBJ_EXT]);
+#elif U_PLATFROM == U_PF_OS390
+ if (o->pdsbuild) {
+ sprintf(libFileNames[LIB_FILE], "%s",
+ libName);
+ sprintf(libFileNames[LIB_FILE_VERSION_TMP], "\"%s\"",
+ libFileNames[LIB_FILE]);
+ } else {
+ sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s%s%s.%s",
+ libFileNames[LIB_FILE],
+ pkgDataFlags[LIB_EXT_ORDER][0] == '.' ? "." : "",
+ reverseExt ? version : pkgDataFlags[SOBJ_EXT],
+ reverseExt ? pkgDataFlags[SOBJ_EXT] : version);
+ }
#else
if (noVersion && !reverseExt) {
sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s%s%s",
@@ -1518,7 +1545,15 @@ static int32_t pkg_createWithoutAssemblyCode(UPKGOptions *o, const char *targetD
if (result == 0) {
/* Generate the library file. */
- result = pkg_generateLibraryFile(targetDir, mode, buffer, cmd);
+#if U_PLATFORM == U_PF_OS390
+ if (o->pdsbuild && mode == MODE_DLL) {
+ result = pkg_generateLibraryFile("",mode, buffer, cmd);
+ } else {
+ result = pkg_generateLibraryFile(targetDir,mode, buffer, cmd);
+ }
+#else
+ result = pkg_generateLibraryFile(targetDir,mode, buffer, cmd);
+#endif
}
uprv_free(buffer);
@@ -1542,11 +1577,12 @@ static int32_t pkg_createWindowsDLL(const char mode, const char *gencFilePath, U
if (IN_STATIC_MODE(mode)) {
char staticLibFilePath[SMALL_BUFFER_MAX_SIZE] = "";
- uprv_strcpy(staticLibFilePath, o->tmpDir);
- uprv_strcat(staticLibFilePath, PKGDATA_FILE_SEP_STRING);
-
- uprv_strcat(staticLibFilePath, o->entryName);
- uprv_strcat(staticLibFilePath, LIB_EXT);
+ sprintf(staticLibFilePath, "%s%s%s%s%s",
+ o->targetDir,
+ PKGDATA_FILE_SEP_STRING,
+ (strstr(o->libName, "icudt") ? "s" : ""),
+ o->libName,
+ LIB_EXT);
sprintf(cmd, "%s\"%s\" \"%s\"",
LIB_CMD,
diff --git a/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgtypes.h b/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgtypes.h
index 6203f03da9a..0bba60c517b 100644
--- a/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgtypes.h
+++ b/Build/source/libs/icu/icu-49.1/tools/pkgdata/pkgtypes.h
@@ -1,6 +1,6 @@
/**************************************************************************
*
-* Copyright (C) 2000-2011, International Business Machines
+* Copyright (C) 2000-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
***************************************************************************
@@ -126,6 +126,7 @@ typedef struct UPKGOptions_
UBool verbose;
UBool quiet;
UBool withoutAssembly;
+ UBool pdsbuild; /* for building PDS in z/OS */
} UPKGOptions;
char * convertToNativePathSeparators(char *path);
diff --git a/Build/source/libs/icu/license.html b/Build/source/libs/icu/license.html
index 1e2b1ab592f..d078d0575b9 100644
--- a/Build/source/libs/icu/license.html
+++ b/Build/source/libs/icu/license.html
@@ -11,7 +11,7 @@
<p>COPYRIGHT AND PERMISSION NOTICE</p>
<p>
-Copyright (c) 1995-2011 International Business Machines Corporation and others
+Copyright (c) 1995-2012 International Business Machines Corporation and others
</p>
<p>
All rights reserved.