diff --git a/icu/icu.patch b/icu/icu.patch
index 377ea11c19..c0153852d8 100644
--- a/icu/icu.patch
+++ b/icu/icu.patch
@@ -1,7 +1,7 @@
 Index: source/common/putil.cpp
---- source/common/putil.cpp.orig	2020-04-22 22:04:20.000000000 +0200
-+++ source/common/putil.cpp	2020-04-24 10:28:40.544991000 +0200
-@@ -1943,7 +1943,7 @@
+--- source/common/putil.cpp.orig	2020-03-11 19:16:11.000000000 +0100
++++ source/common/putil.cpp	2020-04-25 09:19:14.789654000 +0200
+@@ -1931,7 +1931,7 @@
           */
          name = "ISO-8859-1";
      }
@@ -10,7 +10,7 @@ Index: source/common/putil.cpp
      if (locale == NULL && *name == 0) {
          /*
          No locale was specified, and an empty name was passed in.
-@@ -1962,11 +1962,6 @@
+@@ -1950,11 +1950,6 @@
           */
          name = "UTF-8";
      }
@@ -22,7 +22,7 @@ Index: source/common/putil.cpp
  #elif U_PLATFORM == U_PF_HPUX
      if (locale != NULL && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {
          /* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */
-@@ -2122,7 +2117,7 @@
+@@ -2110,7 +2105,7 @@
         nl_langinfo may use the same buffer as setlocale. */
      {
          const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET);
@@ -32,8 +32,8 @@ Index: source/common/putil.cpp
           * On Linux and MacOSX, ensure that default codepage for non C/POSIX locale is UTF-8
           * instead of ASCII.
 Index: source/common/putilimp.h
---- source/common/putilimp.h.orig	2020-04-22 22:04:20.000000000 +0200
-+++ source/common/putilimp.h	2020-04-24 10:28:40.545157000 +0200
+--- source/common/putilimp.h.orig	2020-03-11 19:16:11.000000000 +0100
++++ source/common/putilimp.h	2020-04-25 09:19:14.789827000 +0200
 @@ -128,6 +128,8 @@
     /* not defined */
  #elif U_PLATFORM == U_PF_IPHONE
@@ -44,8 +44,8 @@ Index: source/common/putilimp.h
  #   define U_TIMEZONE timezone
  #endif
 Index: source/common/unicode/platform.h
---- source/common/unicode/platform.h.orig	2020-04-22 22:04:20.000000000 +0200
-+++ source/common/unicode/platform.h	2020-04-24 10:28:40.545348000 +0200
+--- source/common/unicode/platform.h.orig	2020-03-11 19:16:11.000000000 +0100
++++ source/common/unicode/platform.h	2020-04-25 09:19:14.790024000 +0200
 @@ -374,8 +374,8 @@
   */
  #ifdef U_IS_BIG_ENDIAN
@@ -58,8 +58,8 @@ Index: source/common/unicode/platform.h
      /* gcc */
  #   define U_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
 Index: source/common/unicode/uconfig.h
---- source/common/unicode/uconfig.h.orig	2020-04-22 22:04:20.000000000 +0200
-+++ source/common/unicode/uconfig.h	2020-04-24 10:28:40.545491000 +0200
+--- source/common/unicode/uconfig.h.orig	2020-03-11 19:16:11.000000000 +0100
++++ source/common/unicode/uconfig.h	2020-04-25 09:19:14.790174000 +0200
 @@ -89,7 +89,7 @@
   * @internal
   */
@@ -70,8 +70,8 @@ Index: source/common/unicode/uconfig.h
  
  /**
 Index: source/config/Makefile.inc.in
---- source/config/Makefile.inc.in.orig	2020-04-22 22:04:20.000000000 +0200
-+++ source/config/Makefile.inc.in	2020-04-24 10:28:40.545641000 +0200
+--- source/config/Makefile.inc.in.orig	2020-03-11 19:16:11.000000000 +0100
++++ source/config/Makefile.inc.in	2020-04-25 09:19:14.790326000 +0200
 @@ -117,7 +117,7 @@
  ICULIBS_BASE = -L$(libdir)
  
@@ -82,19 +82,19 @@ Index: source/config/Makefile.inc.in
  
  # ICULIBS is the set of libraries your application should link
 Index: source/data/Makefile.in
---- source/data/Makefile.in.orig	2020-04-24 10:28:40.545851000 +0200
-+++ source/data/Makefile.in	2020-04-24 10:33:34.736658000 +0200
+--- source/data/Makefile.in.orig	2020-04-25 09:19:14.790507000 +0200
++++ source/data/Makefile.in	2020-04-25 09:20:03.050813000 +0200
 @@ -149,6 +149,7 @@
  ifneq ($(ICUDATA_ARCHIVE),)
  ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
- $(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
+ $(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
 +	$(MKINSTALLDIRS) $(DESTDIR)$(OUTDIR)
- 	$(MKINSTALLDIRS) $(OUTDIR)
  	$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
- 	
+ endif
+ else
 Index: source/icudefs.mk.in
---- source/icudefs.mk.in.orig	2020-04-22 22:04:20.000000000 +0200
-+++ source/icudefs.mk.in	2020-04-24 10:28:40.546066000 +0200
+--- source/icudefs.mk.in.orig	2020-03-11 19:16:11.000000000 +0100
++++ source/icudefs.mk.in	2020-04-25 09:19:14.790729000 +0200
 @@ -155,7 +155,7 @@
  ifeq ($(ENABLE_RPATH),YES)
  RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
@@ -105,8 +105,8 @@ Index: source/icudefs.mk.in
  # What kind of libraries are we building and linking against?
  ENABLE_STATIC = @ENABLE_STATIC@
 Index: source/runConfigureICU
---- source/runConfigureICU.orig	2020-04-22 22:04:20.000000000 +0200
-+++ source/runConfigureICU	2020-04-24 10:28:40.546200000 +0200
+--- source/runConfigureICU.orig	2020-03-11 19:16:11.000000000 +0100
++++ source/runConfigureICU	2020-04-25 09:19:14.790877000 +0200
 @@ -377,26 +377,10 @@
  
  if test $release -eq 1