tmux: Update from 2.3 to 2.4

diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh
index ff797e252756dadcff198f418f4a9f1112f78809..5d32da2971e0e2832f238b3bdc1b99129640f767 100755 (executable)
--- a/packages/tmux/build.sh
+++ b/packages/tmux/build.sh
@@ -1,13 +1,16 @@
 TERMUX_PKG_HOMEPAGE=http://tmux.github.io/
 TERMUX_PKG_DESCRIPTION="Terminal multiplexer implementing switching between several programs in one terminal, detaching them and reattaching them to a different terminal"
 # Link against libandroid-support for wcwidth(), see https://github.com/termux/termux-packages/issues/224
-TERMUX_PKG_DEPENDS="ncurses, libevent, libutil, libandroid-support"
-TERMUX_PKG_VERSION=2.3
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_DEPENDS="ncurses, libevent, libutil, libandroid-support, libandroid-glob"
+TERMUX_PKG_VERSION=2.4
+TERMUX_PKG_SHA256=757d6b13231d0d9dd48404968fc114ac09e005d475705ad0cd4b7166f799b349
 TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/releases/download/${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b
 TERMUX_PKG_BUILD_IN_SRC=yes
 
+termux_step_pre_configure() {
+       LDFLAGS+=" -landroid-glob"
+}
+
 termux_step_post_make_install () {
        cp $TERMUX_PKG_BUILDER_DIR/tmux.conf $TERMUX_PREFIX/etc/tmux.conf
 }

diff --git a/packages/tmux/compat-imsg.c.patch b/packages/tmux/compat-imsg.c.patch
new file mode 100644 (file)
index 0000000..40c2a09
--- /dev/null
+++ b/packages/tmux/compat-imsg.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../tmux-2.4/compat/imsg.c ./compat/imsg.c
+--- ../tmux-2.4/compat/imsg.c  2017-04-19 14:49:29.000000000 +0200
++++ ./compat/imsg.c    2017-04-22 02:21:48.592932564 +0200
+@@ -73,7 +73,7 @@
+ again:
+       if (getdtablecount() + imsg_fd_overhead +
+           (int)((CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int))
+-          >= getdtablesize()) {
++          >= sysconf(_SC_OPEN_MAX)) {
+               errno = EAGAIN;
+               free(ifd);
+               return (-1);

diff --git a/packages/tmux/tmux.h.patch b/packages/tmux/tmux.h.patch
deleted file mode 100644 (file)
index 0c06784..0000000
--- a/packages/tmux/tmux.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../tmux-2.2/tmux.h ./tmux.h
---- ../tmux-2.2/tmux.h 2016-04-03 20:16:53.000000000 -0400
-+++ ./tmux.h   2016-04-11 04:38:13.276761966 -0400
-@@ -51,7 +51,7 @@
- struct tmuxproc;
- 
- /* Default global configuration file. */
--#define TMUX_CONF "/etc/tmux.conf"
-+#define TMUX_CONF "@TERMUX_PREFIX@/etc/tmux.conf"
- 
- /*
-  * Minimum layout cell size, NOT including separator line. The scroll region