summaryrefslogtreecommitdiff
path: root/user/tmux
diff options
context:
space:
mode:
Diffstat (limited to 'user/tmux')
-rw-r--r--user/tmux/APKBUILD25
-rw-r--r--user/tmux/no-yacc-needed.patch26
-rw-r--r--user/tmux/xterm-DECLRMM.patch23
3 files changed, 41 insertions, 33 deletions
diff --git a/user/tmux/APKBUILD b/user/tmux/APKBUILD
index ebd0a38c0..5edfa97f5 100644
--- a/user/tmux/APKBUILD
+++ b/user/tmux/APKBUILD
@@ -1,17 +1,23 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer:
+# Maintainer: Zach van Rijn <me@zv.io>
pkgname=tmux
-pkgver=2.7
-pkgrel=2
+pkgver=3.5a
+pkgrel=0
pkgdesc="Tool to control multiple terminals from a single terminal"
-url="https://tmux.github.io/"
+url="https://github.com/tmux/tmux/wiki"
arch="all"
license="MIT"
depends="ncurses-terminfo"
makedepends="bsd-compat-headers libevent-dev libutempter-dev ncurses-dev"
subpackages="$pkgname-doc"
source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
- xterm-DECLRMM.patch"
+ no-yacc-needed.patch
+ "
+
+prepare() {
+ default_prepare
+ autoreconf -fiv
+}
build() {
./configure \
@@ -33,10 +39,9 @@ package() {
install -Dm644 example_tmux.conf \
"$pkgdir"/usr/share/doc/$pkgname/examples/$pkgname.conf
- for file in CHANGES README TODO; do
- install -m644 "$file" "$pkgdir"/usr/share/doc/$pkgname/
- done
+ install -m644 "CHANGES" "$pkgdir"/usr/share/doc/$pkgname/
+ install -m644 "README" "$pkgdir"/usr/share/doc/$pkgname/
}
-sha512sums="7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37 tmux-2.7.tar.gz
-7fb006f8f24d60614fcaeadace933c2ad6674d2476980736a830f63a40d7110638942478322336849d47707c99ab7de0cb01ff39806a4c9144650daf2f666773 xterm-DECLRMM.patch"
+sha512sums="2383e99aec2dcdb1d899793d5ecab40a68b921194f84770d3f4d19712bfc85590657a99d2a9a7bec36d4ba5ab39fa713f13937b0acad3b61cd9b2302dba61d43 tmux-3.5a.tar.gz
+54494c910f361e23433f276c49e6257b1ccb028ffba1af032e5494e786eb35506d495714916774956db875306e090edd0c2bf8433b2cffc50c4a25d45dfb0594 no-yacc-needed.patch"
diff --git a/user/tmux/no-yacc-needed.patch b/user/tmux/no-yacc-needed.patch
new file mode 100644
index 000000000..1e6c706b3
--- /dev/null
+++ b/user/tmux/no-yacc-needed.patch
@@ -0,0 +1,26 @@
+From 00812c9053a0b1067f833925b726086a67d8528d Mon Sep 17 00:00:00 2001
+From: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Tue, 2 Aug 2022 11:52:09 +0100
+Subject: [PATCH] Check for $YACC, from Wei Shih in GitHub issue 3267.
+
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 276f71c8bf..8e84604289 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -267,12 +267,6 @@ if test "x$found_libevent" = xno; then
+ AC_MSG_ERROR("libevent not found")
+ fi
+
+-# Look for yacc.
+-AC_CHECK_PROG(found_yacc, $YACC, yes, no)
+-if test "x$found_yacc" = xno; then
+- AC_MSG_ERROR("yacc not found")
+-fi
+-
+ # Look for ncurses or curses. Try pkg-config first then directly for the
+ # library.
+ PKG_CHECK_MODULES(
diff --git a/user/tmux/xterm-DECLRMM.patch b/user/tmux/xterm-DECLRMM.patch
deleted file mode 100644
index b9bef3455..000000000
--- a/user/tmux/xterm-DECLRMM.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 26f274011096b9eacfd2753d8f7afcb63e796ab9 Mon Sep 17 00:00:00 2001
-From: nicm <nicm>
-Date: Thu, 1 Aug 2019 11:45:34 +0000
-Subject: [PATCH] xterm 348 now disables margins when resized, so send DECLRMM
- again.
-
----
- tty.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tty.c b/tty.c
-index ab1da9fd3..024aef271 100644
---- a/tty.c
-+++ b/tty.c
-@@ -1879,6 +1879,8 @@ tty_invalidate(struct tty *tty)
- tty->rlower = tty->rright = UINT_MAX;
-
- if (tty->flags & TTY_STARTED) {
-+ if (tty_use_margin(tty))
-+ tty_puts(tty, "\033[?69h"); /* DECLRMM */
- tty_putcode(tty, TTYC_SGR0);
-
- tty->mode = ALL_MODES;