diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh index 550eef456..2a88ca36e 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 a7f8a7aab..000000000 --- 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 - #include - #include -+#ifndef __ANDROID__ - #include -+#endif - #include - #include - #include -@@ -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, "");