summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2020-06-13 21:42:43 +0000
committerleot <leot@pkgsrc.org>2020-06-13 21:42:43 +0000
commit7a83591eee9a71d3c299cedc73fa648a1b8767e8 (patch)
tree3e5412a43929abe7d16265c1699596f070689c6c /misc
parent03e7778b2ee4b0b561de83dfc922670937575903 (diff)
downloadpkgsrc-7a83591eee9a71d3c299cedc73fa648a1b8767e8.tar.gz
tmux: Update to 3.1b
pkgsrc changes: - Remove no longer needed patch-compat.h, all hunks applied upstream. Changes: CHANGES FROM 3.1a TO 3.1b * Fix build on systems without sys/queue.h. * Fix crash when allow-rename is on and an empty name is set. CHANGES FROM 3.1 TO 3.1a * Do not close stdout prematurely in control mode since it is needed to print exit messages. Prevents hanging when detaching with iTerm2. CHANGES FROM 3.0a TO 3.1 * Only search the visible part of the history when marking (highlighting) search terms. This is much faster than searching the whole history and solves problems with large histories. The count of matches shown is now the visible matches rather than all matches. * Search using regular expressions in copy mode. search-forward and search-backward use regular expressions by default; the incremental versions do not. * Turn off mouse mode 1003 as well as the rest when exiting. * Add selection_active format for when the selection is present but not moving with the cursor. * Fix dragging with modifier keys, so binding keys such as C-MouseDrag1Pane and C-MouseDragEnd1Pane now work. * Add -a to list-keys to also list keys without notes with -N. * Do not jump to next word end if already on a word end when selecting a word; fixes select-word with single character words and vi(1) keys. * Fix top and bottom pane calculation with pane border status enabled. * Add support for adding a note to a key binding (with bind-key -N) and use this to add descriptions to the default key bindings. A new -N flag to list-keys shows key bindings with notes. Change the default ? binding to use this to show a readable summary of keys. Also extend command-prompt to return the name of the key pressed and add a default binding (/) to show the note for the next key pressed. * Add support for the iTerm2 DSR 1337 sequence to get the terminal version. * Treat plausible but invalid keys (like C-BSpace) as literal like any other unrecognised string passed to send-keys. * Detect iTerm2 and enable use of DECSLRM (much faster with horizontally split windows). * Add -Z to default switch-client command in tree mode. * Add ~ to quoted characters for %%%. * Document client exit messages in the manual page. * Do not let read-only clients limit the size, unless all clients are read-only. * Add a number of new formats to inspect what sessions and clients a window is present or active in. * Change file reading and writing to go through the client if necessary. This fixes commands like "tmux loadb /dev/fd/X". Also modify source-file to support "-" for standard input, like load-buffer and save-buffer. * Add ~/.config/tmux/tmux.conf to the default search path for configuration files. * Bump the escape sequence timeout to five seconds to allow for longer legitimate sequences. * Make a best effort to set xpixel and ypixel for each pane and add formats for them. * Add push-default to status-left and status-right in status-format[0]. * Do not clear search marks on cursor movement with vi(1) keys. * Add p format modifier for padding to width and allow multiple substitutions in a single format. * Add -f for full size to join-pane (like split-window). * Do not use bright when emulating 256 colours on an 8 colour terminal because it is also bold on some terminals. * Make select-pane -P set window-active-style also to match previous behaviour. * Do not truncate list-keys output. * Turn automatic-rename back on if the \033k rename escape sequence is used with an empty name. * Add support for percentage sizes for resize-pane ("-x 10%"). Also change split-window and join-pane -l to accept similar percentages and deprecate the -p flag. * Add -F flag to send-keys to expand formats in search-backward and forward copy mode commands and copy_cursor_word and copy_cursor_line formats for word and line at cursor in copy mode. Use for default # and * binding with vi(1) keys. * Add formats for word and line at cursor position in copy mode. * Add formats for cursor and selection position in copy mode. * Support all the forms of RGB colour strings in OSC sequences rather than requiring two digits. * Limit lazy resize to panes in attached sessions only. * Add an option to set the key sent by backspace for those whose system uses ^H rather than ^?. * Change new-session -A without a session name (that is, no -s option also) to attach to the best existing session like attach-session rather than a new one. * Add a "latest" window-size option which tries to size windows based on the most recently used client. This is now the default. * Add simple support for OSC 7 (result is available in the pane_path format). * Add push-default and pop-default for styles which change the colours and attributes used for #[default]. These are used in status-format to restore the behaviour of window-status-style being the default for window-status-format. * Add window_marked_flag. * Add cursor-down-and-cancel in copy mode. * Default to previous search string for search-forward and search-backward. * Add -Z flag to rotate-window, select-pane, swap-pane, switch-client to preserve zoomed state. * Add -N to capture-pane to preserve trailing spaces. * Add reverse sorting in tree, client and buffer modes.
Diffstat (limited to 'misc')
-rw-r--r--misc/tmux/Makefile5
-rw-r--r--misc/tmux/distinfo11
-rw-r--r--misc/tmux/patches/patch-compat.h73
3 files changed, 7 insertions, 82 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index fc2926e2ab2..ba4edf1046b 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2020/03/12 11:35:33 leot Exp $
+# $NetBSD: Makefile,v 1.54 2020/06/13 21:42:43 leot Exp $
-DISTNAME= tmux-3.0a
-PKGREVISION= 2
+DISTNAME= tmux-3.1b
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GITHUB:=tmux/}
GITHUB_RELEASE= ${PKGVERSION_NOREV}
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index d1eb34c3577..e1d761b367e 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.45 2020/03/12 11:35:33 leot Exp $
+$NetBSD: distinfo,v 1.46 2020/06/13 21:42:43 leot Exp $
-SHA1 (tmux-3.0a.tar.gz) = 0cc951b9ff545b429c101eb562e0be9c5aba5ed4
-RMD160 (tmux-3.0a.tar.gz) = 2b781a3632c11098184f787774742b5e5af761ce
-SHA512 (tmux-3.0a.tar.gz) = f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
-Size (tmux-3.0a.tar.gz) = 546377 bytes
-SHA1 (patch-compat.h) = bee44eb311a6ff5fa64743d61867300303d9c65b
+SHA1 (tmux-3.1b.tar.gz) = 52ab7bbc8f5c48955b170f2473f9515cc31653b5
+RMD160 (tmux-3.1b.tar.gz) = 10bd0c871da3fd9c450408c96bbc7231257e40e4
+SHA512 (tmux-3.1b.tar.gz) = fd5269f5f58ad20c35ece24af74035e622e16511baa331717bded5edcbfd46c1847fd86c02431a7d889ce7d5bec89c8177a680ca60e9ca821f13065d26ca7fa1
+Size (tmux-3.1b.tar.gz) = 561152 bytes
diff --git a/misc/tmux/patches/patch-compat.h b/misc/tmux/patches/patch-compat.h
deleted file mode 100644
index 65e74834517..00000000000
--- a/misc/tmux/patches/patch-compat.h
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-compat.h,v 1.2 2020/03/12 11:35:33 leot Exp $
-
-- Solaris has paths.h but does not define all used _PATH_*.
- Backport commit 92ecd611f68663dfceb2494e637b3ebe51d3fd86 to address that:
- <https://github.com/tmux/tmux/commit/92ecd611f68663dfceb2494e637b3ebe51d3fd86>
-
-- Handle the FNM_CASEFOLD extension.
- Shared upstream via:
- <https://github.com/tmux/tmux/pull/2020>
-
---- compat.h.orig 2020-03-12 11:24:29.222099235 +0000
-+++ compat.h
-@@ -61,12 +61,31 @@ void warn(const char *, ...);
- void warnx(const char *, ...);
- #endif
-
--#ifndef HAVE_PATHS_H
--#define _PATH_BSHELL "/bin/sh"
--#define _PATH_TMP "/tmp/"
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+
-+#ifndef _PATH_BSHELL
-+#define _PATH_BSHELL "/bin/sh"
-+#endif
-+
-+#ifndef _PATH_TMP
-+#define _PATH_TMP "/tmp/"
-+#endif
-+
-+#ifndef _PATH_DEVNULL
- #define _PATH_DEVNULL "/dev/null"
-+#endif
-+
-+#ifndef _PATH_TTY
- #define _PATH_TTY "/dev/tty"
-+#endif
-+
-+#ifndef _PATH_DEV
- #define _PATH_DEV "/dev/"
-+#endif
-+
-+#ifndef _PATH_DEFPATH
- #define _PATH_DEFPATH "/usr/bin:/bin"
- #endif
-
-@@ -98,10 +117,6 @@ void warnx(const char *, ...);
- #include "compat/bitstring.h"
- #endif
-
--#ifdef HAVE_PATHS_H
--#include <paths.h>
--#endif
--
- #ifdef HAVE_LIBUTIL_H
- #include <libutil.h>
- #endif
-@@ -154,6 +154,14 @@ void warnx(const char *, ...);
- #define O_DIRECTORY 0
- #endif
-
-+#ifndef FNM_CASEFOLD
-+#ifdef FNM_IGNORECASE
-+#define FNM_CASEFOLD FNM_IGNORECASE
-+#else
-+#define FNM_CASEFOLD 0
-+#endif
-+#endif
-+
- #ifndef INFTIM
- #define INFTIM -1
- #endif