Updated to 67.1

11 files changed, 6 insertions, 531 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba37ecae1d24..7f73f93b6731 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-icu
 	pkgdesc = International Components for Unicode library (mingw-w64)
-	pkgver = 66.1
+	pkgver = 67.1
 	pkgrel = 1
 	url = http://site.icu-project.org
 	arch = any
@@ -10,32 +10,16 @@ pkgbase = mingw-w64-icu
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz
-	source = https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_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 = 0011-sbin-dir.mingw.patch
-	source = 0012-libprefix.mingw.patch
-	source = 0014-mingwize-pkgdata.mingw.patch
+	source = https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz
+	source = https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz.asc
 	source = 0015-debug.mingw.patch
 	source = 0016-icu-pkgconfig.patch
-	source = 0017-icu-config-versioning.patch
 	source = 0021-mingw-static-libraries-without-s.patch
 	validpgpkeys = 4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0
-	sha256sums = 52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e
+	sha256sums = 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 	sha256sums = SKIP
-	sha256sums = 0b6f5ea91bb579f03cdfa2737719411e3207169f5921ffeea8564cf24fa46715
-	sha256sums = a32b3fae6a59599c942e5f8bc2d29416aaedca0ce2832c857ecf99eb7529cee1
-	sha256sums = f437f25a62420856ed234d2b33672b860ae00106cb5d4ccc682f5ff15176aeaf
-	sha256sums = c84fda5b32edcbf062d629bbf04c47e73e7b9620f4dae752c1c0c25f49124ca8
-	sha256sums = 4f4787caeccf70607cf0cbde0c005f05f5c6de1543265a927839122405b4054f
-	sha256sums = e7ecdafe85e18a4a4b5f29bbfde38776521a848e5b65089a2379b90e59f1592d
-	sha256sums = 426f2dc16a8f12c2aa91f6b2ab0533b41efdf60c946f14e267a5868af558dc4f
 	sha256sums = 0181f9ff8b7dd0a423869d8772da0a4feea64188347eb0dee7eb059aea92131c
 	sha256sums = 87ebe8962f8c387714f2a697a664a0c49aed2331b988548069d0c211abc36e05
-	sha256sums = 5247102df5604671c33a6e7226e5135a6b48049550861b892f0686dcefec4329
 	sha256sums = d8612f40b1731d9a94290afcf80c896184a2f15b8ae8f23b3643c64f6cabfa2f
 
 pkgname = mingw-w64-icu
