From 2558007608080a0b980c9776cb5c8031027892ed Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sun, 26 Apr 2020 14:38:09 +0300 Subject: [PATCH] libicu: revert to v66.1 Newer versions break nodejs, nodejs-lts because API icu::number::FormattedNumber::getAllFieldPositions() was removed. --- packages/libicu/build.sh | 8 +++++--- packages/nodejs-lts/build.sh | 8 ++++---- packages/nodejs/build.sh | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh index 6c3a2e66d..dd3293cb9 100644 --- a/packages/libicu/build.sh +++ b/packages/libicu/build.sh @@ -1,9 +1,11 @@ TERMUX_PKG_HOMEPAGE=http://site.icu-project.org/home TERMUX_PKG_DESCRIPTION='International Components for Unicode library' TERMUX_PKG_LICENSE="BSD" -TERMUX_PKG_VERSION=67.1 -TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/icu4c-${TERMUX_PKG_VERSION//./_}-src.tar.xz -TERMUX_PKG_SHA256=37d32ff0c8e851d9d6e6a1635ec036837a4c1391d03dc1adecfab897e8bf3c8a +# Function `icu::number::FormattedNumber::getAllFieldPositions` was removed +# from v67 and that breaks packages nodejs, nodejs-lts. +TERMUX_PKG_VERSION=66.1 +TERMUX_PKG_SRCURL=https://github.com/unicode-org/icu/releases/download/release-${TERMUX_PKG_VERSION//./-}/icu4c-${TERMUX_PKG_VERSION//./_}-src.tgz +TERMUX_PKG_SHA256=52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BREAKS="libicu-dev" TERMUX_PKG_REPLACES="libicu-dev" diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index 332e1c07f..9bd060f6b 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -23,13 +23,13 @@ termux_step_post_extract_package() { } termux_step_host_build() { - local ICU_VERSION=67.1 - local ICU_TAR=icu4c-${ICU_VERSION//./_}-src.tar.xz - local ICU_DOWNLOAD=https://fossies.org/linux/misc/$ICU_TAR + local ICU_VERSION=66.1 + local ICU_TAR=icu4c-${ICU_VERSION//./_}-src.tgz + local ICU_DOWNLOAD=https://github.com/unicode-org/icu/releases/download/release-${TERMUX_PKG_VERSION//./-}/$ICU_TAR termux_download \ $ICU_DOWNLOAD\ $TERMUX_PKG_CACHEDIR/$ICU_TAR \ - 37d32ff0c8e851d9d6e6a1635ec036837a4c1391d03dc1adecfab897e8bf3c8a + 52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e tar xf $TERMUX_PKG_CACHEDIR/$ICU_TAR cd icu/source if [ "$TERMUX_ARCH_BITS" = 32 ]; then diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index 4a05861d0..b5af28d62 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -35,13 +35,13 @@ termux_step_post_extract_package() { } termux_step_host_build() { - local ICU_VERSION=67.1 - local ICU_TAR=icu4c-${ICU_VERSION//./_}-src.tar.xz - local ICU_DOWNLOAD=https://fossies.org/linux/misc/$ICU_TAR + local ICU_VERSION=66.1 + local ICU_TAR=icu4c-${ICU_VERSION//./_}-src.tgz + local ICU_DOWNLOAD=https://github.com/unicode-org/icu/releases/download/release-${TERMUX_PKG_VERSION//./-}/$ICU_TAR termux_download \ $ICU_DOWNLOAD\ $TERMUX_PKG_CACHEDIR/$ICU_TAR \ - 37d32ff0c8e851d9d6e6a1635ec036837a4c1391d03dc1adecfab897e8bf3c8a + 52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e tar xf $TERMUX_PKG_CACHEDIR/$ICU_TAR cd icu/source if [ "$TERMUX_ARCH_BITS" = 32 ]; then