Date: Tuesday, November 26, 2019 @ 17:01:43
Author: eworm
Revision: 533486
upgpkg: tmux 3.0-1
new upstream release
Modified:
tmux/trunk/PKGBUILD
Deleted:
tmux/trunk/0001-fix-sizing.patch
tmux/trunk/0002-xterm-348.patch
-----------------------+
0001-fix-sizing.patch | 112 ------------------------------------------------
0002-xterm-348.patch | 23 ---------
PKGBUILD | 17 +------
3 files changed, 3 insertions(+), 149 deletions(-)
Deleted: 0001-fix-sizing.patch
===================================================================
--- 0001-fix-sizing.patch 2019-11-26 16:50:07 UTC (rev 533485)
+++ 0001-fix-sizing.patch 2019-11-26 17:01:43 UTC (rev 533486)
@@ -1,112 +0,0 @@
-commit 38b8a198bac62c16d351c54ed83ead29a2e0ecc8
-Author: nicm <nicm>
-Date: Tue May 14 07:37:50 2019 +0000
-
- Fix sizing of main-vertical and main-horizontal layouts, GitHub issue 1736.
-
-diff --git a/layout-set.c b/layout-set.c
-index 3a088a4c..12b4780f 100644
---- a/layout-set.c
-+++ b/layout-set.c
-@@ -185,7 +185,7 @@ layout_set_main_h(struct window *w)
- {
- struct window_pane *wp;
- struct layout_cell *lc, *lcmain, *lcother, *lcchild;
-- u_int n, mainh, otherh, sx;
-+ u_int n, mainh, otherh, sx, sy;
-
- layout_print_cell(w->layout_root, __func__, 1);
-
-@@ -195,22 +195,25 @@ layout_set_main_h(struct window *w)
- return;
- n--; /* take off main pane */
-
-+ /* Find available height - take off one line for the border. */
-+ sy = w->sy - 1;
-+
- /* Get the main pane height and work out the other pane height. */
- mainh = options_get_number(w->options, "main-pane-height");
-- if (mainh + PANE_MINIMUM + 1 >= w->sy) {
-- if (w->sy <= PANE_MINIMUM + 1 + PANE_MINIMUM)
-+ if (mainh + PANE_MINIMUM >= sy) {
-+ if (sy <= PANE_MINIMUM + PANE_MINIMUM)
- mainh = PANE_MINIMUM;
- else
-- mainh = w->sy - (PANE_MINIMUM + 1);
-+ mainh = sy - PANE_MINIMUM;
- otherh = PANE_MINIMUM;
- } else {
- otherh = options_get_number(w->options, "other-pane-height");
- if (otherh == 0)
-- otherh = w->sy - mainh;
-- else if (otherh > w->sy || w->sy - otherh < mainh)
-- otherh = w->sy - mainh;
-+ otherh = sy - mainh;
-+ else if (otherh > sy || sy - otherh < mainh)
-+ otherh = sy - mainh;
- else
-- mainh = w->sy - otherh;
-+ mainh = sy - otherh;
- }
-
- /* Work out what width is needed. */
-@@ -221,7 +224,7 @@ layout_set_main_h(struct window *w)
- /* Free old tree and create a new root. */
- layout_free(w);
- lc = w->layout_root = layout_create_cell(NULL);
-- layout_set_size(lc, sx, mainh + otherh, 0, 0);
-+ layout_set_size(lc, sx, mainh + otherh + 1, 0, 0);
- layout_make_node(lc, LAYOUT_TOPBOTTOM);
-
- /* Create the main pane. */
-@@ -269,7 +272,7 @@ layout_set_main_v(struct window *w)
- {
- struct window_pane *wp;
- struct layout_cell *lc, *lcmain, *lcother, *lcchild;
-- u_int n, mainw, otherw, sy;
-+ u_int n, mainw, otherw, sx, sy;
-
- layout_print_cell(w->layout_root, __func__, 1);
-
-@@ -279,22 +282,25 @@ layout_set_main_v(struct window *w)
- return;
- n--; /* take off main pane */
-
-+ /* Find available width - take off one line for the border. */
-+ sx = w->sx - 1;
-+
- /* Get the main pane width and work out the other pane width. */
- mainw = options_get_number(w->options, "main-pane-width");
-- if (mainw + PANE_MINIMUM + 1 >= w->sx) {
-- if (w->sx <= PANE_MINIMUM + 1 + PANE_MINIMUM)
-+ if (mainw + PANE_MINIMUM >= sx) {
-+ if (sx <= PANE_MINIMUM + PANE_MINIMUM)
- mainw = PANE_MINIMUM;
- else
-- mainw = w->sx - (PANE_MINIMUM + 1);
-+ mainw = sx - PANE_MINIMUM;
- otherw = PANE_MINIMUM;
- } else {
- otherw = options_get_number(w->options, "other-pane-width");
- if (otherw == 0)
-- otherw = w->sx - mainw;
-- else if (otherw > w->sx || w->sx - otherw < mainw)
-- otherw = w->sx - mainw;
-+ otherw = sx - mainw;
-+ else if (otherw > sx || sx - otherw < mainw)
-+ otherw = sx - mainw;
- else
-- mainw = w->sx - otherw;
-+ mainw = sx - otherw;
- }
-
- /* Work out what height is needed. */
-@@ -305,7 +311,7 @@ layout_set_main_v(struct window *w)
- /* Free old tree and create a new root. */
- layout_free(w);
- lc = w->layout_root = layout_create_cell(NULL);
-- layout_set_size(lc, mainw + otherw, sy, 0, 0);
-+ layout_set_size(lc, mainw + otherw + 1, sy, 0, 0);
- layout_make_node(lc, LAYOUT_LEFTRIGHT);
-
- /* Create the main pane. */
Deleted: 0002-xterm-348.patch
===================================================================
--- 0002-xterm-348.patch 2019-11-26 16:50:07 UTC (rev 533485)
+++ 0002-xterm-348.patch 2019-11-26 17:01:43 UTC (rev 533486)
@@ -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;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-26 16:50:07 UTC (rev 533485)
+++ PKGBUILD 2019-11-26 17:01:43 UTC (rev 533486)
@@ -3,8 +3,8 @@
# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
pkgname=tmux
-pkgver=2.9_a
-pkgrel=4
+pkgver=3.0
+pkgrel=1
pkgdesc='A terminal multiplexer'
url='https://github.com/tmux/tmux/wiki'
arch=('x86_64')
@@ -11,21 +11,10 @@
license=('BSD')
depends=('ncurses' 'libevent' 'libutempter')
source=("https://github.com/tmux/tmux/releases/download/${pkgver/_/}/tmux-${pkgver/_/}.tar.gz";
- '0001-fix-sizing.patch'
- '0002-xterm-348.patch'
'LICENSE')
-sha256sums=('839d167a4517a6bffa6b6074e89a9a8630547b2dea2086f1fad15af12ab23b25'
- '74c89e7c85622c44a07fdce1eefd021dbb0e484a02f7da210ae3ebfa5fdd2fe4'
- '4405816aa3bc1cab7f2bd504fd3aac40d434151171c3d79e1ee88b65103b0600'
+sha256sums=('9edcd78df80962ee2e6471a8f647602be5ded62bb41c574172bb3dc3d0b9b4b4'
'b5de80619e4884ced2dfe0a96020e85dcfb715a831ecdfdd7ce8c97b5a6ff2cc')
-prepare() {
- cd "$srcdir/$pkgname-${pkgver/_/}"
-
- patch -Np1 < ../0001-fix-sizing.patch
- patch -Np1 < ../0002-xterm-348.patch
-}
-
build() {
cd "$srcdir/$pkgname-${pkgver/_/}"
