From e87944c492f6f619339ca081d85f075eacb33c65 Mon Sep 17 00:00:00 2001 From: Aditya Alok Date: Thu, 31 Mar 2022 20:58:51 +0530 Subject: [PATCH] fix(profanity): patch `configure.ac` to disable running python check Signed-off-by: Aditya Alok --- packages/profanity/build.sh | 24 ++++++++++++------------ packages/profanity/configure.ac.patch | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 packages/profanity/configure.ac.patch diff --git a/packages/profanity/build.sh b/packages/profanity/build.sh index 54e58c0af..6b2518cc8 100644 --- a/packages/profanity/build.sh +++ b/packages/profanity/build.sh @@ -6,22 +6,22 @@ TERMUX_PKG_VERSION=0.12.0 TERMUX_PKG_SRCURL=https://github.com/profanity-im/profanity/releases/download/$TERMUX_PKG_VERSION/profanity-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9e60de8cb7f747f3d433a5b091e4d439d6e2b71a958e1a7607681660638793d6 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="libandroid-support, libffi, ncurses, glib, libmesode, libcurl, readline, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib, libsignal-protocol-c, libstrophe" +TERMUX_PKG_DEPENDS="libandroid-support, libffi, ncurses, glib, libcurl, readline, libsqlite, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib, libsignal-protocol-c, libstrophe" TERMUX_PKG_BREAKS="profanity-dev" TERMUX_PKG_REPLACES="profanity-dev" -# openssl, libexpat needed by libmesode, pcre needed by glib: -TERMUX_PKG_BUILD_DEPENDS="openssl, libexpat, pcre, libgcrypt, libcrypt" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python-plugins --without-xscreensaver" +# pcre needed by glib: +TERMUX_PKG_BUILD_DEPENDS="pcre, libgcrypt, libcrypt" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-plugins --without-xscreensaver" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.10" - LDFLAGS+=" -lpython3.10" -} + _PYTHON_VERSION="$( + . "${TERMUX_SCRIPTDIR}"/packages/python/build.sh + echo "${_MAJOR_VERSION}" + )" -termux_step_post_configure() { - # Enable python support manually, as trying to go using --enable-python-plugins - # causes configure trying to execute python: - echo '#define HAVE_PYTHON 1' >> $TERMUX_PKG_SRCDIR/src/config.h - perl -p -i -e 's|#am__objects_2|am__objects_2|' $TERMUX_PKG_SRCDIR/Makefile + CPPFLAGS+=" -I$TERMUX_PREFIX/include/python${_PYTHON_VERSION}" + LDFLAGS+=" -lpython${_PYTHON_VERSION}" + + autoreconf -fiv } diff --git a/packages/profanity/configure.ac.patch b/packages/profanity/configure.ac.patch new file mode 100644 index 000000000..425e8e447 --- /dev/null +++ b/packages/profanity/configure.ac.patch @@ -0,0 +1,14 @@ +--- profanity-0.12.0/configure.ac 2022-03-30 17:58:28.000000000 +0530 ++++ profanity-0.12.0-patch/configure.ac 2022-03-31 20:48:46.031796850 +0530 +@@ -99,9 +99,8 @@ + AC_MSG_NOTICE([Symlinking Python.framework to $PYTHON_FRAMEWORK]) + rm -f Python.framework + ln -s $PYTHON_FRAMEWORK Python.framework ]) +- PKG_CHECK_MODULES([python], [python-embed], [PYTHON_CONFIG_EXISTS=yes], [PYTHON_CONFIG_EXISTS=no]) +- PKG_CHECK_MODULES([python], [python3-embed], [PYTHON3_CONFIG_EXISTS=yes; AC_DEFINE(PY_IS_PYTHON3, [1], [Is Python version 3])], [PYTHON3_CONFIG_EXISTS=no]) +- if test "$PYTHON_CONFIG_EXISTS" = "yes" || test "$PYTHON3_CONFIG_EXISTS" = "yes"; then ++ AC_DEFINE([PY_IS_PYTHON3], [1], [Is Python version 3]) ++ if true; then + AM_CONDITIONAL([BUILD_PYTHON_API], [true]) + AC_DEFINE([HAVE_PYTHON], [1], [Python support]) + else