weechat: Fix the python plugin to load

diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh
index 564652337d0e089a942a1e5399d6b44d7a25c608..1230d9b649076b909a57d985106231654f4b8b69 100755 (executable)
--- a/packages/weechat/build.sh
+++ b/packages/weechat/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://weechat.org/
 TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client"
 TERMUX_PKG_VERSION=1.4
 TERMUX_PKG_HOMEPAGE=http://weechat.org/
 TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client"
 TERMUX_PKG_VERSION=1.4

+TERMUX_PKG_BUILD_REVISION=1

 TERMUX_PKG_SRCURL=http://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="ncurses, libgcrypt, libcurl, libgnutls, libandroid-support"
 # weechat-curses is a symlink to weechat, so remove it:
 TERMUX_PKG_SRCURL=http://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="ncurses, libgcrypt, libcurl, libgnutls, libandroid-support"
 # weechat-curses is a symlink to weechat, so remove it:


@@ -28,7 +29,6 @@ termux_step_configure () {
                -DCA_FILE="$TERMUX_PREFIX/etc/tls/cert.pem" \
                -DENABLE_LUA=OFF \
                -DENABLE_MAN=ON \
                -DCA_FILE="$TERMUX_PREFIX/etc/tls/cert.pem" \
                -DENABLE_LUA=OFF \
                -DENABLE_MAN=ON \

-               -DENABLE_PYTHON=ON \

                -DENABLE_PYTHON3=ON \
                -DENABLE_TCL=OFF \
                $TERMUX_PKG_SRCDIR
                -DENABLE_PYTHON3=ON \
                -DENABLE_TCL=OFF \
                $TERMUX_PKG_SRCDIR

diff --git a/packages/weechat/cmake-FindPython.cmake.patch b/packages/weechat/cmake-FindPython.cmake.patch
index 0546912ee165fcd814dbb7c9e1a23dd67b5178b2..100fac0a5ee2fa27b490c1b3cdf096ba4558b1b5 100644 (file)
--- a/packages/weechat/cmake-FindPython.cmake.patch
+++ b/packages/weechat/cmake-FindPython.cmake.patch
@@ -72,7 +72,7 @@ diff -u -r ../weechat-1.3/cmake/FindPython.cmake ./cmake/FindPython.cmake
 +set(PYTHON_EXECUTABLE "/data/data/com.termux/files/usr/bin/python")
 +set(PYTHON_INCLUDE_PATH "/data/data/com.termux/files/usr/include/python3.5m")
 +set(PYTHON_LIBRARY "/data/data/com.termux/files/usr/lib")
 +set(PYTHON_EXECUTABLE "/data/data/com.termux/files/usr/bin/python")
 +set(PYTHON_INCLUDE_PATH "/data/data/com.termux/files/usr/include/python3.5m")
 +set(PYTHON_LIBRARY "/data/data/com.termux/files/usr/lib")

-+set(PYTHON_LFLAGS "-Xlinker -export-dynamic")
++set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.5m")

 +set(PYTHON_FOUND TRUE)
  
    mark_as_advanced(
 +set(PYTHON_FOUND TRUE)
  
    mark_as_advanced(