summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-07 10:23:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-07 10:23:48 +0000
commite2d328d170969e328e39b9613ab2bb406b19a078 (patch)
tree6d58dc11f63575091bcccac092ca3968110f1954 /Build/source/libs
parentae68a6040db385f84e19fefeac39c1b85ef80a9e (diff)
icu-50.1: Bugfix required for MinGW (and MSVC?)
git-svn-id: svn://tug.org/texlive/trunk@28201 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog2
-rw-r--r--Build/source/libs/icu/icu-50.1-PATCHES/patch-83-zonemeta-bugfix14
-rw-r--r--Build/source/libs/icu/icu-50.1/i18n/zonemeta.cpp4
3 files changed, 18 insertions, 2 deletions
diff --git a/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog
index 58d2d5aa2db..81466d67ca9 100644
--- a/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog
@@ -3,6 +3,8 @@
Updated icu-50.1 source tree (icu4c-50_1-src.tgz) from:
http://download.icu-project.org/files/icu4c/50.1/
+ * patch-83-zonemeta-bugfix (new): Required for MinGW.
+
2012-10-24 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported icu-50.1 source tree (icu4c-50_rc-src.tgz) from:
diff --git a/Build/source/libs/icu/icu-50.1-PATCHES/patch-83-zonemeta-bugfix b/Build/source/libs/icu/icu-50.1-PATCHES/patch-83-zonemeta-bugfix
new file mode 100644
index 00000000000..8d61b0b9fae
--- /dev/null
+++ b/Build/source/libs/icu/icu-50.1-PATCHES/patch-83-zonemeta-bugfix
@@ -0,0 +1,14 @@
+diff -ur icu-50.1.orig/source/i18n/zonemeta.cpp icu-50.1/source/i18n/zonemeta.cpp
+--- icu-50.1.orig/source/i18n/zonemeta.cpp 2012-11-05 18:14:14.000000000 +0100
++++ icu-50.1/source/i18n/zonemeta.cpp 2012-11-07 11:13:56.000000000 +0100
+@@ -876,8 +876,8 @@
+ id.append((UChar)0x2B); // '+'
+ }
+ // Always use US-ASCII digits
+- id.append((UChar)0x30 + (hour%100)/10);
+- id.append((UChar)0x30 + (hour%10));
++ id.append((UChar)(0x30 + (hour%100)/10));
++ id.append((UChar)(0x30 + (hour%10)));
+ id.append((UChar)0x3A); // ':'
+ id.append((UChar)(0x30 + (min%100)/10));
+ id.append((UChar)(0x30 + (min%10)));
diff --git a/Build/source/libs/icu/icu-50.1/i18n/zonemeta.cpp b/Build/source/libs/icu/icu-50.1/i18n/zonemeta.cpp
index 34cc484da9e..c689b816740 100644
--- a/Build/source/libs/icu/icu-50.1/i18n/zonemeta.cpp
+++ b/Build/source/libs/icu/icu-50.1/i18n/zonemeta.cpp
@@ -876,8 +876,8 @@ ZoneMeta::formatCustomID(uint8_t hour, uint8_t min, uint8_t sec, UBool negative,
id.append((UChar)0x2B); // '+'
}
// Always use US-ASCII digits
- id.append((UChar)0x30 + (hour%100)/10);
- id.append((UChar)0x30 + (hour%10));
+ id.append((UChar)(0x30 + (hour%100)/10));
+ id.append((UChar)(0x30 + (hour%10)));
id.append((UChar)0x3A); // ':'
id.append((UChar)(0x30 + (min%100)/10));
id.append((UChar)(0x30 + (min%10)));