From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 3 Oct 2016 12:41:45 +0000 (-0400)
Subject: tmux: Update from 2.2 to 2.3
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/421607509cf4766e7116c51c91b4d8bd75b35386?hp=34b46b56de338349dfa321a01397364b3c52b449

tmux: Update from 2.2 to 2.3
---

diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh
index 550eef45..2a88ca36 100755
--- a/packages/tmux/build.sh
+++ b/packages/tmux/build.sh
@@ -2,8 +2,7 @@ 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.2
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=2.3
 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
 
diff --git a/packages/tmux/tmux.c.patch b/packages/tmux/tmux.c.patch
deleted file mode 100644
index a7f8a7aa..00000000
--- a/packages/tmux/tmux.c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u -r ../tmux-2.2/tmux.c ./tmux.c
---- ../tmux-2.2/tmux.c	2016-03-05 12:55:49.000000000 -0500
-+++ ./tmux.c	2016-04-11 04:36:26.594521819 -0400
-@@ -24,7 +24,9 @@
- #include <event.h>
- #include <fcntl.h>
- #include <getopt.h>
-+#ifndef __ANDROID__
- #include <langinfo.h>
-+#endif
- #include <locale.h>
- #include <pwd.h>
- #include <stdlib.h>
-@@ -195,10 +197,12 @@
- 	if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) {
- 		if (setlocale(LC_CTYPE, "") == NULL)
- 			errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
-+#ifndef __ANDROID__
- 		s = nl_langinfo(CODESET);
- 		if (strcasecmp(s, "UTF-8") != 0 &&
- 		    strcasecmp(s, "UTF8") != 0)
- 			errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
-+#endif
- 	}
- 
- 	setlocale(LC_TIME, "");