From 2a6192fff0bf9ba2b41008a04a8c5a1cb4c3e3ce Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Mon, 20 Jul 2020 12:41:58 +0300
Subject: [PATCH] icu: Update to 67.1

---
 icu/PKGBUILD                         | 8 ++++----
 icu/icu-59.1-msys2.patch             | 2 +-
 icu/toolutil-Makefile-ln-force.patch | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/icu/PKGBUILD b/icu/PKGBUILD
index 85c188c8..581712df 100644
--- a/icu/PKGBUILD
+++ b/icu/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=icu
 pkgname=('icu' 'icu-devel')
-pkgver=65.1
+pkgver=67.1
 pkgrel=1
 pkgdesc="International Components for Unicode library"
 arch=('i686' 'x86_64')
@@ -12,9 +12,9 @@ depends=('gcc-libs' 'sh')
 source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
         toolutil-Makefile-ln-force.patch
         icu-59.1-msys2.patch)
-sha256sums=('53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948'
-            'e85928a287a73cb24f4bd8b891bb10636cda27c09bae01fc003d8bee2dda8986'
-            '8192c4460a5194fb83da4d215ad98f7d8fe1a02b9787edc45f5f2189e4136704')
+sha256sums=('94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc'
+            '6fa1294880ea24263d010f9a1aacc52fdd663f552baa92a0046fbfb80a267463'
+            'f3279572b38aa3182d526932e74c8c166253732088fe978e3be6503aa422e15a')
 
 prepare() {
   cd ${srcdir}/icu/source
diff --git a/icu/icu-59.1-msys2.patch b/icu/icu-59.1-msys2.patch
index a4007d20..19d9f7b3 100644
--- a/icu/icu-59.1-msys2.patch
+++ b/icu/icu-59.1-msys2.patch
@@ -458,7 +458,7 @@ diff -durN icu.orig/source/runConfigureICU icu/source/runConfigureICU
      MacOSX              Use the default compilers on MacOS X (Darwin)
      MacOSX/GCC          Use the GNU gcc/g++ compilers on MacOSX (Darwin)
      MinGW               Use the GNU gcc/g++ compilers on MinGW
-+	MSYS                Use the GNU gcc/g++ compilers on MSYS
++    MSYS                Use the GNU gcc/g++ compilers on MSYS
      MSYS/MSVC           Use the Microsoft Visual C++ computer on MSYS
      QNX                 Use the QNX QCC compiler on QNX/Neutrino
      Solaris             Use the Sun cc/CC compilers on Solaris
diff --git a/icu/toolutil-Makefile-ln-force.patch b/icu/toolutil-Makefile-ln-force.patch
index ddb9b6d1..b199af77 100644
--- a/icu/toolutil-Makefile-ln-force.patch
+++ b/icu/toolutil-Makefile-ln-force.patch
@@ -1,8 +1,8 @@
 diff -durN icu.orig/source/tools/toolutil/Makefile.in icu/source/tools/toolutil/Makefile.in
 --- icu.orig/source/tools/toolutil/Makefile.in	2017-03-17 03:01:12.000000000 +0800
 +++ icu/source/tools/toolutil/Makefile.in	2017-05-17 14:54:15.562500000 +0800
-@@ -96,18 +96,18 @@
- ifneq ($(ENABLE_SHARED),)
+@@ -96,19 +96,19 @@
+ else
  	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
  ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
 -	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
@@ -10,6 +10,7 @@ diff -durN icu.orig/source/tools/toolutil/Makefile.in icu/source/tools/toolutil/
  ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
 -	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
 +	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -sf $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
  endif
  endif
  ifneq ($(IMPORT_LIB_EXT),)