From 37be5e57bc74dbf608b64354e1be03bb26ed3ff1 Mon Sep 17 00:00:00 2001
From: Hirokazu MORIKAWA <morikw2@gmail.com>
Date: Tue, 7 Nov 2017 10:44:57 +0900
Subject: [PATCH] icu: bump to 60.1

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
---
 libs/icu/Makefile                             |  8 +++---
 .../000-dont-cpy-files-from-topdirs.patch     |  2 +-
 libs/icu/patches/001-disable-strtod_l.patch   | 26 -------------------
 libs/icu/patches/CVE-2017-14952.patch         | 10 -------
 4 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 libs/icu/patches/001-disable-strtod_l.patch
 delete mode 100644 libs/icu/patches/CVE-2017-14952.patch

diff --git a/libs/icu/Makefile b/libs/icu/Makefile
index 2bed85af89..9d25f3a0eb 100644
--- a/libs/icu/Makefile
+++ b/libs/icu/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icu4c
-PKG_VERSION:=59.1
-PKG_RELEASE:=3
+PKG_VERSION:=60.1
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-59_1-src.tgz
+PKG_SOURCE:=$(PKG_NAME)-60_1-src.tgz
 PKG_SOURCE_URL:=http://download.icu-project.org/files/$(PKG_NAME)/$(PKG_VERSION)
-PKG_HASH:=7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe
+PKG_HASH:=f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
 
 PKG_LICENSE:=ICU-1.8.1+
 PKG_LICENSE_FILES:=LICENSE
diff --git a/libs/icu/patches/000-dont-cpy-files-from-topdirs.patch b/libs/icu/patches/000-dont-cpy-files-from-topdirs.patch
index 291530a530..cada77ff23 100644
--- a/libs/icu/patches/000-dont-cpy-files-from-topdirs.patch
+++ b/libs/icu/patches/000-dont-cpy-files-from-topdirs.patch
@@ -2,7 +2,7 @@ diff --git a/Makefile.in b/Makefile.in
 index 9db6c52..6aa2273 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -184,7 +184,6 @@ install-icu: $(INSTALLED_BUILT_FILES)
+@@ -186,7 +186,6 @@ install-icu: $(INSTALLED_BUILT_FILES)
  	$(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
  	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
  	$(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
diff --git a/libs/icu/patches/001-disable-strtod_l.patch b/libs/icu/patches/001-disable-strtod_l.patch
deleted file mode 100644
index 7ee9732ac7..0000000000
--- a/libs/icu/patches/001-disable-strtod_l.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -883,8 +883,8 @@
- AC_CHECK_FUNC(strtod_l)
- if test x$ac_cv_func_strtod_l = xyes
- then
--     CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=1"
--     U_HAVE_STRTOD_L=1
-+     CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=0"
-+     U_HAVE_STRTOD_L=0
- else
-      CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=0"
-      U_HAVE_STRTOD_L=0
---- a/configure
-+++ b/configure
-@@ -7093,8 +7093,8 @@
- 
- if test x$ac_cv_func_strtod_l = xyes
- then
--     CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=1"
--     U_HAVE_STRTOD_L=1
-+     CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=0"
-+     U_HAVE_STRTOD_L=0
- else
-      CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_STRTOD_L=0"
-      U_HAVE_STRTOD_L=0
diff --git a/libs/icu/patches/CVE-2017-14952.patch b/libs/icu/patches/CVE-2017-14952.patch
deleted file mode 100644
index f353ac7746..0000000000
--- a/libs/icu/patches/CVE-2017-14952.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: source/i18n/zonemeta.cpp
-===================================================================
---- source/i18n/zonemeta.cpp	(revision 40283)
-+++ source/i18n/zonemeta.cpp	(revision 40324)
-@@ -691,5 +691,4 @@
-                     if (U_FAILURE(status)) {
-                         delete mzMappings;
--                        deleteOlsonToMetaMappingEntry(entry);
-                         uprv_free(entry);
-                         break;
-- 
2.30.2