From 86ebd15ffb2cfb977409eae370758bdff2f9bfca Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 6 May 2014 10:54:51 -0700
Subject: [PATCH] Update to ICU 53.1

---
 .gitmodules                         | 4 ++--
 build/BuildTasks/DownloadTgzFile.cs | 9 ++++-----
 build/icu/icu.vcxproj               | 9 ++++-----
 vendor/icu                          | 2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 2dc8ef170..780c5cfca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,8 +38,8 @@
 	branch = master
 [submodule "icu"]
 	path = vendor/icu
-	url = git://github.com/sillsdev/icu4c.git
-	branch = trunk
+	url = git://github.com/svn2github/icu4c.git
+	branch = master
 	ignore = dirty
 [submodule "boost"]
 	path = vendor/boost
diff --git a/build/BuildTasks/DownloadTgzFile.cs b/build/BuildTasks/DownloadTgzFile.cs
index f829018bf..aee359034 100644
--- a/build/BuildTasks/DownloadTgzFile.cs
+++ b/build/BuildTasks/DownloadTgzFile.cs
@@ -17,16 +17,15 @@
 namespace BuildTasks {
     public class DownloadTgzFile : Microsoft.Build.Utilities.Task {
         public string Url { get; set; }
-        public string Destination { get; set; }
         public string OutputFile { get; set; }
         public string Hash { get; set; }
 
         private void DownloadArchive(string url, string unpackDest) {
             var downloadStream = new System.Net.WebClient().OpenRead(url);
             var gzStream = new ICSharpCode.SharpZipLib.GZip.GZipInputStream(downloadStream);
-            var tarStream = new ICSharpCode.SharpZipLib.Tar.TarInputStream(gzStream);
-            var tarArchive = ICSharpCode.SharpZipLib.Tar.TarArchive.CreateInputTarArchive(tarStream);
-            tarArchive.ExtractContents(unpackDest);
+            using (var file = System.IO.File.Create(unpackDest)) {
+                gzStream.CopyTo(file);
+            }
         }
 
         public override bool Execute() {
@@ -42,7 +41,7 @@ namespace BuildTasks {
             }
 
             try {
-                DownloadArchive(this.Url, this.Destination);
+                DownloadArchive(this.Url, this.OutputFile);
             }
             catch (System.Exception e) {
                 this.Log.LogErrorFromException(e);
diff --git a/build/icu/icu.vcxproj b/build/icu/icu.vcxproj
index f41c3569a..4f589b953 100644
--- a/build/icu/icu.vcxproj
+++ b/build/icu/icu.vcxproj
@@ -82,12 +82,11 @@
     >
 
     <!-- Generated with http://apps.icu-project.org/datacustom/ -->
-    <!-- Includes Break Iterator and Collator data only -->
+    <!-- Includes Break Iterator and Display Name data only -->
     <DownloadTgzFile
-      Url="http://www.aegisub.org/~plorkyeran/icudt52l.dat.tgz"
-      Destination="$(MSBuildThisFileDirectory)..\..\vendor\icu\source\data\in"
-      OutputFile="$(MSBuildThisFileDirectory)..\..\vendor\icu\source\data\in\icudt52l.dat"
-      Hash="b611a32e857ab4474e3c0118bd09b0958026fe1d"
+      Url="http://www.aegisub.org/~plorkyeran/icudt53l.dat.gz"
+      OutputFile="$(MSBuildThisFileDirectory)..\..\vendor\icu\source\data\in\icudt53l.dat"
+      Hash="6b4244cdad08804fbb9c4f53e5fbf212321b80d1"
       />
 
     <ExecShellScript
diff --git a/vendor/icu b/vendor/icu
index 51ec27927..061be17bd 160000
--- a/vendor/icu
+++ b/vendor/icu
@@ -1 +1 @@
-Subproject commit 51ec279270332aba5e8723d81d1a780072ed518c
+Subproject commit 061be17bd589bb65d37b70c23513ab530cad7821