From 2c3e7833ede4e435d5bc3fc3b44b3f5662211af86a3404b1dce63a9b46b644b6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 21 Mar 2022 12:56:24 +0000 Subject: [PATCH] - update to 372: * amend allocation/freeing of scrollback lines, eliminating an adjustment for status-line added in patch #371 (report/testcase by Rajeev V. Pillai). - update to 371: * drop double-buffer default from test-packages, since that interferes with status-line. * add faceSize7 to table in charproc.c, overlooked in patch #360 (patch by Vladimir A. Pavlov). * use XDrawString rather than XDrawString16 for text when the latter is not needed. * improve performance for initializing/reusing graphic objects in the SIXEL feature. * improve error-checking for resize. * fix errata in manual page (Debian #988221). * extended list of environment variables to purge on startup, i.e., in case a user starts xterm from another terminal emulator. * add comment in cursor.c to explain why autowrap (DECAWM) does not apply to data saved/restored with save/restore cursor-operations (report by Thomas Wolff). * add special case in generating the combining-character table in wcwidth.c, for Hangul Jamo Extended-B (report by Luis Javier Merino). * simplify/improve portability of trap commands in shell-scripts. * update configure options --disable-rectangles, --disable-tcap-fkeys and --disable-tcap-query to account for changed default settings. * rather than ignore empty parameter for setting title, use that to OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=202 --- xterm-370.tgz | 3 --- xterm-370.tgz.asc | 15 ----------- xterm-372.tgz | 3 +++ xterm-372.tgz.asc | 15 +++++++++++ xterm-sigwinch.patch | 13 +++++----- xterm-suse.patch | 58 +++++++++++++++---------------------------- xterm.changes | 59 ++++++++++++++++++++++++++++++++++++++++++++ xterm.spec | 4 +-- 8 files changed, 106 insertions(+), 64 deletions(-) delete mode 100644 xterm-370.tgz delete mode 100644 xterm-370.tgz.asc create mode 100644 xterm-372.tgz create mode 100644 xterm-372.tgz.asc diff --git a/xterm-370.tgz b/xterm-370.tgz deleted file mode 100644 index a625c6e..0000000 --- a/xterm-370.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:963c5d840a0f0f4c077ff284586e8b1f83f3f983dca6f74f4b361975b5388c82 -size 1500208 diff --git a/xterm-370.tgz.asc b/xterm-370.tgz.asc deleted file mode 100644 index a755ed8..0000000 --- a/xterm-370.tgz.asc +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: See https://invisible-island.net/public/public.html for info - -iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmGQXMAACgkQzCr0RyFn -vgM/cAv8Cw1ZIiTethzHbD9e67FXQVDwsZFAuMpBlfiKQORNJr4s4esjjcaGlO6D -eajuKP9X1yw4rgBg5EwQyabvPfVSNLLZxMfLLx3KIQsL43siAyyKNy0jDA9KL2yK -ib33PvemJwDRt/jz7JnqjeNrIP1VDSazJRHdq8umo8+/WHrLRkfZqRsACUR+MvX9 -DF8NGrTJQbAfAetOT6mQY4HEAgn8diBOjzQGNmDtOk+6jJtgzZPmP5sML4LSPgau -XRL/jXgx0CjXM9dL6bLsQDm6ucCjaNGq45f1Y7MfrHrbnjHsigkOHI0yR5Fi4JSQ -/+cBHR1M4Spj4lmplJeKpXHm8/522yOTUmOKbNOCczID7TrNFsaPjeLs8RFPIvKT -fEamiHL1sR60sajMdQa5r/RiQyf+9wTRW4QHEA3ODjj9RjcNWwtuSeV6Fc0kO/GI -ScrzqJvO9JmCpPOZn23xTP4srgdXzTDeiz0O64vV8Yz+Aj+5fVgn63htS4L9xsCG -V3I9AvBY -=AuT1 ------END PGP SIGNATURE----- diff --git a/xterm-372.tgz b/xterm-372.tgz new file mode 100644 index 0000000..2231895 --- /dev/null +++ b/xterm-372.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1 +size 1507107 diff --git a/xterm-372.tgz.asc b/xterm-372.tgz.asc new file mode 100644 index 0000000..82232f7 --- /dev/null +++ b/xterm-372.tgz.asc @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNATURE----- +Comment: See https://invisible-island.net/public/public.html for info + +iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmIpTykACgkQzCr0RyFn +vgO8Kwv/SsPbhXp+8f/t43hMgHJjDPrj9qS3/gAruY9OPRGNhy/OC3+Fc2PcPbiM +UykJW62HH28OBb0yJ1xcT+Uykffzyxu/pZDtDDsthFdx3224oRzIKu93nsG9KW9Y +eYGZqnEpy/IZYrzDX9/wMIammzVQvjyNW8OAMOqIQw0Yf5FIT9HnKzCJowOMyvNb +IAPFi2JZV+kR+Cvq/XRFsiHMkKkChVOlxIdcZQQC5d7uxfYgrS5Kkn/VqEMoie5a +IAGZeDEejqAXwsc8NqAo+6rng0vYKFyKFENhO8FxFo/XDg6iPmW/xQvZlcWWUmfN +oevAZj3EoPcBADFrrLtLHDYR5lCC5sfIfAPKMAtzkSuYAZIZCKSpRaSrDZFXx8v/ +rxQIB24WoD9dIDKYImzaJlS0ZEQqHXzBXJBx1jpBHldnP70XuxwP8hVszTv6z2Fg +Maj59NCApvMZHEHDRynFoLZjwXLpLnK3ekmSdvTWjk5W/l42CPIZVlFGjN6bCgWD +NesxVupQ +=PmkK +-----END PGP SIGNATURE----- diff --git a/xterm-sigwinch.patch b/xterm-sigwinch.patch index 7f67571..1636200 100644 --- a/xterm-sigwinch.patch +++ b/xterm-sigwinch.patch @@ -1,15 +1,16 @@ # HG changeset patch # Parent 547d2ea5029c2c3edd129a9d23e424877c6f29f0 -diff --git a/screen.c b/screen.c -index 6fb6b3b..238591f 100644 ---- a/screen.c -+++ b/screen.c -@@ -2330,7 +2330,7 @@ ScreenResize(XtermWidget xw, +Index: xterm-372/screen.c +=================================================================== +--- xterm-372.orig/screen.c ++++ xterm-372/screen.c +@@ -2246,7 +2246,7 @@ ScreenResize(XtermWidget xw, #ifdef TTYSIZE_STRUCT - if (update_winsize(screen->respond, rows, cols, height, width) == 0) { + if (update_winsize(screen, rows, cols, height, width) == 0) { -#if defined(SIGWINCH) && defined(TIOCGPGRP) +#if defined(SIGWINCH) && (defined(TIOCGPGRP) || defined(linux)) if (screen->pid > 1) { int pgrp; + diff --git a/xterm-suse.patch b/xterm-suse.patch index f3ecfc4..00d82f6 100644 --- a/xterm-suse.patch +++ b/xterm-suse.patch @@ -3,10 +3,10 @@ # from 7ecf75281e09a29875b61f38bb66920529368050: # improve display of chinese letters (bsc#1089049) -diff --git a/UXTerm.ad.1 b/UXTerm.ad -index 0eac2dd..2ba471d 100644 ---- a/UXTerm.ad.1 -+++ b/UXTerm.ad +Index: xterm-372/UXTerm.ad +=================================================================== +--- xterm-372.orig/UXTerm.ad ++++ xterm-372/UXTerm.ad @@ -35,10 +35,20 @@ ! to set resources for UTF-8 mode with corresponding fonts. ! See the uxterm script for an example. @@ -64,15 +64,11 @@ index 0eac2dd..2ba471d 100644 ! Here is an alternate set of fonts with better support for bold: !*VT100.font2: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1 -diff --git a/XTerm-col.ad b/XTerm-col.ad ---- a/XTerm-col.ad -+++ b/XTerm-col.ad -@@ -71,25 +71,25 @@ - - ! These are the 8 ANSI colors and their bright equivalents. Depending on - ! other resource settings, xterm may use the bright colors when displaying - ! bold text (see the boldColors resource). - *VT100*color0: black +Index: xterm-372/XTerm-col.ad +=================================================================== +--- xterm-372.orig/XTerm-col.ad ++++ xterm-372/XTerm-col.ad +@@ -76,15 +76,15 @@ *VT100*color1: red3 *VT100*color2: green3 *VT100*color3: yellow3 @@ -91,16 +87,11 @@ diff --git a/XTerm-col.ad b/XTerm-col.ad *VT100*color13: magenta *VT100*color14: cyan *VT100*color15: white - - ! Disclaimer: there are no standard colors used in terminal emulation. - ! - ! The choice for color4 and color12 is a tradeoff between contrast, depending - ! on whether they are used for text or backgrounds. Note that either color4 or -diff --git a/XTerm.ad.1 b/XTerm.ad -index dd6ef52..69aac16 100644 ---- a/XTerm.ad.1 -+++ b/XTerm.ad -@@ -105,21 +105,37 @@ +Index: xterm-372/XTerm.ad +=================================================================== +--- xterm-372.orig/XTerm.ad ++++ xterm-372/XTerm.ad +@@ -106,21 +106,37 @@ *vtMenu*sixelScrolling*Label: Sixel Scrolling *vtMenu*privateColorRegisters*Label: Private Color Registers @@ -145,7 +136,7 @@ index dd6ef52..69aac16 100644 *fontMenu*font7*Label: Enormous !*VT100.font7: 12x24 *VT100.font7: -adobe-courier-medium-r-normal--24-240-75-75-m-150-iso10646-1 -@@ -252,6 +268,59 @@ +@@ -253,6 +269,59 @@ ! Alternatively, !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ @@ -205,15 +196,11 @@ index dd6ef52..69aac16 100644 ! VT100s and similar terminals recognize escape sequences and control ! characters to which they reply to the host with other escape sequences, ! to provide information. The "resize" program uses this feature. -diff --git a/xterm.man b/xterm.man ---- a/xterm.man -+++ b/xterm.man -@@ -4815,19 +4815,23 @@ This option specifies the font to be use - in the \*(``OverTheSpot\*('' input method. - .IP - In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion) - string is displayed at the position of the cursor. - It is the XIM server's responsibility to display the preedit string. +Index: xterm-372/xterm.man +=================================================================== +--- xterm-372.orig/xterm.man ++++ xterm-372/xterm.man +@@ -5487,9 +5487,13 @@ It is the XIM server's responsibility to The XIM client must inform the XIM server of the cursor position. For best results, the preedit string must be displayed with a proper font. Therefore, \fI\*n\fP informs the XIM server of the proper font. @@ -230,8 +217,3 @@ diff --git a/xterm.man b/xterm.man The \fBximFont\fP resource is provided to override this default font setting. .\" .SS Tek4014 Widget Resources - .PP - The following resources are specified - as part of the \fItek4014\fP widget (class \fITek4014\fP). - These are specified by patterns - such as \*(``\fB__default_class__.tek4014.\fP\fINAME\fP\*('': diff --git a/xterm.changes b/xterm.changes index 33e5aff..12c0067 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,4 +1,63 @@ ------------------------------------------------------------------- +Mon Mar 21 12:30:36 UTC 2022 - Marcus Meissner + +- update to 372: + * amend allocation/freeing of scrollback lines, eliminating an + adjustment for status-line added in patch #371 (report/testcase by + Rajeev V. Pillai). +- update to 371: + * drop double-buffer default from test-packages, since that + interferes with status-line. + * add faceSize7 to table in charproc.c, overlooked in patch #360 + (patch by Vladimir A. Pavlov). + * use XDrawString rather than XDrawString16 for text when the latter + is not needed. + * improve performance for initializing/reusing graphic objects in the + SIXEL feature. + * improve error-checking for resize. + * fix errata in manual page (Debian #988221). + * extended list of environment variables to purge on startup, i.e., + in case a user starts xterm from another terminal emulator. + * add comment in cursor.c to explain why autowrap (DECAWM) does not + apply to data saved/restored with save/restore cursor-operations + (report by Thomas Wolff). + * add special case in generating the combining-character table in + wcwidth.c, for Hangul Jamo Extended-B (report by Luis Javier + Merino). + * simplify/improve portability of trap commands in shell-scripts. + * update configure options + --disable-rectangles, + --disable-tcap-fkeys and + --disable-tcap-query + to account for changed default settings. + * rather than ignore empty parameter for setting title, use that to + reset it to “xterm” for scripting. + * check for out-of-bounds condition while drawing sixels, and quit + that operation (report by Nick Black). + * add fallback definition for PROJECTROOT so that a suitable default + location for luit will be compiled-in on build-servers. + * implement DEC status-line controls DECSASD/DECSSDT: + + decode controls, set state + + implement DECRQSS responses + + implement indicator-style status-line + + add configure option --enable-status-line + + add resource indicatorFormat + + implement host-writable status-line, able to handle + video-attributes and simple left/right cursor movement. This + disallows all of the DEC/xterm private modes such as switching + to/from the alternate screen. + + move the status-line if the window is resized. + + Note: the associated screen-resizing does not work for the + special case of TrueType fonts with double-buffering (see note + in patch #349). + * modify configure-script fixup for -Werror options to exclude fixup + for -Werror=format, e.g., -Werror=format-security. + * amend change from patch #370; DEC 070's pseudo-code for DECCOLM + incorrectly suggests that it enables DECLRMM as a side-effect. + * fix some memory leaks seen using esctest and asan2 (patch by Luis + Javier Merino). +- xterm-sigwinch.patch,xterm-suse.patch: refreshed +------------------------------------------------------------------- Tue Dec 7 08:55:20 UTC 2021 - Ludwig Nussel - Use separate subpackage for resize binary. It does not actually diff --git a/xterm.spec b/xterm.spec index ee19f97..071b4f7 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,7 +1,7 @@ # # spec file for package xterm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define splitbin 0%{?suse_version} >= 1300 Name: xterm -Version: 370 +Version: 372 Release: 0 Summary: The basic X terminal program License: MIT