From 8f824094ea638fb77f0905df4bc3b150933d3a49 Mon Sep 17 00:00:00 2001 From: YAKSH BARIYA Date: Mon, 1 Nov 2021 07:57:47 +0530 Subject: [PATCH] libicu: Bump to 70.1 (#7898) * libicu: Bump to 70.1 * Revbump for packages dependent on libicu * samba: Bump to 4.14.9 Samba old version tarball removed from website. Newer 4.15.1 is available but needs some experienced user to test and compile, lets leave it for now and dont block libicu upgrade * php: Fix builds with libicu 70.1 * php: Fix libgd constants * nodejs,nodejs-lts: Rebuild after libicu upgrade --- packages/libical/build.sh | 2 +- packages/libicu/build.sh | 5 +-- packages/libzim/build.sh | 1 + packages/music-file-organizer/build.sh | 2 +- packages/nodejs-lts/build.sh | 5 ++- packages/nodejs/build.sh | 5 ++- packages/php/build.sh | 2 +- packages/php/fix-gd-constants.patch | 53 ++++++++++++++++++++++++++ packages/php/icu-70.patch | 52 +++++++++++++++++++++++++ packages/postgresql/build.sh | 1 + packages/samba/build.sh | 5 +-- packages/texlive-bin/build.sh | 2 +- 12 files changed, 121 insertions(+), 14 deletions(-) create mode 100644 packages/php/fix-gd-constants.patch create mode 100644 packages/php/icu-70.patch diff --git a/packages/libical/build.sh b/packages/libical/build.sh index 302cd0722..b4a9a97a8 100644 --- a/packages/libical/build.sh +++ b/packages/libical/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Libical is an Open Source implementation of the iCalenda TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.0.11 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/libical/libical/releases/download/v$TERMUX_PKG_VERSION/libical-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh index 8ea265b9f..43e80feb9 100644 --- a/packages/libicu/build.sh +++ b/packages/libicu/build.sh @@ -5,10 +5,9 @@ TERMUX_PKG_LICENSE="BSD" # this hack to be able to find the license file. TERMUX_PKG_LICENSE_FILE="../LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=69.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=70.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=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 +TERMUX_PKG_SHA256=8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BREAKS="libicu-dev" TERMUX_PKG_REPLACES="libicu-dev" diff --git a/packages/libzim/build.sh b/packages/libzim/build.sh index e25d0db1e..6e3c5beed 100644 --- a/packages/libzim/build.sh +++ b/packages/libzim/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The ZIM library is the reference implementation for the TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=6.3.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/openzim/libzim/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=648fb5af65dd28a6b221b9294217939bf5abf929d706e7323ebb4196849a923c TERMUX_PKG_DEPENDS="zstd, libuuid, zlib, libicu, liblzma, libxapian, googletest" diff --git a/packages/music-file-organizer/build.sh b/packages/music-file-organizer/build.sh index 2f154d36a..788db89eb 100644 --- a/packages/music-file-organizer/build.sh +++ b/packages/music-file-organizer/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Organizer of audio files into directories based on metad TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.0.3 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=042c33f6db7da8889125359db02054fa1fcbfad339e8841e7e26474bf6aed3ad TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index 62b4227f2..e4b545709 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open Source, cross-platform JavaScript runtime environme TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=16.13.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=32114b3dc3945ed0f95f8bc33b42c68e0ef18c408cb56122572a163d907ecbcc # Note that we do not use a shared libuv to avoid an issue with the Android @@ -23,13 +24,13 @@ termux_step_post_get_source() { } termux_step_host_build() { - local ICU_VERSION=69.1 + local ICU_VERSION=70.1 local ICU_TAR=icu4c-${ICU_VERSION//./_}-src.tgz local ICU_DOWNLOAD=https://github.com/unicode-org/icu/releases/download/release-${ICU_VERSION//./-}/$ICU_TAR termux_download \ $ICU_DOWNLOAD\ $TERMUX_PKG_CACHEDIR/$ICU_TAR \ - 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 + 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 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 f4a2f7303..ebdb0b96a 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open Source, cross-platform JavaScript runtime environme TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=17.0.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=6ec480f872cb7c34877044985e3d7bd89329ace5b8e2ad90b57980601786341c # Note that we do not use a shared libuv to avoid an issue with the Android @@ -23,13 +24,13 @@ termux_step_post_get_source() { } termux_step_host_build() { - local ICU_VERSION=69.1 + local ICU_VERSION=70.1 local ICU_TAR=icu4c-${ICU_VERSION//./_}-src.tgz local ICU_DOWNLOAD=https://github.com/unicode-org/icu/releases/download/release-${ICU_VERSION//./-}/$ICU_TAR termux_download \ $ICU_DOWNLOAD\ $TERMUX_PKG_CACHEDIR/$ICU_TAR \ - 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 + 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5 tar xf $TERMUX_PKG_CACHEDIR/$ICU_TAR cd icu/source if [ "$TERMUX_ARCH_BITS" = 32 ]; then diff --git a/packages/php/build.sh b/packages/php/build.sh index dc9092663..67702a235 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="PHP-3.01" TERMUX_PKG_LICENSE_FILE=LICENSE TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=8.0.6 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://github.com/php/php-src/archive/php-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ddf7a059cf5cd26d00bc5493f1ca2242172408c0dcc4acdba6ef8952f8bb5a38 # Build native php for phar to build (see pear-Makefile.frag.patch): diff --git a/packages/php/fix-gd-constants.patch b/packages/php/fix-gd-constants.patch new file mode 100644 index 000000000..70a5621ea --- /dev/null +++ b/packages/php/fix-gd-constants.patch @@ -0,0 +1,53 @@ +Source https://github.com/php/php-src/pull/7490 + +diff --git a/ext/gd/gd.c b/ext/gd/gd.c +index 287cb2f712f8..880d6dddc7d7 100644 +--- a/ext/gd/gd.c ++++ b/ext/gd/gd.c +@@ -88,10 +88,10 @@ + #define M_PI 3.14159265358979323846 + #endif + +-/* workaround typo in system libgd 2.3.0 */ +-#if defined(GD_FLIP_HORINZONTAL) && !defined(GD_FLIP_HORIZONTAL) +-#define GD_FLIP_HORIZONTAL GD_FLIP_HORINZONTAL +-#endif ++/* don't used libgd constants, not used, so going to be removed */ ++#define PHP_GD_FLIP_HORIZONTAL 1 ++#define PHP_GD_FLIP_VERTICAL 2 ++#define PHP_GD_FLIP_BOTH 3 + + #ifdef HAVE_GD_FREETYPE + static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int); +@@ -400,9 +400,9 @@ PHP_MINIT_FUNCTION(gd) + /* GD2 image format types */ + REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); +- REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT); +- REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT); +- REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT); ++ REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT); +@@ -3599,15 +3599,15 @@ PHP_FUNCTION(imageflip) + im = php_gd_libgdimageptr_from_zval_p(IM); + + switch (mode) { +- case GD_FLIP_VERTICAL: ++ case PHP_GD_FLIP_VERTICAL: + gdImageFlipVertical(im); + break; + +- case GD_FLIP_HORIZONTAL: ++ case PHP_GD_FLIP_HORIZONTAL: + gdImageFlipHorizontal(im); + break; + +- case GD_FLIP_BOTH: ++ case PHP_GD_FLIP_BOTH: + gdImageFlipBoth(im); + break; + diff --git a/packages/php/icu-70.patch b/packages/php/icu-70.patch new file mode 100644 index 000000000..0b8b69fef --- /dev/null +++ b/packages/php/icu-70.patch @@ -0,0 +1,52 @@ +From https://bugs.php.net/patch-display.php?bug_id=81572&patch=icu70betterpatch&revision=1635621664&download=1 + +diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp +index 71ba056994..b00e5b4ef5 100644 +--- a/ext/intl/breakiterator/codepointiterator_internal.cpp ++++ b/ext/intl/breakiterator/codepointiterator_internal.cpp +@@ -14,6 +14,7 @@ + + #include "codepointiterator_internal.h" + #include ++#include + #include + + #include "php.h" +@@ -73,7 +74,11 @@ CodePointBreakIterator::~CodePointBreakIterator() + clearCurrentCharIter(); + } + +-UBool CodePointBreakIterator::operator==(const BreakIterator& that) const ++#if U_ICU_VERSION_MAJOR_NUM >= 70 ++bool CodePointBreakIterator::operator==(const BreakIterator& that) const ++#else ++UBool CodePointBreakIterator::operator==(const BreakIterator& that) const ++#endif + { + if (typeid(*this) != typeid(that)) { + return false; +diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h +index 43ec79d0b7..334981f96f 100644 +--- a/ext/intl/breakiterator/codepointiterator_internal.h ++++ b/ext/intl/breakiterator/codepointiterator_internal.h +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + using icu::BreakIterator; + using icu::CharacterIterator; +@@ -37,8 +38,11 @@ namespace PHP { + + virtual ~CodePointBreakIterator(); + ++#if U_ICU_VERSION_MAJOR_NUM >= 70 ++ virtual bool operator==(const BreakIterator& that) const; ++#else + virtual UBool operator==(const BreakIterator& that) const; +- ++#endif + virtual CodePointBreakIterator* clone(void) const; + + virtual UClassID getDynamicClassID(void) const; diff --git a/packages/postgresql/build.sh b/packages/postgresql/build.sh index e48eca1bb..6be9f8630 100644 --- a/packages/postgresql/build.sh +++ b/packages/postgresql/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_LICENSE_FILE="COPYRIGHT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=13.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem, libuuid, libxml2, libicu, zlib" diff --git a/packages/samba/build.sh b/packages/samba/build.sh index 158fe1449..0e93fdf93 100644 --- a/packages/samba/build.sh +++ b/packages/samba/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.samba.org/ TERMUX_PKG_DESCRIPTION="SMB/CIFS fileserver" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.14.8 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=4.14.9 TERMUX_PKG_SRCURL=https://download.samba.org/pub/samba/samba-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=c936b782c2aced8cd7299c13bec67c495fd4affdb217a6ed6150f4fd6d770fde +TERMUX_PKG_SHA256=7fb11818ef7f9bb817a3b21019358b1469aec98799057cc9e55933563361c409 TERMUX_PKG_DEPENDS="libbsd, libcap, libcrypt, libgnutls, libiconv, libicu, libpopt, libtalloc, libtirpc, ncurses, openssl, readline, zlib" TERMUX_PKG_BUILD_DEPENDS="e2fsprogs" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh index 70cb13b26..09f8c3ca6 100644 --- a/packages/texlive-bin/build.sh +++ b/packages/texlive-bin/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=20210325 _SVN_VERSION=58837 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/svn${_SVN_VERSION}.tar.gz TERMUX_PKG_SHA256=0afa6919e44675b7afe0fa45344747afef07b6ee98eeb14ff6a2ef78f458fc12 TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua52, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib, zziplib"