Modified icu & icudata packages for icu version 65.1 as well as build minimal icu data.

Author: Neeraj Deshpande

package/icu/65.1/0001-dont-build-static-dynamic-twice.patch

@@ -0,0 +1 @@
+../0001-dont-build-static-dynamic-twice.patch

package/icu/65.1/0002-workaround-toolchain-bugs.patch

@@ -0,0 +1 @@
+../0002-workaround-toolchain-bugs.patch

package/icu/65.1/0004-link-icudata-as-data-only.patch

@@ -0,0 +1 @@
+../0004-link-icudata-as-data-only.patch

package/icu/65.1/0005-fix-static-linking-with-icu-uc.patch

@@ -0,0 +1 @@
+../0005-fix-static-linking-with-icu-uc.patch

package/icu/65.1/0006-add-icu-data-filter-file.patch

@@ -0,0 +1,35 @@
+diff -Nura a/source/data/filters.json b/source/data/filters.json
+--- a/source/data/filters.json	1970-01-01 05:30:00.000000000 +0530
++++ b/source/data/filters.json	2020-03-01 00:41:28.112818415 +0530
+@@ -0,0 +1,31 @@
++{
++    "strategy": "additive",
++    "featureFilters": {
++        "brkitr_rules": "include",
++        "brkitr_dictionaries": "include",
++        "brkitr_tree": "include",
++        "coll_tree": "include",
++        "misc": "include",
++        "curr_tree": "include",
++        "lang_tree": "include",
++        "region_tree": "include",
++        "rbnf_tree": "include",
++        "zone_tree": "include",
++        "unit_tree": "include",
++        "cnvalias": "include",
++        "locales_tree": "include",
++        "unames": "include",
++        "ulayout": "include"
++    },
++    "localeFilter": {
++        "filterType": "locale",
++        "includeChildren": false,
++        "whitelist": [
++            "en_US",
++            "en_US_POSIX",
++            "en_001",
++            "en_150",
++            "pt"
++        ]
++    }
++}

package/icu/icu.hash

@@ -1,7 +1,7 @@
 # From https://ssl.icu-project.org/files/icu4c/57.1/icu4c-src-57_1.md5
 md5	976734806026a4ef8bdd17937c8898b9	icu4c-57_1-src.tgz
 md5	fac212b32b7ec7ab007a12dff1f3aea1	icu4c-58_2-src.tgz
-sha512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694  icu4c-60_2-src.tgz
-sha256 24c771ce37201a3ab604852e47d10d21595d0493269dd6c8a5e567e998e18c00  LICENSE
+sha512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139  icu4c-65_1-src.tgz
+sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d  LICENSE
 # Calculated based on the hash above
 sha256	ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581	icu4c-57_1-src.tgz

package/icu/icu.mk

@@ -7,17 +7,26 @@
 ifeq ($(BR2_PACKAGE_RDK_VERSIONING),y)
 ICU_VERSION = 57.1
 else ifeq ($(BR2_PACKAGE_NETFLIX5),y)
-ICU_VERSION = 60.2
+ICU_VERSION = 65.1
 else ifeq ($(BR2_PACKAGE_NETFLIX52),y)
 ICU_VERSION = 58.2
 else
 ICU_VERSION = 57.1
 endif
 
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
+ifeq ($(ICU_VERSION), 65.1)
+ICU_SITE = \
+	https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$(ICU_VERSION))
+ICU_LICENSE = ICU License
+ICU_LICENSE_FILES = LICENSE
+ICU_BUILD_ICUDATA = y
+export ICU_DATA_FILTER_FILE=$(HOST_ICU_DIR)/source/data/filters.json
+else
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
 ICU_LICENSE = ICU License
 ICU_LICENSE_FILES = license.html
+endif
 
 ICU_DEPENDENCIES = host-icu
 ICU_INSTALL_STAGING = YES
@@ -54,8 +63,12 @@ HOST_ICU_CONF_ENV = CXX="$(HOSTCXX_NOCCACHE)" CC="$(HOSTCC_NOCCACHE)"
 
 ifeq ($(BR2_PACKAGE_ICU_USE_ICUDATA),y)
 ICU_DEPENDENCIES += icudata
+ifeq ($(ICU_BUILD_ICUDATA), y)
+ICU_PRE_PATCH_HOOKS += ICUDATA_EXTRACT
+else
 ICU_POST_PATCH_HOOKS += ICUDATA_EXTRACT
 endif
+endif
 
 ICU_CUSTOM_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH))
 

package/icudata/icudata.mk

@@ -4,13 +4,26 @@
 #
 ################################################################################
 
+ifeq ($(ICU_BUILD_ICUDATA), y)
+ICUDATA_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-data.zip
+ICUDATA_SITE = https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$(ICU_VERSION))
+ICUDATA_LICENSE = ICU License
+ICUDATA_LICENSE_FILES = license.html
+ICUDATA_EXTRACT_CMDS = unzip > /dev/null 2>&1
+
+define ICUDATA_EXTRACT
+    rm -rf $(@D)/source/data
+    unzip $(DL_DIR)/$(ICUDATA_SOURCE) -d $(@D)/source
+endef
+else
 ICUDATA_VERSION = d8d56c495af970036f4afa3704f58609446a2853
 ICUDATA_SITE = $(call github,Metrological,icudata,$(ICUDATA_VERSION))
 
 define ICUDATA_EXTRACT
 	$(INFLATE.gz) $(DL_DIR)/$(ICUDATA_SOURCE) | \
 		$(TAR) --strip-components=1 -C $(@D)/source/data/in/ $(TAR_OPTIONS) -
 endef
+endif
 
 $(eval $(generic-package))
 $(eval $(host-generic-package))