[ICU] Upgrade ICU to 65.1 (#9122)

* [ICU] Upgrade ICU to 65.1

* Fix wrong diff format.

* Removed deprecated vcpkg_common_functions

5 files changed, 48 insertions, 22 deletions

diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 06d902e19..cdbe80a39 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,5 +1,5 @@
 Source: icu

-Version: 61.1-8

+Version: 65.1-1

 Homepage: http://icu-project.org/apiref/icu4c/

 Description: Mature and widely used Unicode and localization library.

 Supports: !uwp
\ No newline at end of file
diff --git a/ports/icu/fix-extra.patch b/ports/icu/fix-extra.patch
new file mode 100644
index 000000000..935dfd775
--- /dev/null
+++ b/ports/icu/fix-extra.patch
@@ -0,0 +1,13 @@
+diff --urN a/source/extra/Makefile.in b/source/extra/Makefile.in

+--- a/source/extra/Makefile.in

++++ b/source/extra/Makefile.in 

+@@ -23,7 +23,7 @@

+ ## Files to remove for 'make clean'

+ CLEANFILES = *~

+ 

+-SUBDIRS = scrptrun uconv

++SUBDIRS = uconv

+ 

+ ## List of phony targets

+ .PHONY : all all-local all-recursive install install-local		\

+

diff --git a/ports/icu/fix_parallel_build_on_windows.patch b/ports/icu/fix_parallel_build_on_windows.patch
index b0ea7556c..b3b42b423 100644
--- a/ports/icu/fix_parallel_build_on_windows.patch
+++ b/ports/icu/fix_parallel_build_on_windows.patch
@@ -1,13 +1,25 @@
-diff --git a/source/data/Makefile.in b/source/data/Makefile.in
-index 1140b69..936ef81 100644
+diff --urN a/source/data/Makefile.in b/source/data/Makefile.in
 --- a/source/data/Makefile.in
 +++ b/source/data/Makefile.in
-@@ -514,7 +514,7 @@ build-dir:
- # The | is an order-only prerequisite. This helps when the -j option is used,
- # and we don't want the files to be built before the directories are built.
- ifneq ($(filter order-only,$(.FEATURES)),)
--$(ALL_FILES) $(ALL_INDEX_SRC_FILES): | build-dir
-+$(ALL_FILES) $(ALL_INDEX_SRC_FILES) $(SO_VERSION_DATA): | build-dir
+@@ -221,11 +221,12 @@
+ ## Include the main build rules for data files
+ include $(top_builddir)/$(subdir)/rules.mk
+
++PKGDATA_LIST = $(TMP_DIR)/icudata.lst
+
+ ifeq ($(ENABLE_SO_VERSION_DATA),1)
+ ifeq ($(PKGDATA_MODE),dll)
+ SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
+-$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
++$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc $(PKGDATA_LIST)
+ ifeq ($(MSYS_RC_MODE),1)
+        rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
+ else
+@@ -234,7 +235,6 @@
  endif
- 
- # Now, sections for building each kind of data.
+ endif
+
+-PKGDATA_LIST = $(TMP_DIR)/icudata.lst
+
+
+ #####################################################
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 97c1d086b..ca205fbae 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -2,17 +2,17 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")

 endif()

 

-include(vcpkg_common_functions)

-

-set(VERSION 61.1)

-set(VERSION2 61_1)

-set(ICU_VERSION_MAJOR 61)

+set(ICU_VERSION_MAJOR 65)

+set(ICU_VERSION_MINOR 1)

+set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")

+set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")

+set(VERSION3 "${ICU_VERSION_MAJOR}-${ICU_VERSION_MINOR}")

 

 vcpkg_download_distfile(

     ARCHIVE

-    URLS "http://download.icu-project.org/files/icu4c/${VERSION}/icu4c-${VERSION2}-src.tgz"

+    URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"

     FILENAME "icu4c-${VERSION2}-src.tgz"

-    SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94

+    SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139

 )

 vcpkg_extract_source_archive_ex(

     OUT_SOURCE_PATH SOURCE_PATH

@@ -21,6 +21,7 @@ vcpkg_extract_source_archive_ex(
         ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch

         ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch

         ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch

+        ${CMAKE_CURRENT_LIST_DIR}/fix-extra.patch

 )

 

 set(CONFIGURE_OPTIONS "--disable-samples --disable-tests")

diff --git a/ports/icu/remove-MD-from-configure.patch b/ports/icu/remove-MD-from-configure.patch
index d35205ebf..fe4782b34 100644
--- a/ports/icu/remove-MD-from-configure.patch
+++ b/ports/icu/remove-MD-from-configure.patch
@@ -7,12 +7,12 @@ diff -urN a/source/runConfigureICU b/source/runConfigureICU
          CXX=cl; export CXX
 -        RELEASE_CFLAGS='-Gy -MD'
 -        RELEASE_CXXFLAGS='-Gy -MD'
--        DEBUG_CFLAGS='-Zi -MDd'
--        DEBUG_CXXFLAGS='-Zi -MDd'
+-        DEBUG_CFLAGS='-FS -Zi -MDd'
+-        DEBUG_CXXFLAGS='-FS -Zi -MDd'
 +        RELEASE_CFLAGS='-Gy'
 +        RELEASE_CXXFLAGS='-Gy'
-+        DEBUG_CFLAGS='-Zi'
-+        DEBUG_CXXFLAGS='-Zi'
++        DEBUG_CFLAGS='-FS -Zi'
++        DEBUG_CXXFLAGS='-FS -Zi'
          DEBUG_LDFLAGS='-DEBUG'
          ;;
      *BSD)