diff --git a/0004-move-to-bin.mingw.patch b/0004-move-to-bin.mingw.patch
deleted file mode 100644
index f9274e7760bb..000000000000
--- a/0004-move-to-bin.mingw.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4fd9fd682f5d..000000000000
--- a/0007-actually-move-to-bin.mingw.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-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
deleted file mode 100644
index 53ed0f9645f7..000000000000
--- a/0008-data-install-dir.mingw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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)
--	$(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR)
-+	$(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(DESTDIR)$(bindir)
- endif
- endif
- ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
diff --git a/0009-fix-bindir-in-config.mingw.patch b/0009-fix-bindir-in-config.mingw.patch
deleted file mode 100644
index 8974e784ba89..000000000000
--- a/0009-fix-bindir-in-config.mingw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/0011-sbin-dir.mingw.patch b/0011-sbin-dir.mingw.patch
deleted file mode 100644
index 1bca770b6ca3..000000000000
--- a/0011-sbin-dir.mingw.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 93a3607b7cd3..000000000000
--- a/0012-libprefix.mingw.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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
--SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
--SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
-+SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
-+SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
- 
- ## Compiler switch to embed a runtime search path
- LD_RPATH=	
-@@ -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)
- 
- #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)
- 
--FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M#
-+FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M#
- IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
- MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
- 
-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
--SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
--SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
-+SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
-+SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#
- 
- ## Compiler switch to embed a runtime search path
- LD_RPATH=	
-@@ -63,19 +63,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
--LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
-+LIBICU = $(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
- 
- #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)
- 
--FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M#
-+FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M#
- IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
- MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
- 
diff --git a/0014-mingwize-pkgdata.mingw.patch b/0014-mingwize-pkgdata.mingw.patch
deleted file mode 100644
index 968a42d096e5..000000000000
--- a/0014-mingwize-pkgdata.mingw.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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] == '.' ? "." : "";
- 
--#if U_PLATFORM == U_PF_MINGW
--        /* MinGW does not need the library prefix when building in dll mode. */
--        if (IN_DLL_MODE(mode)) {
--            sprintf(libFileNames[LIB_FILE], "%s", libName);
--        } else {
--            sprintf(libFileNames[LIB_FILE], "%s%s%s",
--                    (strstr(libName, "icudt") ? "lib" : ""),
--                    pkgDataFlags[LIBPREFIX],
--                    libName);
--        }
--#else
-         sprintf(libFileNames[LIB_FILE], "%s%s",
-                 pkgDataFlags[LIBPREFIX],
-                 libName);
--#endif
- 
-         if(o->verbose) {
-           fprintf(stdout, "# libFileName[LIB_FILE] = %s\n", libFileNames[LIB_FILE]);
-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
--# define LIB_PREFIX ""
--# define LIB_STATIC_PREFIX ""
--# define OBJ_SUFFIX ".obj"
--# define UDATA_LIB_SUFFIX ".lib"
-+# define LIB_PREFIX "lib"
-+# define LIB_STATIC_PREFIX "lib"
-+# define OBJ_SUFFIX ".o"
-+# define UDATA_LIB_SUFFIX ".a"
- 
- #elif U_PLATFORM == U_PF_CYGWIN
- # define LIB_PREFIX "cyg"
diff --git a/0017-icu-config-versioning.patch b/0017-icu-config-versioning.patch
deleted file mode 100644
index 5f9c0f8d0c45..000000000000
--- a/0017-icu-config-versioning.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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)
- 
-+# The following is for Makefile.inc's use.
-+ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
-+
- #SH### copied from Makefile.inc
- #SH## for icu-config to test with
- #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
- #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
- 
--#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
--#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-+#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-+#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"
- #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. 
-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)
- 
-+# The following is for Makefile.inc's use.
-+ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
-+
- #SH### copied from Makefile.inc
- #SH## for icu-config to test with
- #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
- #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
- 
--#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
--#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-+#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-+#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"
- #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. 
diff --git a/0022-fix-namespace.patch b/0022-fix-namespace.patch
deleted file mode 100644
index 87518799f163..000000000000
--- a/0022-fix-namespace.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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 4c92e9c584cc..4f5a47738308 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-icu
-pkgver=66.1
+pkgver=67.1
 pkgrel=1
 pkgdesc="International Components for Unicode library (mingw-w64)"
 arch=('any')
@@ -17,44 +17,20 @@ depends=('mingw-w64-crt>=6.0.0')
 makedepends=('mingw-w64-configure')
 options=('!strip' 'staticlibs' '!buildflags')
 source=("https://github.com/unicode-org/icu/releases/download/release-${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"
-        "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"
         "0021-mingw-static-libraries-without-s.patch")
-sha256sums=('52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e'
+sha256sums=('94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc'
             'SKIP'
-            '0b6f5ea91bb579f03cdfa2737719411e3207169f5921ffeea8564cf24fa46715'
-            'a32b3fae6a59599c942e5f8bc2d29416aaedca0ce2832c857ecf99eb7529cee1'
-            'f437f25a62420856ed234d2b33672b860ae00106cb5d4ccc682f5ff15176aeaf'
-            'c84fda5b32edcbf062d629bbf04c47e73e7b9620f4dae752c1c0c25f49124ca8'
-            '4f4787caeccf70607cf0cbde0c005f05f5c6de1543265a927839122405b4054f'
-            'e7ecdafe85e18a4a4b5f29bbfde38776521a848e5b65089a2379b90e59f1592d'
-            '426f2dc16a8f12c2aa91f6b2ab0533b41efdf60c946f14e267a5868af558dc4f'
             '0181f9ff8b7dd0a423869d8772da0a4feea64188347eb0dee7eb059aea92131c'
             '87ebe8962f8c387714f2a697a664a0c49aed2331b988548069d0c211abc36e05'
-            '5247102df5604671c33a6e7226e5135a6b48049550861b892f0686dcefec4329'
             'd8612f40b1731d9a94290afcf80c896184a2f15b8ae8f23b3643c64f6cabfa2f')
 validpgpkeys=("4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0")
 
 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 ../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
 
   cd source
@@ -86,7 +62,6 @@ package() {
   for _arch in ${_architectures}; do
     cd "${srcdir}/icu/source/build-${_arch}"
     make install DESTDIR="${pkgdir}"
-    mv "${pkgdir}"/usr/${_arch}/lib/*.dll "${pkgdir}"/usr/${_arch}/bin
     find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
     find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
     find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g