diff --git a/package/icu/65.1/0006-add-icu-data-filter-file.patch b/package/icu/65.1/0006-add-icu-data-filter-file.patch deleted file mode 100644 index 9256dc127301..000000000000 --- a/package/icu/65.1/0006-add-icu-data-filter-file.patch +++ /dev/null @@ -1,35 +0,0 @@ -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" -+ ] -+ } -+} diff --git a/package/icu/Config.in b/package/icu/Config.in index e9c53693e924..9e9f0c598711 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -22,6 +22,16 @@ config BR2_PACKAGE_ICU_USE_ICUDATA endif +if BR2_PACKAGE_ICU + +config BR2_PACKAGE_ICU_FILTERS_DATA_PATH + string "Path to filters data file" + help + This option allows to define the path to a filters data + file. + Leave empty to not use this functionality. +endif + if BR2_PACKAGE_ICU && !BR2_PACKAGE_ICU_USE_ICUDATA config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 6c60578dfd68..407fe074e2a1 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -4,28 +4,21 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_RDK_VERSIONING),y) -ICU_VERSION = 57.1 -else ifeq ($(BR2_PACKAGE_NETFLIX5),y) ICU_VERSION = 65.1 -else ifeq ($(BR2_PACKAGE_NETFLIX52),y) -ICU_VERSION = 65.1 -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_FILTERS_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_FILTERS_DATA_PATH)) +# Force to build icudate, as of ICU 64 the website to generate icudate is no longer applicable +# If someone needs to build it outside still mk file is able to support it 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 + +ifneq ($(ICU_FILTERS_DATA_PATH),) +export ICU_DATA_FILTER_FILE=$(ICU_FILTERS_DATA_PATH) endif ICU_DEPENDENCIES = host-icu @@ -63,11 +56,7 @@ 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))