fallback to 57.1

author: pingplug 2018-02-19 16:24:58 +0800
committer: pingplug 2018-02-19 16:24:58 +0800
commit: f831631e9739a3ecf0a6cdd099636f78476b0625 (patch)
tree: 3033f11bb301b597bfcca967ca23be6a2f2ff364
parent: e7a9f6e25f1a1ea5f86115cda193d24ac17e7cb0 (diff)
download: aur-f831631e9739a3ecf0a6cdd099636f78476b0625.tar.gz
9 files changed, 321 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f5566142c11b..ef942638b80b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,40 @@
 pkgbase = mingw-w64-icu
 	pkgdesc = International Components for Unicode library (mingw-w64)
-	pkgver = 60.2
-	pkgrel = 1
-	url = http://site.icu-project.org
+	pkgver = 57.1
+	pkgrel = 2
+	url = http://www.icu-project.org/
 	arch = any
 	license = custom:icu
 	makedepends = mingw-w64-configure
-	depends = mingw-w64-crt>=5.0.3.20170801
+	depends = mingw-w64-crt
 	options = !buildflags
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = http://download.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz
-	source = https://ssl.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.tgz.asc
+	source = http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz
+	source = 0004-move-to-bin.mingw.patch
+	source = 0007-actually-move-to-bin.mingw.patch
 	source = 0008-data-install-dir.mingw.patch
+	source = 0009-fix-bindir-in-config.mingw.patch
 	source = 0010-msys-rules-for-makefiles.mingw.patch
+	source = 0011-sbin-dir.mingw.patch
 	source = 0012-libprefix.mingw.patch
 	source = 0014-mingwize-pkgdata.mingw.patch
 	source = 0015-debug.mingw.patch
 	source = 0016-icu-pkgconfig.patch
 	source = 0017-icu-config-versioning.patch
-	validpgpkeys = 9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1
-	sha256sums = f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418
-	sha256sums = SKIP
-	sha256sums = 2038881890542797fe1fe9a384cf2bb6c5504b18fb26eab1368f5cb0e6f7f7af
-	sha256sums = 2adfd968379888d919f0dd4e0379cef7b744ba56d98216b82372ed4cd00a2592
-	sha256sums = 128c21c5dbe0364f82a88c2cefad08fb9020d940c022434ee978fb1d9e1a2fa0
-	sha256sums = ac63e11e11fb7c849fbeff0a0008a49942a1e19ffe29385aa70248614c7ffd4d
-	sha256sums = d1745b9d69729cb318cc329847160b50129621f98774a640726a7affd4b2bfd2
-	sha256sums = 8ff9d33de05e34906177ba1ae7ca44c4bab246353919c50f7b201548354602b2
-	sha256sums = f9c6c5ad51a82b547ca34cbd7903c4f0db4c7f6d08867e7fd54c2bcf8ad8ae56
+	md5sums = 976734806026a4ef8bdd17937c8898b9
+	md5sums = 4c8143786ed499184e64fc5a1a1d0fdf
+	md5sums = eb56b72df2ca0dc77261c4f2adc5c8ad
+	md5sums = 9c63125f7bdd88871c89e13ee62ac02b
+	md5sums = 93830d77021eab270e537d466653557e
+	md5sums = cce2427d95bcb4a364df5ab605c3e9a3
+	md5sums = ee93f131a132f7e65d11d15a467b7abc
+	md5sums = f43d08a14a3e723977178fed136e58b1
+	md5sums = 74415f3f3876b5f2f7cea0c5d367c5c6
+	md5sums = d1accfbefbcd399a4a28a4a4e0737915
+	md5sums = 3f13cf5733c4a9363c5823a24d3fba85
+	md5sums = da12188a00025605be0c4ee22d1895bb
 
 pkgname = mingw-w64-icu
 
