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=3
+TERMUX_PKG_VERSION=1.5
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:
-diff -u -r ../weechat-1.3/cmake/FindPython.cmake ./cmake/FindPython.cmake
---- ../weechat-1.3/cmake/FindPython.cmake 2015-08-16 02:27:07.000000000 -0400
-+++ ./cmake/FindPython.cmake 2016-01-03 08:11:31.987778557 -0500
-@@ -28,70 +28,11 @@
- # PYTHON_LIBRARY = path to where libpython.so* can be found
- # PYTHON_LFLAGS = python compiler options for linking
+diff -u -r ../weechat-1.5/cmake/FindPython.cmake ./cmake/FindPython.cmake
+--- ../weechat-1.5/cmake/FindPython.cmake 2016-05-01 06:50:12.000000000 -0400
++++ ./cmake/FindPython.cmake 2016-05-03 04:00:56.742055189 -0400
+@@ -33,65 +33,11 @@
+ set(PYTHON_FIND_QUIETLY TRUE)
+ endif()
--if(PYTHON_FOUND)
-- # Already in cache, be silent
-- set(PYTHON_FIND_QUIETLY TRUE)
--endif()
--
-if(ENABLE_PYTHON3)
- find_program(PYTHON_EXECUTABLE
- NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
- )
-
- execute_process(
-- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
+- 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
- )
-
- set(PYTHON_FOUND TRUE)
- endif()
- endif()
-+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 "@TERMUX_PREFIX@/bin/python")
++set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.5m")
++set(PYTHON_LIBRARY "@TERMUX_PREFIX@/lib")
+set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.5m")
+set(PYTHON_FOUND TRUE)
mark_as_advanced(
PYTHON_EXECUTABLE
-@@ -99,5 +40,3 @@
- PYTHON_LIBRARY
+@@ -100,4 +46,3 @@
PYTHON_LFLAGS
)
--
+
-endif()
+++ /dev/null
-diff -u -r ../weechat-1.3/cmake/FindRuby.cmake ./cmake/FindRuby.cmake
---- ../weechat-1.3/cmake/FindRuby.cmake 2015-08-16 02:27:07.000000000 -0400
-+++ ./cmake/FindRuby.cmake 2016-01-03 07:50:12.392704575 -0500
-@@ -33,7 +33,7 @@
-
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
-- pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
-+ pkg_search_module(RUBY ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
- endif()
-
- if(RUBY_FOUND)
Enable mouse support by default.
-diff -u -r ../weechat-1.2/src/core/wee-config.c ./src/core/wee-config.c
---- ../weechat-1.2/src/core/wee-config.c 2015-05-10 03:24:50.000000000 -0400
-+++ ./src/core/wee-config.c 2015-08-12 00:20:55.006420493 -0400
-@@ -2619,7 +2619,7 @@
+diff -u -r ../weechat-1.5/src/core/wee-config.c ./src/core/wee-config.c
+--- ../weechat-1.5/src/core/wee-config.c 2016-05-01 06:50:12.000000000 -0400
++++ ./src/core/wee-config.c 2016-05-03 03:36:49.136508465 -0400
+@@ -2993,7 +2993,7 @@
weechat_config_file, ptr_section,
"mouse", "boolean",
N_("enable mouse support"),
-- NULL, 0, 0, "off", NULL, 0, NULL, NULL, &config_change_mouse, NULL, NULL, NULL);
-+ NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_mouse, NULL, NULL, NULL);
- config_look_mouse_timer_delay = config_file_new_option (
- weechat_config_file, ptr_section,
- "mouse_timer_delay", "integer",
+- NULL, 0, 0, "off", NULL, 0,
++ NULL, 0, 0, "on", NULL, 0,
+ NULL, NULL, NULL,
+ &config_change_mouse, NULL, NULL,
+ NULL, NULL, NULL);