sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "fix(profanity): patch configure.ac to disable running python check"

Browse Source 
This issue was fixed upstream

This reverts commit e87944c492.
This commit is contained in:
Aditya Alok 2022-04-01 19:50:00 +05:30
parent 89a2654864
commit 838558b8e7
No known key found for this signature in database
GPG Key ID: 5A52117417798AC7
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/profanity/build.sh
View File

@ -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, libcurl, readline, libsqlite, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib, libsignal-protocol-c, libstrophe"
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_BREAKS="profanity-dev"
TERMUX_PKG_REPLACES="profanity-dev"
# pcre needed by glib:
TERMUX_PKG_BUILD_DEPENDS="pcre, libgcrypt, libcrypt"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-plugins --without-xscreensaver"
# 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"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_pre_configure() {
_PYTHON_VERSION="$(
. "${TERMUX_SCRIPTDIR}"/packages/python/build.sh
echo "${_MAJOR_VERSION}"
)"
CPPFLAGS+=" -I$TERMUX_PREFIX/include/python${_PYTHON_VERSION}"
LDFLAGS+=" -lpython${_PYTHON_VERSION}"
autoreconf -fiv
CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.10"
LDFLAGS+=" -lpython3.10"
}
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
}

14
packages/profanity/configure.ac.patch
View File

@ -1,14 +0,0 @@
--- 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