Sven Joachim pushed to branch debian-unstable at X Strike Force / app / xterm
Commits:
7b824e0b by Sven Joachim at 2023-10-07T16:59:47+02:00
Pach wtmp-path.diff has been applied upstream
- - - - -
aceb659b by Sven Joachim at 2023-10-07T17:09:55+02:00
Apply sixel colors regression fix from xterm 385-b
- - - - -
d3ebd271 by Sven Joachim at 2023-10-07T17:21:42+02:00
Upload to unstable
- - - - -
3 changed files:
- debian/changelog
- debian/patches/series
- + debian/patches/sixel.diff
Changes:
=====================================
debian/changelog
=====================================
@@ -1,13 +1,14 @@
-xterm (385-1) UNRELEASED; urgency=medium
+xterm (385-1) unstable; urgency=medium
* New upstream release.
* Use the new configure options --with-utmp-path=/var/run/utmp and
--with-wtmp-path=/var/log/wtmp to ensure correct paths to these files
in the manpage (Closes: #1042767).
- * Add temporary patch wtmp-path.diff, fixing a typo in aclocal.m4 which
+ * Apply patch from xterm 385-a, fixing a typo in aclocal.m4 which
leads to an incorrect path to the wtmp file in the manpage.
+ * Apply patch from xterm 385-b: fix regression in sixel colors.
- -- Sven Joachim <svenj...@gmx.de> Mon, 02 Oct 2023 18:02:34 +0200
+ -- Sven Joachim <svenj...@gmx.de> Sat, 07 Oct 2023 17:20:35 +0200
xterm (384-1) unstable; urgency=medium
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
902_windowops.diff
904_fontops.diff
wtmp-path.diff
+sixel.diff
=====================================
debian/patches/sixel.diff
=====================================
@@ -0,0 +1,32 @@
+Description: Fix regression in SIXEL colors
+Author: Thomas Dickey <dic...@his.com>
+
+---
+ graphics.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/graphics.c
++++ b/graphics.c
+@@ -1,4 +1,4 @@
+-/* $XTermId: graphics.c,v 1.128 2023/09/29 23:16:59 tom Exp $ */
++/* $XTermId: graphics.c,v 1.131 2023/10/06 08:24:24 tom Exp $ */
+
+ /*
+ * Copyright 2013-2022,2023 by Ross Combs
+@@ -627,7 +627,6 @@ init_color_registers(TScreen const *scre
+ unsigned
+ get_color_register_count(TScreen const *screen)
+ {
+- const int graphics_termid = GraphicsTermId(screen);
+ unsigned num_color_registers;
+
+ if (screen->numcolorregisters >= 0) {
+@@ -653,7 +652,7 @@ get_color_register_count(TScreen const *
+ * VT382 1 plane (two fixed colors: black and white) FIXME: verify
+ * dxterm ?
+ */
+- switch (graphics_termid) {
++ switch (screen->graphics_termid) {
+ case 125:
+ return 4U;
+ case 240:
View it on GitLab:
https://salsa.debian.org/xorg-team/app/xterm/-/compare/501382e1344fa2436c6d4674d39d4019a443ed41...d3ebd27104f32c90e5708014de0556518e541a90
--
View it on GitLab:
https://salsa.debian.org/xorg-team/app/xterm/-/compare/501382e1344fa2436c6d4674d39d4019a443ed41...d3ebd27104f32c90e5708014de0556518e541a90
You're receiving this email because of your account on salsa.debian.org.
