summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpingplug2018-10-20 16:05:33 +0800
committerpingplug2018-10-20 16:05:33 +0800
commitcbd9b692ea53b1d10f9dc698e446332f851d65cb (patch)
treea71cfe65a097c845f86020605e02e7affda3b275
parentbc1f42c08b5690ed67701dbdc37d10037005a980 (diff)
downloadaur-cbd9b692ea53b1d10f9dc698e446332f851d65cb.tar.gz
Updated to 63.1
Diffstat
-rw-r--r--.SRCINFO36
-rw-r--r--0004-move-to-bin.mingw.patch19
-rw-r--r--0007-actually-move-to-bin.mingw.patch168
-rw-r--r--0008-data-install-dir.mingw.patch7
-rw-r--r--0009-fix-bindir-in-config.mingw.patch12
-rw-r--r--0010-msys-rules-for-makefiles.mingw.patch14
-rw-r--r--0011-sbin-dir.mingw.patch30
-rw-r--r--0012-libprefix.mingw.patch32
-rw-r--r--0014-mingwize-pkgdata.mingw.patch18
-rw-r--r--0015-debug.mingw.patch31
-rw-r--r--0016-icu-pkgconfig.patch15
-rw-r--r--0017-icu-config-versioning.patch65
-rw-r--r--0021-mingw-static-libraries-without-s.patch26
-rw-r--r--0022-fix-namespace.patch52
-rw-r--r--PKGBUILD41
15 files changed, 461 insertions, 105 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8b27c166fcfa..93649ae716a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-icu
pkgdesc = International Components for Unicode library (mingw-w64)
- pkgver = 62.1
+ pkgver = 63.1
pkgrel = 1
url = http://site.icu-project.org
arch = any
@@ -10,25 +10,37 @@ pkgbase = mingw-w64-icu
options = !strip
options = staticlibs
options = !buildflags
- source = http://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz
- source = https://ssl.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz.asc
+ source = http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
+ source = https://ssl.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz.asc
+ 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 = FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7
- sha256sums = 3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3
+ source = 0021-mingw-static-libraries-without-s.patch
+ source = 0022-fix-namespace.patch
+ validpgpkeys = E4098B78AFC94394F3F49AA903996C7C83F12F11
+ sha256sums = 05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
sha256sums = SKIP
- sha256sums = 2038881890542797fe1fe9a384cf2bb6c5504b18fb26eab1368f5cb0e6f7f7af
- sha256sums = 2adfd968379888d919f0dd4e0379cef7b744ba56d98216b82372ed4cd00a2592
- sha256sums = 128c21c5dbe0364f82a88c2cefad08fb9020d940c022434ee978fb1d9e1a2fa0
- sha256sums = ac63e11e11fb7c849fbeff0a0008a49942a1e19ffe29385aa70248614c7ffd4d
- sha256sums = d1745b9d69729cb318cc329847160b50129621f98774a640726a7affd4b2bfd2
- sha256sums = 8ff9d33de05e34906177ba1ae7ca44c4bab246353919c50f7b201548354602b2
- sha256sums = f9c6c5ad51a82b547ca34cbd7903c4f0db4c7f6d08867e7fd54c2bcf8ad8ae56
+ sha256sums = 0b6f5ea91bb579f03cdfa2737719411e3207169f5921ffeea8564cf24fa46715
+ sha256sums = a32b3fae6a59599c942e5f8bc2d29416aaedca0ce2832c857ecf99eb7529cee1
+ sha256sums = f437f25a62420856ed234d2b33672b860ae00106cb5d4ccc682f5ff15176aeaf
+ sha256sums = c84fda5b32edcbf062d629bbf04c47e73e7b9620f4dae752c1c0c25f49124ca8
+ sha256sums = 1cf7fd08bad22f39441213d54f0659a3046e163729aa4cd6ff393602ec22c285
+ sha256sums = 4f4787caeccf70607cf0cbde0c005f05f5c6de1543265a927839122405b4054f
+ sha256sums = e7ecdafe85e18a4a4b5f29bbfde38776521a848e5b65089a2379b90e59f1592d
+ sha256sums = 426f2dc16a8f12c2aa91f6b2ab0533b41efdf60c946f14e267a5868af558dc4f
+ sha256sums = 0181f9ff8b7dd0a423869d8772da0a4feea64188347eb0dee7eb059aea92131c
+ sha256sums = 87ebe8962f8c387714f2a697a664a0c49aed2331b988548069d0c211abc36e05
+ sha256sums = 5247102df5604671c33a6e7226e5135a6b48049550861b892f0686dcefec4329
+ sha256sums = d8612f40b1731d9a94290afcf80c896184a2f15b8ae8f23b3643c64f6cabfa2f
+ sha256sums = a033641dd0456b74d136fb9441e01dafee555b140d4879853490b78a64b5a110
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..f9274e7760bb
--- /dev/null
+++ b/0004-move-to-bin.mingw.patch
@@ -0,0 +1,19 @@
+diff -Naur icu-orig/source/tools/genren/Makefile icu/source/tools/genren/Makefile
+--- icu-orig/source/tools/genren/Makefile 2016-09-21 09:07:26.000000000 +0300
++++ icu/source/tools/genren/Makefile 2018-03-01 10:09:05.338601800 +0300
+@@ -32,11 +32,11 @@
+ include $(BUILDDIR)/icudefs.mk
+ endif
+
+-COM=$(ICUDIR)/lib/libicuuc.$(SO)
+-I18=$(ICUDIR)/lib/libicui18n.$(SO)
+-LEX=$(ICUDIR)/lib/libiculx.$(SO)
++COM=$(ICUDIR)/bin/libicuuc.$(SO)
++I18=$(ICUDIR)/bin/libicui18n.$(SO)
++LEX=$(ICUDIR)/bin/libiculx.$(SO)
+ DAT=$(ICUDIR)/stubdata/libicudata.$(SO)
+-UIO=$(ICUDIR)/lib/libicuio.$(SO)
++UIO=$(ICUDIR)/bin/libicuio.$(SO)
+
+ LIBS=$(COM) $(I18) $(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..4fd9fd682f5d
--- /dev/null
+++ b/0007-actually-move-to-bin.mingw.patch
@@ -0,0 +1,168 @@
+diff -Naur icu-orig/source/common/Makefile.in icu/source/common/Makefile.in
+--- icu-orig/source/common/Makefile.in 2016-09-09 19:41:15.000000000 +0300
++++ icu/source/common/Makefile.in 2018-03-01 10:09:13.513016200 +0300
+@@ -147,16 +147,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),)
+diff -Naur icu-orig/source/i18n/Makefile.in icu/source/i18n/Makefile.in
+--- icu-orig/source/i18n/Makefile.in 2016-09-14 01:15:13.000000000 +0300
++++ icu/source/i18n/Makefile.in 2018-03-01 10:09:13.528616200 +0300
+@@ -135,16 +135,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),)
+diff -Naur icu-orig/source/io/Makefile.in icu/source/io/Makefile.in
+--- icu-orig/source/io/Makefile.in 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/io/Makefile.in 2018-03-01 10:09:13.825016700 +0300
+@@ -96,16 +96,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),)
+diff -Naur icu-orig/source/layoutex/Makefile.in icu/source/layoutex/Makefile.in
+--- icu-orig/source/layoutex/Makefile.in 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/layoutex/Makefile.in 2018-03-01 10:09:13.856216800 +0300
+@@ -109,16 +109,16 @@
+ endif
+
+ 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 -Naur icu-orig/source/stubdata/Makefile.in icu/source/stubdata/Makefile.in
+--- icu-orig/source/stubdata/Makefile.in 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/stubdata/Makefile.in 2018-03-01 10:09:13.887416800 +0300
+@@ -82,16 +82,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 -Naur icu-orig/source/tools/ctestfw/Makefile.in icu/source/tools/ctestfw/Makefile.in
+--- icu-orig/source/tools/ctestfw/Makefile.in 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/tools/ctestfw/Makefile.in 2018-03-01 10:09:13.918616900 +0300
+@@ -78,16 +78,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 -Naur icu-orig/source/tools/toolutil/Makefile.in icu/source/tools/toolutil/Makefile.in
+--- icu-orig/source/tools/toolutil/Makefile.in 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/tools/toolutil/Makefile.in 2018-03-01 10:09:13.981017000 +0300
+@@ -89,16 +89,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/0008-data-install-dir.mingw.patch b/0008-data-install-dir.mingw.patch
index ecba9a53c5fe..53ed0f9645f7 100644
--- a/0008-data-install-dir.mingw.patch
+++ b/0008-data-install-dir.mingw.patch
@@ -1,6 +1,7 @@
---- icu/source/data/Makefile.in.orig 2013-10-04 20:54:44.000000000 +0000
-+++ icu/source/data/Makefile.in 2014-02-01 13:37:24.732160800 +0000
-@@ -203,7 +203,7 @@
+diff -Naur icu-orig/source/data/Makefile.in icu/source/data/Makefile.in
+--- icu-orig/source/data/Makefile.in 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/data/Makefile.in 2018-03-01 10:09:15.837420200 +0300
+@@ -213,7 +213,7 @@
endif
ifneq ($(ENABLE_STATIC),)
ifeq ($(PKGDATA_MODE),dll)
diff --git a/0009-fix-bindir-in-config.mingw.patch b/0009-fix-bindir-in-config.mingw.patch
new file mode 100644
index 000000000000..8974e784ba89
--- /dev/null
+++ b/0009-fix-bindir-in-config.mingw.patch
@@ -0,0 +1,12 @@
+diff -Naur icu-orig/source/config/icu-config-bottom icu/source/config/icu-config-bottom
+--- icu-orig/source/config/icu-config-bottom 2016-09-10 00:28:18.000000000 +0300
++++ icu/source/config/icu-config-bottom 2018-03-01 10:09:17.662623400 +0300
+@@ -5,7 +5,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/0010-msys-rules-for-makefiles.mingw.patch b/0010-msys-rules-for-makefiles.mingw.patch
index 31afd3943495..044e37e0a602 100644
--- a/0010-msys-rules-for-makefiles.mingw.patch
+++ b/0010-msys-rules-for-makefiles.mingw.patch
@@ -1,6 +1,7 @@
---- icu/source/config/mh-mingw.orig 2013-10-04 20:50:00.000000000 +0000
-+++ icu/source/config/mh-mingw 2014-02-06 17:53:24.827138600 +0000
-@@ -82,11 +82,11 @@
+diff -Naur icu-orig/source/config/mh-mingw icu/source/config/mh-mingw
+--- icu-orig/source/config/mh-mingw 2016-09-13 23:29:47.000000000 +0300
++++ icu/source/config/mh-mingw 2018-03-01 10:09:19.300626300 +0300
+@@ -96,11 +96,11 @@
# The #M# is used to delete lines for icu-config
# Current full path directory.
@@ -16,9 +17,10 @@
## Compilation rules
%.$(STATIC_O): $(srcdir)/%.c
---- icu/source/config/mh-mingw64.orig 2013-10-04 20:50:00.000000000 +0000
-+++ icu/source/config/mh-mingw64 2014-02-06 17:53:10.783855300 +0000
-@@ -82,11 +82,11 @@
+diff -Naur icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
+--- icu-orig/source/config/mh-mingw64 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/config/mh-mingw64 2018-03-01 10:09:19.300626300 +0300
+@@ -96,11 +96,11 @@
# The #M# is used to delete lines for icu-config
# Current full path directory.
diff --git a/0011-sbin-dir.mingw.patch b/0011-sbin-dir.mingw.patch
new file mode 100644
index 000000000000..1bca770b6ca3
--- /dev/null
+++ b/0011-sbin-dir.mingw.patch
@@ -0,0 +1,30 @@
+diff -Naur icu-orig/source/config/mh-mingw icu/source/config/mh-mingw
+--- icu-orig/source/config/mh-mingw 2018-03-01 10:09:20.533028500 +0300
++++ icu/source/config/mh-mingw 2018-03-01 10:09:21.141429600 +0300
+@@ -10,11 +10,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)
+diff -Naur icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
+--- icu-orig/source/config/mh-mingw64 2018-03-01 10:09:20.548628500 +0300
++++ icu/source/config/mh-mingw64 2018-03-01 10:09:21.141429600 +0300
+@@ -10,11 +10,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..93a3607b7cd3 100644
--- a/0012-libprefix.mingw.patch
+++ b/0012-libprefix.mingw.patch
@@ -1,7 +1,7 @@
-diff -urN icu.orig/source/config/mh-mingw icu/source/config/mh-mingw
---- icu.orig/source/config/mh-mingw 2014-04-17 22:21:37.195201800 +0100
-+++ icu/source/config/mh-mingw 2014-04-17 22:09:02.956061800 +0100
-@@ -39,8 +39,8 @@
+diff -Naur icu-orig/source/config/mh-mingw icu/source/config/mh-mingw
+--- icu-orig/source/config/mh-mingw 2018-03-01 10:09:22.529832000 +0300
++++ icu/source/config/mh-mingw 2018-03-01 10:09:23.060232900 +0300
+@@ -41,8 +41,8 @@
LD_SOOPTIONS= -Wl,-Bsymbolic
## Commands to make a shared library
@@ -12,16 +12,16 @@ 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 @@
+@@ -75,7 +75,7 @@
# This is also for backwards compatibility.
DATA_STUBNAME = dt
I18N_STUBNAME = in
-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
+LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
- # The #M# is used to delete lines for icu-config
- # Current full path directory.
-@@ -125,7 +125,7 @@
+ #SH### copied from Makefile.inc
+ #SH## for icu-config to test with
+@@ -127,7 +127,7 @@
FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
@@ -30,10 +30,10 @@ diff -urN icu.orig/source/config/mh-mingw icu/source/config/mh-mingw
IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
-diff -urN icu.orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
---- icu.orig/source/config/mh-mingw64 2014-04-17 22:21:37.195201800 +0100
-+++ icu/source/config/mh-mingw64 2014-04-17 22:08:50.428345300 +0100
-@@ -39,8 +39,8 @@
+diff -Naur icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
+--- icu-orig/source/config/mh-mingw64 2018-03-01 10:09:22.545432000 +0300
++++ icu/source/config/mh-mingw64 2018-03-01 10:09:23.060232900 +0300
+@@ -41,8 +41,8 @@
LD_SOOPTIONS= -Wl,-Bsymbolic
## Commands to make a shared library
@@ -44,7 +44,7 @@ diff -urN icu.orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
## Compiler switch to embed a runtime search path
LD_RPATH=
-@@ -61,19 +61,19 @@
+@@ -63,19 +63,19 @@
endif
# Static library prefix and file extension
@@ -65,9 +65,9 @@ diff -urN icu.orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
+LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
- # The #M# is used to delete lines for icu-config
- # Current full path directory.
-@@ -125,7 +125,7 @@
+ #SH### copied from Makefile.inc
+ #SH## for icu-config to test with
+@@ -127,7 +127,7 @@
FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
diff --git a/0014-mingwize-pkgdata.mingw.patch b/0014-mingwize-pkgdata.mingw.patch
index 051673c62f69..968a42d096e5 100644
--- a/0014-mingwize-pkgdata.mingw.patch
+++ b/0014-mingwize-pkgdata.mingw.patch
@@ -1,6 +1,7 @@
---- icu/source/tools/pkgdata/pkgdata.cpp.orig 2013-10-04 20:49:38.000000000 +0000
-+++ icu/source/tools/pkgdata/pkgdata.cpp 2014-02-06 19:09:43.258525500 +0000
-@@ -868,21 +868,10 @@
+diff -Naur icu-orig/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp
+--- icu-orig/source/tools/pkgdata/pkgdata.cpp 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/tools/pkgdata/pkgdata.cpp 2018-03-01 10:09:24.760635900 +0300
+@@ -893,21 +893,9 @@
const char* FILE_EXTENSION_SEP = uprv_strlen(pkgDataFlags[SO_EXT]) == 0 ? "" : ".";
const char* FILE_SUFFIX = pkgDataFlags[LIB_EXT_ORDER][0] == '.' ? "." : "";
@@ -9,7 +10,8 @@
- if (IN_DLL_MODE(mode)) {
- sprintf(libFileNames[LIB_FILE], "%s", libName);
- } else {
-- sprintf(libFileNames[LIB_FILE], "%s%s",
+- sprintf(libFileNames[LIB_FILE], "%s%s%s",
+- (strstr(libName, "icudt") ? "lib" : ""),
- pkgDataFlags[LIBPREFIX],
- libName);
- }
@@ -21,10 +23,10 @@
if(o->verbose) {
fprintf(stdout, "# libFileName[LIB_FILE] = %s\n", libFileNames[LIB_FILE]);
- }
---- icu/source/tools/pkgdata/pkgtypes.h.orig 2013-10-04 20:49:38.000000000 +0000
-+++ icu/source/tools/pkgdata/pkgtypes.h 2014-02-06 19:10:24.970822300 +0000
-@@ -138,10 +138,10 @@
+diff -Naur icu-orig/source/tools/pkgdata/pkgtypes.h icu/source/tools/pkgdata/pkgtypes.h
+--- icu-orig/source/tools/pkgdata/pkgtypes.h 2016-06-15 21:58:17.000000000 +0300
++++ icu/source/tools/pkgdata/pkgtypes.h 2018-03-01 10:09:24.760635900 +0300
+@@ -140,10 +140,10 @@
# ifndef UDATA_SO_SUFFIX
# define UDATA_SO_SUFFIX ".dll"
# endif
diff --git a/0015-debug.mingw.patch b/0015-debug.mingw.patch
index 21578a6fce48..1e890163e51a 100644
--- a/0015-debug.mingw.patch
+++ b/0015-debug.mingw.patch
@@ -1,6 +1,19 @@
---- icu/source/tools/pkgdata/pkgdata.cpp.orig 2014-02-07 08:37:03.380639800 +0000
-+++ icu/source/tools/pkgdata/pkgdata.cpp 2014-02-07 08:43:36.684083000 +0000
-@@ -1276,6 +1276,18 @@
+diff -Naur icu-orig/source/configure.ac icu/source/configure.ac
+--- icu-orig/source/configure.ac 2016-10-04 22:30:20.000000000 +0300
++++ icu/source/configure.ac 2018-03-01 10:09:26.414238800 +0300
+@@ -1223,7 +1223,7 @@
+ if test "$ICULIBSUFFIX" != ""
+ then
+ U_HAVE_LIB_SUFFIX=1
+- ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/[^A-Za-z0-9_]/_/g'`
++ ICULIBSUFFIXCNAME=`echo $ICULIBSUFFIX | sed 's/[^A-Za-z0-9_]/_/g'`
+ UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} "
+ else
+ U_HAVE_LIB_SUFFIX=0
+diff -Naur icu-orig/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp
+--- icu-orig/source/tools/pkgdata/pkgdata.cpp 2018-03-01 10:09:26.024238100 +0300
++++ icu/source/tools/pkgdata/pkgdata.cpp 2018-03-01 10:09:26.414238800 +0300
+@@ -1375,6 +1375,18 @@
freeCmd = TRUE;
}
#if U_PLATFORM == U_PF_MINGW
@@ -19,15 +32,3 @@
sprintf(cmd, "%s%s%s %s -o %s%s %s %s%s %s %s",
pkgDataFlags[GENLIB],
targetDir,
-diff -urN icu/source/configure.ac.orig icu/source/configure.ac
---- icu/source/configure.ac.orig 2014-04-20 16:00:12.325064200 +0100
-+++ icu/source/configure.ac 2014-04-20 16:05:49.914432600 +0100
-@@ -1173,7 +1173,7 @@
- if test "$ICULIBSUFFIX" != ""
- then
- U_HAVE_LIB_SUFFIX=1
-- ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/[^A-Za-z0-9_]/_/g'`
-+ ICULIBSUFFIXCNAME=`echo $ICULIBSUFFIX | sed 's/[^A-Za-z0-9_]/_/g'`
- UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} "
- else
- U_HAVE_LIB_SUFFIX=0
diff --git a/0016-icu-pkgconfig.patch b/0016-icu-pkgconfig.patch
index f3dadda00d98..f1efb5d8a7af 100644
--- a/0016-icu-pkgconfig.patch
+++ b/0016-icu-pkgconfig.patch
@@ -1,6 +1,15 @@
---- 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 @@
+diff -Naur icu-orig/source/icudefs.mk.in icu/source/icudefs.mk.in
+--- icu-orig/source/icudefs.mk.in 2016-09-10 00:28:18.000000000 +0300
++++ icu/source/icudefs.mk.in 2018-03-01 10:09:28.099041800 +0300
+@@ -258,6 +258,7 @@
+ ICULEHB_TRUE=
+ ICULEHB_FALSE=#
+ ICULIBS_LE=$(ICULEHB_LIBS)
++ICULIBS_LE=$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)
+ ICULE_CFLAGS=$(ICULEHB_CFLAGS) -DUSING_ICULEHB
+ else
+ USING_ICULEHB=no
+@@ -266,13 +267,13 @@
endif
# Just the libs.
diff --git a/0017-icu-config-versioning.patch b/0017-icu-config-versioning.patch
index 130b61ce5ecd..5f9c0f8d0c45 100644
--- a/0017-icu-config-versioning.patch
+++ b/0017-icu-config-versioning.patch
@@ -1,6 +1,33 @@
---- icu/source/config/mh-mingw.orig 2015-07-29 14:31:54.664667600 +0300
-+++ icu/source/config/mh-mingw 2015-07-29 14:34:19.771155500 +0300
-@@ -75,13 +75,16 @@
+diff -Naur icu-orig/source/config/Makefile.inc.in icu/source/config/Makefile.inc.in
+--- icu-orig/source/config/Makefile.inc.in 2016-09-10 00:28:18.000000000 +0300
++++ icu/source/config/Makefile.inc.in 2018-03-01 10:09:29.643444500 +0300
+@@ -106,14 +106,14 @@
+ # - $(ICULIBS_I18N) - i18n library, formatting, etc.
+ # - $(ICULIBS_ICUIO) - ICU stdio equivalent library
+
+-ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
+-ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
+-ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
+-ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
+-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_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
++ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)
++ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
++ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)
++ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)
++ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)
++ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)
++ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)
++ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)
+ ICULIBS_BASE = -L$(libdir)
+
+ # for icu-config to test with
+diff -Naur icu-orig/source/config/mh-mingw icu/source/config/mh-mingw
+--- icu-orig/source/config/mh-mingw 2018-03-01 10:09:24.339435200 +0300
++++ icu/source/config/mh-mingw 2018-03-01 10:09:29.627844500 +0300
+@@ -77,13 +77,16 @@
I18N_STUBNAME = in
LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
@@ -19,9 +46,10 @@
#SH#
#SH## ICULIBS is the set of libraries your application should link
#SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well.
---- icu/source/config/mh-mingw64.orig 2015-07-29 14:32:09.885145400 +0300
-+++ icu/source/config/mh-mingw64 2015-07-29 14:34:34.344698000 +0300
-@@ -75,13 +75,16 @@
+diff -Naur icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
+--- icu-orig/source/config/mh-mingw64 2018-03-01 10:09:24.339435200 +0300
++++ icu/source/config/mh-mingw64 2018-03-01 10:09:29.627844500 +0300
+@@ -77,13 +77,16 @@
I18N_STUBNAME = in
LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
@@ -40,28 +68,3 @@
#SH#
#SH## ICULIBS is the set of libraries your application should link
#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 @@
- # - $(ICULIBS_LAYOUT) - ICU layout library.
- # - $(ICULIBS_ICUIO) - ICU stdio equivalent library
-
--ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
--ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
--ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
--ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
--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_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-+ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)
-+ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
-+ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)
-+ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)
-+ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)
-+ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)
-+ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)
-+ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)
- ICULIBS_BASE = -L$(libdir)
-
- # for icu-config to test with
diff --git a/0021-mingw-static-libraries-without-s.patch b/0021-mingw-static-libraries-without-s.patch
new file mode 100644
index 000000000000..f2a55b10bc7b
--- /dev/null
+++ b/0021-mingw-static-libraries-without-s.patch
@@ -0,0 +1,26 @@
+diff -Naur icu-orig/source/config/mh-mingw icu/source/config/mh-mingw
+--- icu-orig/source/config/mh-mingw 2018-03-01 10:09:30.907046700 +0300
++++ icu/source/config/mh-mingw 2018-03-01 10:19:05.831438700 +0300
+@@ -62,6 +62,9 @@
+ SO_TARGET_VERSION_SUFFIX =
+ endif
+
++STATIC_PREFIX_WHEN_USED =
++STATIC_PREFIX =
++
+ # Static library prefix and file extension
+ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+diff -Naur icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
+--- icu-orig/source/config/mh-mingw64 2018-03-01 10:09:30.907046700 +0300
++++ icu/source/config/mh-mingw64 2018-03-01 10:19:13.118855500 +0300
+@@ -62,6 +62,9 @@
+ SO_TARGET_VERSION_SUFFIX =
+ endif
+
++STATIC_PREFIX_WHEN_USED =
++STATIC_PREFIX =
++
+ # Static library prefix and file extension
+ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
diff --git a/0022-fix-namespace.patch b/0022-fix-namespace.patch
new file mode 100644
index 000000000000..87518799f163
--- /dev/null
+++ b/0022-fix-namespace.patch
@@ -0,0 +1,52 @@
+--- icu-orig/source/common/umutex.h 2018-10-20 10:19:05.831438700 +0800
++++ icu/source/common/umutex.h 2018-10-20 10:19:05.831438700 +0800
+@@ -54,15 +54,19 @@
+
+ #include <atomic>
+
+-U_NAMESPACE_BEGIN
+-
+ // Export an explicit template instantiation of std::atomic<int32_t>.
+ // When building DLLs for Windows this is required as it is used as a data member of the exported SharedObject class.
+ // See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples.
+ #if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN
+-template struct U_COMMON_API std::atomic<int32_t>;
++ #if defined(__clang__) && __has_warning("-Winstantiation-after-specialization")
++ // Suppress the warning that the explicit instantiation after explicit specialization has no effect.
++ #pragma clang diagnostic ignored "-Winstantiation-after-specialization"
++ #endif
++template <> struct U_COMMON_API std::atomic<int32_t>;
+ #endif
+
++U_NAMESPACE_BEGIN
++
+ typedef std::atomic<int32_t> u_atomic_int32_t;
+ #define ATOMIC_INT32_T_INITIALIZER(val) ATOMIC_VAR_INIT(val)
+
+--- icu-orig/source/i18n/unicode/numberrangeformatter.h 2018-10-20 10:19:05.831438700 +0800
++++ icu/source/i18n/unicode/numberrangeformatter.h 2018-10-20 10:19:05.831438700 +0800
+@@ -185,7 +185,13 @@
+ * (When building DLLs for Windows this is required.)
+ */
+ #if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN)
+-template struct U_I18N_API std::atomic<impl::NumberRangeFormatterImpl*>;
++} // namespace icu::number
++U_NAMESPACE_END
++
++template struct U_I18N_API std::atomic< U_NAMESPACE_QUALIFIER number::impl::NumberRangeFormatterImpl*>;
++
++U_NAMESPACE_BEGIN
++namespace number { // icu::number
+ #endif
+ /** \endcond */
+
+--- icu-orig/source/test/intltest/numbertest.h 2018-10-20 10:19:05.831438700 +0800
++++ icu/source/test/intltest/numbertest.h 2018-10-20 10:19:05.831438700 +0800
+@@ -10,6 +10,7 @@
+ #include "intltest.h"
+ #include "number_affixutils.h"
+ #include "numparse_stringsegment.h"
++#include "numrange_impl.h"
+ #include "unicode/locid.h"
+ #include "unicode/numberformatter.h"
+ #include "unicode/numberrangeformatter.h"
diff --git a/PKGBUILD b/PKGBUILD
index 330673f9f69f..524f50ad4df3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
pkgname=mingw-w64-icu
-pkgver=62.1
+pkgver=63.1
pkgrel=1
pkgdesc="International Components for Unicode library (mingw-w64)"
arch=('any')
@@ -18,33 +18,52 @@ makedepends=('mingw-w64-configure')
options=('!strip' 'staticlibs' '!buildflags')
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"
+ "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")
-sha256sums=('3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3'
+ "0017-icu-config-versioning.patch"
+ "0021-mingw-static-libraries-without-s.patch"
+ "0022-fix-namespace.patch")
+sha256sums=('05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d'
'SKIP'
- '2038881890542797fe1fe9a384cf2bb6c5504b18fb26eab1368f5cb0e6f7f7af'
- '2adfd968379888d919f0dd4e0379cef7b744ba56d98216b82372ed4cd00a2592'
- '128c21c5dbe0364f82a88c2cefad08fb9020d940c022434ee978fb1d9e1a2fa0'
- 'ac63e11e11fb7c849fbeff0a0008a49942a1e19ffe29385aa70248614c7ffd4d'
- 'd1745b9d69729cb318cc329847160b50129621f98774a640726a7affd4b2bfd2'
- '8ff9d33de05e34906177ba1ae7ca44c4bab246353919c50f7b201548354602b2'
- 'f9c6c5ad51a82b547ca34cbd7903c4f0db4c7f6d08867e7fd54c2bcf8ad8ae56')
-validpgpkeys=("FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7")
+ '0b6f5ea91bb579f03cdfa2737719411e3207169f5921ffeea8564cf24fa46715'
+ 'a32b3fae6a59599c942e5f8bc2d29416aaedca0ce2832c857ecf99eb7529cee1'
+ 'f437f25a62420856ed234d2b33672b860ae00106cb5d4ccc682f5ff15176aeaf'
+ 'c84fda5b32edcbf062d629bbf04c47e73e7b9620f4dae752c1c0c25f49124ca8'
+ '1cf7fd08bad22f39441213d54f0659a3046e163729aa4cd6ff393602ec22c285'
+ '4f4787caeccf70607cf0cbde0c005f05f5c6de1543265a927839122405b4054f'
+ 'e7ecdafe85e18a4a4b5f29bbfde38776521a848e5b65089a2379b90e59f1592d'
+ '426f2dc16a8f12c2aa91f6b2ab0533b41efdf60c946f14e267a5868af558dc4f'
+ '0181f9ff8b7dd0a423869d8772da0a4feea64188347eb0dee7eb059aea92131c'
+ '87ebe8962f8c387714f2a697a664a0c49aed2331b988548069d0c211abc36e05'
+ '5247102df5604671c33a6e7226e5135a6b48049550861b892f0686dcefec4329'
+ 'd8612f40b1731d9a94290afcf80c896184a2f15b8ae8f23b3643c64f6cabfa2f'
+ 'a033641dd0456b74d136fb9441e01dafee555b140d4879853490b78a64b5a110')
+validpgpkeys=("E4098B78AFC94394F3F49AA903996C7C83F12F11")
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
patch -p1 -i ../0016-icu-pkgconfig.patch
patch -p1 -i ../0017-icu-config-versioning.patch
+ patch -p1 -i ../0021-mingw-static-libraries-without-s.patch
+ # https://github.com/unicode-org/icu/pull/228
+ patch -p1 -i ../0022-fix-namespace.patch
cd source
autoreconf -fi