diff --git a/0004-move-to-bin.mingw.patch b/0004-move-to-bin.mingw.patch
new file mode 100644
index 000000000000..70fdb420adb0
--- /dev/null
+++ b/0004-move-to-bin.mingw.patch
@@ -0,0 +1,20 @@
+--- icu/source/tools/genren/Makefile.orig	2013-10-04 20:49:44.000000000 +0000
++++ icu/source/tools/genren/Makefile	2014-02-01 11:39:37.631753000 +0000
+@@ -30,12 +30,12 @@
+ include $(BUILDDIR)/icudefs.mk
+ endif
+ 
+-COM=$(ICUDIR)/lib/libicuuc.$(SO)
+-I18=$(ICUDIR)/lib/libicui18n.$(SO)
+-LAY=$(ICUDIR)/lib/libicule.$(SO)
+-LEX=$(ICUDIR)/lib/libiculx.$(SO)
++COM=$(ICUDIR)/bin/libicuuc.$(SO)
++I18=$(ICUDIR)/bin/libicui18n.$(SO)
++LAY=$(ICUDIR)/bin/libicule.$(SO)
++LEX=$(ICUDIR)/bin/libiculx.$(SO)
+ DAT=$(ICUDIR)/stubdata/libicudata.$(SO)
+-UIO=$(ICUDIR)/lib/libicuio.$(SO)
++UIO=$(ICUDIR)/bin/libicuio.$(SO)
+ 
+ LIBS=$(COM) $(I18) $(LAY) $(LEX) $(UIO)
+ 
diff --git a/0007-actually-move-to-bin.mingw.patch b/0007-actually-move-to-bin.mingw.patch
new file mode 100644
index 000000000000..77c8e80232c9
--- /dev/null
+++ b/0007-actually-move-to-bin.mingw.patch
@@ -0,0 +1,184 @@
+--- icu/source/common/Makefile.in.orig	2013-10-04 20:49:26.000000000 +0000
++++ icu/source/common/Makefile.in	2014-02-01 13:20:07.278920900 +0000
+@@ -141,16 +141,16 @@
+ install-local: install-headers install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+--- icu/source/i18n/Makefile.in.orig	2013-10-04 20:48:52.000000000 +0000
++++ icu/source/i18n/Makefile.in	2014-02-01 13:22:41.831046600 +0000
+@@ -121,16 +121,16 @@
+ install-local: install-headers install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+--- icu/source/io/Makefile.in.orig	2013-10-04 20:50:00.000000000 +0000
++++ icu/source/io/Makefile.in	2014-02-01 13:23:27.458340500 +0000
+@@ -94,16 +94,16 @@
+ install-local: install-headers install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+--- icu/source/layout/Makefile.in.orig	2013-10-04 20:54:54.000000000 +0000
++++ icu/source/layout/Makefile.in	2014-02-01 13:24:13.288160100 +0000
+@@ -178,16 +178,16 @@
+ install-local: install-headers install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+--- icu/source/layoutex/Makefile.in.orig	2013-10-04 20:54:46.000000000 +0000
++++ icu/source/layoutex/Makefile.in	2014-02-01 13:25:00.140109600 +0000
+@@ -95,16 +95,16 @@
+ install-local: install-headers install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+--- icu/source/stubdata/Makefile.in.orig	2013-10-04 20:50:02.000000000 +0000
++++ icu/source/stubdata/Makefile.in	2014-02-01 13:25:36.860772500 +0000
+@@ -80,16 +80,16 @@
+ install-local: install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+--- icu/source/tools/ctestfw/Makefile.in.orig	2013-10-04 20:49:32.000000000 +0000
++++ icu/source/tools/ctestfw/Makefile.in	2014-02-01 13:58:35.642045800 +0000
+@@ -76,16 +76,16 @@
+ install-local: install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+--- icu/source/tools/toolutil/Makefile.in.orig	2013-10-04 20:49:40.000000000 +0000
++++ icu/source/tools/toolutil/Makefile.in	2014-02-01 13:59:28.907309700 +0000
+@@ -87,16 +87,16 @@
+ install-local: install-library
+ 
+ install-library: all-local
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir)
+ ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
+-	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
++	cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
+ 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)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
+ endif
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
diff --git a/0009-fix-bindir-in-config.mingw.patch b/0009-fix-bindir-in-config.mingw.patch
new file mode 100644
index 000000000000..2f6420b169fd
--- /dev/null
+++ b/0009-fix-bindir-in-config.mingw.patch
@@ -0,0 +1,11 @@
+--- icu/source/config/icu-config-bottom.orig	2013-10-04 20:50:00.000000000 +0000
++++ icu/source/config/icu-config-bottom	2014-02-01 15:33:11.255757200 +0000
+@@ -3,7 +3,7 @@
+ ## Copyright (c) 2002-2013, International Business Machines Corporation and
+ ## others. All Rights Reserved.
+ 
+-ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}"
++ICUUC_FILE="${bindir}/${ICULIBS_COMMON_LIB_NAME}"
+ ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}"
+ 
+ #  echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
diff --git a/0011-sbin-dir.mingw.patch b/0011-sbin-dir.mingw.patch
new file mode 100644
index 000000000000..7cba9de2593e
--- /dev/null
+++ b/0011-sbin-dir.mingw.patch
@@ -0,0 +1,28 @@
+--- icu/source/config/mh-mingw.orig	2014-02-06 18:07:17.886923700 +0000
++++ icu/source/config/mh-mingw	2014-02-06 18:11:32.766789400 +0000
+@@ -8,11 +8,6 @@
+ # This file is similar to mh-mingw64
+ # Any changes made here may also need to be made in mh-mingw64
+ 
+-# We install sbin tools into the same bin directory because
+-# pkgdata needs some of the tools in sbin, and we can't always depend on
+-# icu-config working on Windows.
+-sbindir=$(bindir)
+-
+ ## Commands to generate dependency files
+ GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
+ GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+--- icu/source/config/mh-mingw64.orig	2014-02-06 18:07:17.888423900 +0000
++++ icu/source/config/mh-mingw64	2014-02-06 18:11:37.160847300 +0000
+@@ -8,11 +8,6 @@
+ # This file is similar to mh-mingw
+ # Any changes made here may also need to be made in mh-mingw
+ 
+-# We install sbin tools into the same bin directory because
+-# pkgdata needs some of the tools in sbin, and we can't always depend on
+-# icu-config working on Windows.
+-sbindir=$(bindir)
+-
+ ## Commands to generate dependency files
+ GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
+ GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
diff --git a/0012-libprefix.mingw.patch b/0012-libprefix.mingw.patch
index 20e8c7bab6f8..7f01e93d4129 100644
--- a/0012-libprefix.mingw.patch
+++ b/0012-libprefix.mingw.patch
@@ -12,7 +12,21 @@ diff -urN icu.orig/source/config/mh-mingw icu/source/config/mh-mingw
  
  ## Compiler switch to embed a runtime search path
  LD_RPATH=	
