From f0e40ca887533ae7e23013922f79c0e7f1fd09eb Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 16 May 2017 15:16:27 +0200
Subject: [PATCH] weechat: Update from 1.7.1 to 1.8

---
 packages/weechat/build.sh                     |  4 ++--
 packages/weechat/cmake-FindPython.cmake.patch | 10 +++++-----
 packages/weechat/cmake-FindRuby.cmake.patch   | 12 ------------
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 packages/weechat/cmake-FindRuby.cmake.patch

diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh
index 9d225762..3e436f06 100755
--- a/packages/weechat/build.sh
+++ b/packages/weechat/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://weechat.org/
 TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client"
-TERMUX_PKG_VERSION=1.7.1
-TERMUX_PKG_SHA256=c0f9786cdfcf7411bfadca828c5e0819ac641717f775da804d8fa2aa69a84080
+TERMUX_PKG_VERSION=1.8
+TERMUX_PKG_SHA256=087c44282e499bb0faf2d3e793ca4b2e714113d24040139cd1353d7a06017582
 TERMUX_PKG_SRCURL=https://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 --git a/packages/weechat/cmake-FindPython.cmake.patch b/packages/weechat/cmake-FindPython.cmake.patch
index ca7e6313..3ba6ac79 100644
--- a/packages/weechat/cmake-FindPython.cmake.patch
+++ b/packages/weechat/cmake-FindPython.cmake.patch
@@ -1,12 +1,12 @@
-diff -u -r ../weechat-1.6/cmake/FindPython.cmake ./cmake/FindPython.cmake
---- ../weechat-1.6/cmake/FindPython.cmake	2016-10-02 03:35:04.000000000 -0400
-+++ ./cmake/FindPython.cmake	2016-10-09 14:56:31.261168669 -0400
+diff -u -r ../weechat-1.8/cmake/FindPython.cmake ./cmake/FindPython.cmake
+--- ../weechat-1.8/cmake/FindPython.cmake	2017-05-13 07:07:57.000000000 +0200
++++ ./cmake/FindPython.cmake	2017-05-16 14:50:03.013699385 +0200
 @@ -34,64 +34,11 @@
  endif()
  
  if(ENABLE_PYTHON3)
 -  find_program(PYTHON_EXECUTABLE
--    NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-    NAMES 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()
@@ -38,7 +38,7 @@ diff -u -r ../weechat-1.6/cmake/FindPython.cmake ./cmake/FindPython.cmake
 -    )
 -  if(ENABLE_PYTHON3)
 -    find_library(PYTHON_LIBRARY
--      NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-      NAMES 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()
diff --git a/packages/weechat/cmake-FindRuby.cmake.patch b/packages/weechat/cmake-FindRuby.cmake.patch
deleted file mode 100644
index 751ae11c..00000000
--- a/packages/weechat/cmake-FindRuby.cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../weechat-1.7/cmake/FindRuby.cmake ./cmake/FindRuby.cmake
---- ../weechat-1.7/cmake/FindRuby.cmake	2017-01-15 07:41:25.000000000 +0100
-+++ ./cmake/FindRuby.cmake	2017-01-17 22:41:59.681388711 +0100
-@@ -33,7 +33,7 @@
- 
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
--  pkg_search_module(RUBY ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
-+  pkg_search_module(RUBY ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
- endif()
- 
- if(RUBY_FOUND)
-- 
2.11.0