diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh index 78d2e05b8..48f210513 100644 --- a/packages/weechat/build.sh +++ b/packages/weechat/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://weechat.org/ TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=2.5 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=2.6 TERMUX_PKG_SRCURL=https://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=4c772c949c59949ff4156560c66900c5aaa9ab2da4439ee278b7c21b24daf191 +TERMUX_PKG_SHA256=0b06e551e69018dbd4828113a56a9657a16cb787eb44bc83adf45424e65759d9 TERMUX_PKG_DEPENDS="libiconv, ncurses, libgcrypt, libcurl, libgnutls, libandroid-support, zlib" TERMUX_PKG_BREAKS="weechat-dev" TERMUX_PKG_REPLACES="weechat-dev" diff --git a/packages/weechat/cmake-FindPython.cmake.patch b/packages/weechat/cmake-FindPython.cmake.patch deleted file mode 100644 index 0b91d4dff..000000000 --- a/packages/weechat/cmake-FindPython.cmake.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -u -r ../weechat-2.2/cmake/FindPython.cmake ./cmake/FindPython.cmake ---- ../weechat-2.2/cmake/FindPython.cmake 2018-07-14 10:35:10.000000000 +0000 -+++ ./cmake/FindPython.cmake 2018-07-15 16:16:57.903335529 +0000 -@@ -34,64 +34,11 @@ - endif() - - if(ENABLE_PYTHON3) -- find_program(PYTHON_EXECUTABLE -- NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python -- PATHS /usr/bin /usr/local/bin /usr/pkg/bin -- ) --else() -- find_program(PYTHON_EXECUTABLE -- NAMES python2.7 python2.6 python2.5 python -- PATHS /usr/bin /usr/local/bin /usr/pkg/bin -- ) --endif() -- --if(PYTHON_EXECUTABLE) -- execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))" -- OUTPUT_VARIABLE PYTHON_INC_DIR -- ) -- -- execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))" -- OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH -- ) -- -- execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))" -- OUTPUT_VARIABLE PYTHON_LFLAGS -- ) -- -- find_path(PYTHON_INCLUDE_PATH -- NAMES Python.h -- HINTS ${PYTHON_INC_DIR} -- ) -- if(ENABLE_PYTHON3) -- find_library(PYTHON_LIBRARY -- NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python -- HINTS ${PYTHON_POSSIBLE_LIB_PATH} -- ) -- else() -- find_library(PYTHON_LIBRARY -- NAMES python2.7 python2.6 python2.5 python -- HINTS ${PYTHON_POSSIBLE_LIB_PATH} -- ) -- endif() -- -- if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) -- execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])" -- OUTPUT_VARIABLE PYTHON_VERSION -- ) -- execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))" -- OUTPUT_VARIABLE PYTHON_OLD_VERSION -- ) -- if(${PYTHON_OLD_VERSION} STREQUAL "True") -- message("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}") -- else() -- set(PYTHON_FOUND TRUE) -- endif() -- endif() -+ set(PYTHON_EXECUTABLE "@TERMUX_PREFIX@/bin/python") -+ set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.7m") -+ set(PYTHON_LIBRARY "@TERMUX_PREFIX@/lib") -+ set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.7m") -+ set(PYTHON_FOUND TRUE) - - mark_as_advanced( - PYTHON_EXECUTABLE