From a38c962b50f32786923db8c6dc3f23630f615925 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Fri, 28 Jun 2019 19:19:24 +0300 Subject: [PATCH] libffi: disable versioning + rebuild dependent packages --- packages/libffi/build.sh | 2 +- packages/libffi/no-version.patch | 21 +++++++++++++++++++++ packages/libgmime/build.sh | 6 +++--- packages/libllvm/build.sh | 2 +- packages/pango/build.sh | 6 +++--- packages/profanity/build.sh | 6 +++--- packages/python/build.sh | 2 +- packages/python2/build.sh | 2 +- packages/ruby/build.sh | 2 +- 9 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 packages/libffi/no-version.patch diff --git a/packages/libffi/build.sh b/packages/libffi/build.sh index 765e5e2e0..3b3bdde35 100644 --- a/packages/libffi/build.sh +++ b/packages/libffi/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://sourceware.org/libffi/ TERMUX_PKG_DESCRIPTION="Library providing a portable, high level programming interface to various calling conventions" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=3.2.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/libffi/libffi-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory" diff --git a/packages/libffi/no-version.patch b/packages/libffi/no-version.patch new file mode 100644 index 000000000..1de465328 --- /dev/null +++ b/packages/libffi/no-version.patch @@ -0,0 +1,21 @@ ++++ ./Makefile.am 2014-11-08 14:47:24.000000000 +0200 +@@ -249,7 +249,7 @@ + AM_CFLAGS += -DFFI_DEBUG + endif + +-libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) ++libffi_la_LDFLAGS = -no-undefined -avoid-version `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) + + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) + ++++ ./Makefile.in 2019-06-25 18:14:42.603887765 +0300 +@@ -723,7 +723,7 @@ + nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/libtool-ldflags $(LDFLAGS)) + AM_CFLAGS = $(am__append_41) +-libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) ++libffi_la_LDFLAGS = -no-undefined -avoid-version `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) + all: fficonfig.h diff --git a/packages/libgmime/build.sh b/packages/libgmime/build.sh index d4631de7f..6a78322c5 100644 --- a/packages/libgmime/build.sh +++ b/packages/libgmime/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://spruce.sourceforge.net/gmime/ TERMUX_PKG_DESCRIPTION="MIME message parser and creator" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.2.3 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gmime/${TERMUX_PKG_VERSION:0:3}/gmime-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_DEPENDS="glib, libiconv, libidn2, zlib" +TERMUX_PKG_SHA256=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311 +TERMUX_PKG_DEPENDS="glib, libffi, libiconv, libidn2, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_have_iconv_detect_h=yes diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index a466f37c0..d1528a9af 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=8.0.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=(8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c 084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b 9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37 diff --git a/packages/pango/build.sh b/packages/pango/build.sh index 69336f0d4..64f37ae7e 100644 --- a/packages/pango/build.sh +++ b/packages/pango/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.pango.org/ TERMUX_PKG_DESCRIPTION="Library for laying out and rendering text" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.42.4 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/pango/${TERMUX_PKG_VERSION:0:4}/pango-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_DEPENDS="fontconfig,fribidi,glib,harfbuzz,libcairo" +TERMUX_PKG_SHA256=1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d +TERMUX_PKG_DEPENDS="fontconfig, fribidi, glib, harfbuzz, libcairo, libffi" TERMUX_PKG_DEVPACKAGE_DEPENDS="libcairo-dev, libpixman-dev, fontconfig-dev, harfbuzz-dev" termux_step_post_make_install() { diff --git a/packages/profanity/build.sh b/packages/profanity/build.sh index ab89054ec..fa26b310f 100644 --- a/packages/profanity/build.sh +++ b/packages/profanity/build.sh @@ -1,12 +1,12 @@ TERMUX_PKG_HOMEPAGE=http://profanity.im TERMUX_PKG_DESCRIPTION="Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_VERSION=0.6.0 -TERMUX_PKG_REVISION=2 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" +TERMUX_PKG_VERSION=0.6.0 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://profanity.im/profanity-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f1b2773b79eb294297686f3913e9489c20effae5e3a335c8956db18f6ee2f660 -TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib, libmesode, libcurl, readline, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib" +TERMUX_PKG_DEPENDS="libandroid-support, libffi, ncurses, glib, libmesode, libcurl, readline, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib" # openssl, libexpat needed by libmesode, pcre needed by glib: TERMUX_PKG_BUILD_DEPENDS="openssl, libexpat, pcre, libgcrypt-dev, libcrypt-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python-plugins" diff --git a/packages/python/build.sh b/packages/python/build.sh index fdc9b4a0c..3223116ee 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libu TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev" _MAJOR_VERSION=3.7 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318 TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz diff --git a/packages/python2/build.sh b/packages/python2/build.sh index 477073913..f85303a4d 100644 --- a/packages/python2/build.sh +++ b/packages/python2/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_HOSTBUILD=true _MAJOR_VERSION=2.7 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.16 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7 TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index 91da0d08d..8757cffef 100644 --- a/packages/ruby/build.sh +++ b/packages/ruby/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity TERMUX_PKG_LICENSE="BSD 2-Clause" _MAJOR_VERSION=2.6 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz # libbffi is used by the fiddle extension module: