summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/upstream-db1665868f.diff20
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fdf7597..0baf906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tmux (3.4-7) unstable; urgency=medium
+
+ * Cherry-pick commit db1665868f from upstream to fix memory usage of
+ grid data (closes: #1073981).
+
+ -- Romain Francoise <rfrancoise@debian.org> Mon, 24 Jun 2024 21:03:23 +0200
+
tmux (3.4-6) unstable; urgency=medium
[ Aurelien Jarno ]
diff --git a/debian/patches/series b/debian/patches/series
index d315ed5..9346cc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ upstream-aa17f0e0c1.diff
upstream-3823fa2c57.diff
upstream-424f13fe13.diff
upstream-692ce59bce.diff
+upstream-db1665868f.diff
diff --git a/debian/patches/upstream-db1665868f.diff b/debian/patches/upstream-db1665868f.diff
new file mode 100644
index 0000000..7f2c650
--- /dev/null
+++ b/debian/patches/upstream-db1665868f.diff
@@ -0,0 +1,20 @@
+commit db1665868ff33375f6ea235ffbbb1996d7946c05
+Author: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Mon Jun 24 08:11:46 2024 +0000
+
+ Check the underline style colour against the correct default value again
+ (it was changed from 0 to 8), from Romain Francoise.
+
+diff --git a/grid.c b/grid.c
+index edada819e1..7862941999 100644
+--- a/grid.c
++++ b/grid.c
+@@ -88,7 +88,7 @@ grid_need_extended_cell(const struct grid_cell_entry *gce,
+ return (1);
+ if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB))
+ return (1);
+- if (gc->us != 0) /* only supports 256 or RGB */
++ if (gc->us != 8) /* only supports 256 or RGB */
+ return (1);
+ if (gc->link != 0)
+ return (1);