From b4b35f2f10d8e226145f6cc0e0c46c6d7e12c17f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 19 Oct 2015 17:36:12 -0400
Subject: [PATCH] tmux: Update to 2.1

---
 packages/tmux/build.sh     |  5 ++---
 packages/tmux/tmux.conf    |  5 +----
 packages/tmux/tmux_h.patch | 19 ++++++++++++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh
index 09191f25..2e96a5f0 100755
--- a/packages/tmux/build.sh
+++ b/packages/tmux/build.sh
@@ -1,9 +1,8 @@
 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"
 TERMUX_PKG_DEPENDS="ncurses, libevent, libutil"
-TERMUX_PKG_VERSION=2.0
-TERMUX_PKG_BUILD_REVISION=4
-TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tmux/tmux/tmux-${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION=2.1
+TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/releases/download/${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_post_make_install () {
diff --git a/packages/tmux/tmux.conf b/packages/tmux/tmux.conf
index d53cd037..207e5b59 100644
--- a/packages/tmux/tmux.conf
+++ b/packages/tmux/tmux.conf
@@ -1,5 +1,2 @@
-set -g mode-mouse on
-set -g mouse-select-pane on
-set -g mouse-select-window on
-set -g mouse-resize-pane on
+set -g mouse on
 set -s escape-time 0
diff --git a/packages/tmux/tmux_h.patch b/packages/tmux/tmux_h.patch
index 27662bfd..edcc83a3 100644
--- a/packages/tmux/tmux_h.patch
+++ b/packages/tmux/tmux_h.patch
@@ -1,7 +1,16 @@
-diff -u -r ../tmux-1.9a/tmux.h ./tmux.h
---- ../tmux-1.9a/tmux.h	2014-02-22 21:48:37.000000000 +0100
-+++ ./tmux.h	2014-02-24 08:44:04.000000000 +0100
-@@ -62,7 +62,7 @@
+diff -u -r ../tmux-2.1/tmux.h ./tmux.h
+--- ../tmux-2.1/tmux.h	2015-09-27 05:51:49.000000000 -0400
++++ ./tmux.h	2015-10-19 17:33:45.737891900 -0400
+@@ -40,7 +40,7 @@
+ extern char   **environ;
+ 
+ /* 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
+@@ -72,7 +72,7 @@
  #define fatalx(msg) log_fatalx("%s: %s", __func__, msg);
  
  /* Definition to shut gcc up about unused arguments. */
@@ -9,4 +18,4 @@ diff -u -r ../tmux-1.9a/tmux.h ./tmux.h
 +#define unused
  
  /* Attribute to make gcc check printf-like arguments. */
- #define printflike1 __attribute__ ((format (printf, 1, 2)))
+ #define printflike(a, b) __attribute__ ((format (printf, a, b)))
-- 
2.11.0