diff --git a/srcpkgs/tmux/patches/sixelcrash.patch b/srcpkgs/tmux/patches/sixelcrash.patch deleted file mode 100644 index 835a00cc36f..00000000000 --- a/srcpkgs/tmux/patches/sixelcrash.patch +++ /dev/null @@ -1,76 +0,0 @@ -From aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae Mon Sep 17 00:00:00 2001 -From: Nicholas Marriott -Date: Thu, 21 Mar 2024 11:37:09 +0000 -Subject: [PATCH] Fix crash if SIXEL colour register is invalid and remove - SIXEL images before reflow to avoid a different crash, from Anindya - Mukherjee. - ---- - image-sixel.c | 3 +++ - input.c | 2 +- - screen-write.c | 4 ++++ - screen.c | 6 +++--- - 4 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/image-sixel.c b/image-sixel.c -index 3396a22a7f..e23d17f902 100644 ---- a/image-sixel.c -+++ b/image-sixel.c -@@ -489,6 +489,9 @@ sixel_print(struct sixel_image *si, struct sixel_image *map, size_t *size) - colours = si->colours; - ncolours = si->ncolours; - } -+ -+ if (ncolours == 0) -+ return (NULL); - contains = xcalloc(1, ncolours); - - len = 8192; -diff --git a/input.c b/input.c -index eb421b280e..e6016121ff 100644 ---- a/input.c -+++ b/input.c -@@ -1839,7 +1839,7 @@ input_csi_dispatch_sm_private(struct input_ctx *ictx) - - /* Handle CSI graphics SM. */ - static void --input_csi_dispatch_sm_graphics(struct input_ctx *ictx) -+input_csi_dispatch_sm_graphics(__unused struct input_ctx *ictx) - { - #ifdef ENABLE_SIXEL - int n, m, o; -diff --git a/screen-write.c b/screen-write.c -index 6892d04149..a732f093dc 100644 ---- a/screen-write.c -+++ b/screen-write.c -@@ -2283,6 +2283,10 @@ screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si, - new = sixel_scale(si, 0, 0, 0, y - sy, sx, sy, 1); - sixel_free(si); - si = new; -+ -+ /* Bail out if the image cannot be scaled. */ -+ if (si == NULL) -+ return; - sixel_size_in_cells(si, &x, &y); - } - -diff --git a/screen.c b/screen.c -index f73a850547..0eaf469886 100644 ---- a/screen.c -+++ b/screen.c -@@ -308,12 +308,12 @@ screen_resize_cursor(struct screen *s, u_int sx, u_int sy, int reflow, - if (sy != screen_size_y(s)) - screen_resize_y(s, sy, eat_empty, &cy); - -- if (reflow) { - #ifdef ENABLE_SIXEL -- image_free_all(s); -+ image_free_all(s); - #endif -+ -+ if (reflow) - screen_reflow(s, sx, &cx, &cy, cursor); -- } - - if (cy >= s->grid->hsize) { - s->cx = cx; diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template index 6f117d4cd4a..1ce5268f297 100644 --- a/srcpkgs/tmux/template +++ b/srcpkgs/tmux/template @@ -1,7 +1,7 @@ # Template file for 'tmux' pkgname=tmux -version=3.4 -revision=3 +version=3.5 +revision=1 build_style=gnu-configure configure_args="--enable-utempter --enable-sixel" hostmakedepends="byacc automake pkg-config" @@ -13,7 +13,7 @@ license="ISC" homepage="https://tmux.github.io" changelog="https://raw.githubusercontent.com/tmux/tmux/master/CHANGES" distfiles="https://github.com/tmux/tmux/releases/download/${version}/tmux-${version}.tar.gz" -checksum=551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa +checksum=2fe01942e7e7d93f524a22f2c883822c06bc258a4d61dba4b407353d7081950f pre_configure() { autoreconf -fi