From 73e2c4f06b5b1c2bc88fb853856a6f2b831d1a50 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 15 Jul 2018 18:51:01 +0200
Subject: [PATCH] weechat: Update from 2.1 to 2.2

---
 packages/weechat/build.sh                          |  5 ++---
 packages/weechat/cmake-FindPython.cmake.patch      | 10 +++++-----
 .../weechat/src-gui-curses-headless-main.c.patch   | 14 --------------
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 packages/weechat/src-gui-curses-headless-main.c.patch

diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh
index 2dec8f53a..7a3280c0c 100755
--- a/packages/weechat/build.sh
+++ b/packages/weechat/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://weechat.org/
 TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client"
-TERMUX_PKG_VERSION=2.1
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=a83977ba0ecc9d4cf3aac5977266ce9e584a3e05f1d797c2184c6ceb1f47063b
+TERMUX_PKG_VERSION=2.2
+TERMUX_PKG_SHA256=8f621d638dc93db27a7865b6c4a67c14376bbd33315579de3998f0e30e84965c
 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 3ba6ac799..6f9d7fa21 100644
--- a/packages/weechat/cmake-FindPython.cmake.patch
+++ b/packages/weechat/cmake-FindPython.cmake.patch
@@ -1,12 +1,12 @@
-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
+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.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-    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()
@@ -38,7 +38,7 @@ diff -u -r ../weechat-1.8/cmake/FindPython.cmake ./cmake/FindPython.cmake
 -    )
 -  if(ENABLE_PYTHON3)
 -    find_library(PYTHON_LIBRARY
--      NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-      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()
diff --git a/packages/weechat/src-gui-curses-headless-main.c.patch b/packages/weechat/src-gui-curses-headless-main.c.patch
deleted file mode 100644
index 2e4fcdbf5..000000000
--- a/packages/weechat/src-gui-curses-headless-main.c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Submitted upstream at https://github.com/weechat/weechat/pull/1163
-
-diff -u -r ../weechat-2.1/src/gui/curses/headless/main.c ./src/gui/curses/headless/main.c
---- ../weechat-2.1/src/gui/curses/headless/main.c	2018-03-18 07:41:40.000000000 +0100
-+++ ./src/gui/curses/headless/main.c	2018-03-18 21:08:49.664939605 +0100
-@@ -72,7 +72,7 @@
-     setsid ();
- 
-     /* close all file descriptors */
--    for (i = getdtablesize(); i >= 0; --i)
-+    for (i = sysconf(_SC_OPEN_MAX); i >= 0; --i)
-     {
-         close (i);
-     }