From 9a03672c73ba7de210b3469d66b1567c2aef6452 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 13 Apr 2019 18:49:55 +0200 Subject: [PATCH] ncmpcpp: link against libandroid-support ncmpcpp segfaults on android 9 because it picks up iconv in libc.so if we don't link against libandroid-support.so properly. This fixes https://github.com/termux/termux-packages/issues/3333. --- packages/ncmpcpp/build.sh | 2 +- packages/ncmpcpp/locale.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 packages/ncmpcpp/locale.patch diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh index ac1ed24fd..8b3424fd4 100644 --- a/packages/ncmpcpp/build.sh +++ b/packages/ncmpcpp/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://rybczak.net/ncmpcpp/ TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.8.2 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="fftw, boost, readline, libcurl, libmpdclient, ncurses" diff --git a/packages/ncmpcpp/locale.patch b/packages/ncmpcpp/locale.patch new file mode 100644 index 000000000..e02a2e7ae --- /dev/null +++ b/packages/ncmpcpp/locale.patch @@ -0,0 +1,11 @@ +--- ../configure.ac.orig 2019-04-13 16:42:43.319705874 +0000 ++++ ./configure.ac 2019-04-13 16:42:50.146372491 +0000 +@@ -78,7 +78,7 @@ + AC_SUBST(BOOST_LOCALE_LDFLAGS) + AC_SUBST(BOOST_LOCALE_LIBS) + LDFLAGS="$LDFLAGS $BOOST_LOCALE_LDFLAGS" +-LIBS="$LIBS $BOOST_LOCALE_LIBS" ++LIBS="$LIBS $BOOST_LOCALE_LIBS -landroid-support" + + BOOST_PROGRAM_OPTIONS + AC_SUBST(BOOST_PROGRAM_OPTIONS_LDFLAGS)