-@@ -61,7 +61,7 @@
+@@ -61,19 +61,19 @@
+ endif
+ 
+ # Static library prefix and file extension
+-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
++LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ 
+ ## An import library is needed for z/OS and MSVC
+ IMPORT_LIB_EXT = .dll.a
+ 
+-LIBPREFIX=
++LIBPREFIX=lib
+ 
+ # Change the stubnames so that poorly working FAT disks and installation programs can work.
  # This is also for backwards compatibility.
  DATA_STUBNAME = dt
  I18N_STUBNAME = in
diff --git a/0016-icu-pkgconfig.patch b/0016-icu-pkgconfig.patch
index f3dadda00d98..49d25024aa8f 100644
--- a/0016-icu-pkgconfig.patch
+++ b/0016-icu-pkgconfig.patch
@@ -1,6 +1,12 @@
 --- icu-54_1/source/icudefs.mk.in.orig	2012-11-05 20:18:14 +0300
 +++ icu-54_1/source/icudefs.mk.in	2012-12-17 10:29:24 +0300
-@@ -262,13 +262,13 @@
+@@ -262,18 +262,18 @@
+ USING_ICULEHB=no
+ ICULEHB_TRUE=#
+ ICULEHB_FALSE=
+-ICULIBS_LE	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
++ICULIBS_LE	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)
+ ICULE_CFLAGS=-I$(top_srcdir)
  endif
  
  # Just the libs.
diff --git a/0017-icu-config-versioning.patch b/0017-icu-config-versioning.patch
index 130b61ce5ecd..67cb89b96876 100644
--- a/0017-icu-config-versioning.patch
+++ b/0017-icu-config-versioning.patch
@@ -42,7 +42,7 @@
  #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 
 --- icu/source/config/Makefile.inc.in.orig	2015-07-29 14:34:44.358696500 +0300
 +++ icu/source/config/Makefile.inc.in	2015-07-29 14:35:15.641567900 +0300
-@@ -106,14 +106,14 @@
+@@ -106,15 +106,15 @@
  #    - $(ICULIBS_LAYOUT)  - ICU layout library. 
  #    - $(ICULIBS_ICUIO)   - ICU stdio equivalent library
  
@@ -53,6 +53,7 @@
 -ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 -ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 -ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
+-ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 -ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
 +ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)
 +ICULIBS_DATA   = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
@@ -61,6 +62,7 @@
 +ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)
 +ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)
 +ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)
++ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)
 +ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)
  ICULIBS_BASE = -L$(libdir)
  
diff --git a/PKGBUILD b/PKGBUILD
index 5d1916576f84..a0dfc3ad33e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,51 @@
-# Maintainer: pingplug <pingplug@foxmail.com>
-# Contributor: Schala Zeal <schalaalexiazeal@gmail.com>
 # Contributor: ant32 <antreimer@gmail.com>
 # Contributor: Alexey Pavlov <Alexpux@gmail.com>
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
-
 _realname=icu
 pkgname=mingw-w64-${_realname}
-pkgver=60.2
-pkgrel=1
+pkgver=57.1
+pkgrel=2
 arch=(any)
 pkgdesc="International Components for Unicode library (mingw-w64)"
-url="http://site.icu-project.org"
+url="http://www.icu-project.org/"
 license=("custom:icu")
-depends=('mingw-w64-crt>=5.0.3.20170801')
+depends=(mingw-w64-crt)
 makedepends=(mingw-w64-configure)
 options=(!buildflags staticlibs !strip !emptydirs)
 source=("http://download.icu-project.org/files/icu4c/${pkgver}/icu4c-${pkgver//./_}-src.tgz"
-        "https://ssl.icu-project.org/files/icu4c/${pkgver}/icu4c-${pkgver//./_}-src.tgz.asc"
-        "0008-data-install-dir.mingw.patch"
-        "0010-msys-rules-for-makefiles.mingw.patch"
-        "0012-libprefix.mingw.patch"
-        "0014-mingwize-pkgdata.mingw.patch"
-        "0015-debug.mingw.patch"
-        "0016-icu-pkgconfig.patch"
-        "0017-icu-config-versioning.patch")
-sha256sums=('f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418'
-            'SKIP'
-            '2038881890542797fe1fe9a384cf2bb6c5504b18fb26eab1368f5cb0e6f7f7af'
-            '2adfd968379888d919f0dd4e0379cef7b744ba56d98216b82372ed4cd00a2592'
-            '128c21c5dbe0364f82a88c2cefad08fb9020d940c022434ee978fb1d9e1a2fa0'
-            'ac63e11e11fb7c849fbeff0a0008a49942a1e19ffe29385aa70248614c7ffd4d'
-            'd1745b9d69729cb318cc329847160b50129621f98774a640726a7affd4b2bfd2'
-            '8ff9d33de05e34906177ba1ae7ca44c4bab246353919c50f7b201548354602b2'
-            'f9c6c5ad51a82b547ca34cbd7903c4f0db4c7f6d08867e7fd54c2bcf8ad8ae56')
-validpgpkeys=("9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1")
-
+"0004-move-to-bin.mingw.patch"
+"0007-actually-move-to-bin.mingw.patch"
+"0008-data-install-dir.mingw.patch"
+"0009-fix-bindir-in-config.mingw.patch"
+"0010-msys-rules-for-makefiles.mingw.patch"
+"0011-sbin-dir.mingw.patch"
+"0012-libprefix.mingw.patch"
+"0014-mingwize-pkgdata.mingw.patch"
+"0015-debug.mingw.patch"
+"0016-icu-pkgconfig.patch"
+"0017-icu-config-versioning.patch")
+md5sums=('976734806026a4ef8bdd17937c8898b9'
+         '4c8143786ed499184e64fc5a1a1d0fdf'
+         'eb56b72df2ca0dc77261c4f2adc5c8ad'
+         '9c63125f7bdd88871c89e13ee62ac02b'
+         '93830d77021eab270e537d466653557e'
+         'cce2427d95bcb4a364df5ab605c3e9a3'
+         'ee93f131a132f7e65d11d15a467b7abc'
+         'f43d08a14a3e723977178fed136e58b1'
+         '74415f3f3876b5f2f7cea0c5d367c5c6'
+         'd1accfbefbcd399a4a28a4a4e0737915'
+         '3f13cf5733c4a9363c5823a24d3fba85'
+         'da12188a00025605be0c4ee22d1895bb')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd icu
+  patch -p1 -i ../0004-move-to-bin.mingw.patch
+  patch -p1 -i ../0007-actually-move-to-bin.mingw.patch
   patch -p1 -i ../0008-data-install-dir.mingw.patch
+  patch -p1 -i ../0009-fix-bindir-in-config.mingw.patch
   patch -p1 -i ../0010-msys-rules-for-makefiles.mingw.patch
+  patch -p1 -i ../0011-sbin-dir.mingw.patch
   patch -p1 -i ../0012-libprefix.mingw.patch
   patch -p1 -i ../0014-mingwize-pkgdata.mingw.patch
   patch -p1 -i ../0015-debug.mingw.patch
@@ -67,7 +72,7 @@ build() {
       --enable-release \
       --disable-tests \
       --disable-samples
-    make
+    make -j1
     popd
   done
 }
author	pingplug	2018-02-19 16:24:58 +0800
committer	pingplug	2018-02-19 16:24:58 +0800
commit	f831631e9739a3ecf0a6cdd099636f78476b0625 (patch)
tree	3033f11bb301b597bfcca967ca23be6a2f2ff364
parent	e7a9f6e25f1a1ea5f86115cda193d24ac17e7cb0 (diff)
download	aur-f831631e9739a3ecf0a6cdd099636f78476b0625.tar.gz