Sync from SUSE:SLFO:1.1 xterm revision 3907598245a855702f9fae6ecbdb93f6

xterm-387.tgz.asc

@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: See https://invisible-island.net/public/public.html for info
+
+iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmUsfEIACgkQzCr0RyFn
+vgPPFQwA7OTtw6xmM2WVXNpfsi5t75Pnd+fJQ5m/RhC1nE/8ML+RrdwcVn0K7PA6
+iplg3zPFgGi1qL5B/WyKN5nu6s9CCnHXHpjb3nYqI4lBx0H6NI768VELnbQd36yf
+16ugUIXe8rlWBzy6UQH7ucUtiuhQIvYl1knswOC2nZPLRPL6GaLOImJ9HdFKPvDa
+Q48/9WkVlJmCDWHV7F5T7chvPDG763SHxPXDzBCm9phJ3/KXBCHdYNb2Ov6I4Mkb
+KEJcThW4Gsn14WIyFkaWRanZpYogm8VA69AiPESmVq3IcXU35kQtX+Kh3U7h0SdZ
+a9u9FBbN+/EH4M9wELApJB6+uoKky7IiVzdT5kqjjhHTLmWVyyBwW9SRA+JpSsV6
+2ISPszL4z2PgJr3o0zgOw0pWkiLP4MBnH7bXCaiO358jecNCRxuFsWXQxFXbnMo6
+XX0D69sG6T3iIu5RVfe1E8BrAo61q2faxbpUPOJfTZ3iuVMfEWWoa67ltgmlPune
+/RHCg2Iz
+=pInd
+-----END PGP SIGNATURE-----

xterm-393.tgz.asc

@@ -1,15 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: See https://invisible-island.net/public/public.html for info
-
-iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmaQbpEACgkQzCr0RyFn
-vgN97Av/bKMjAHdQcQwsyQ1fQbcVHA634o97Q6knhE8HSPURzdaX+4WovpVJ1Ccf
-Kefl9N4P4BzIe3qwC8qlSHsRFkntpYHkyiFl4xXKzogv2s/EINkWBhzj7BT7D48J
-/Ntrxr3ZVpQj7KEiO74mertUzNGyG1WbpA3J0QhhtKwp8WYgk9MFKJxe5DeHGMgE
-8WQmBe69fNIifHb+DkzbjhiXycyKfuNsgmWAypHSFL+ib2Ws3vgLyTxa0vO9daHl
-0mmNh/rwCFtWr4QkS/2o6gff0GPRSlfPxrwyqHH/JEn20kS/+RxD5n7usEmR9iW8
-4JMFID/TaP0tlwEU9bGYvMUSMjujyJSecjSZ0Wb4ekJJ94eMIj+gCBMO8tbzZ3IE
-Eoq73nCsBhMwV90nBaiMVPhx+oyzTUGs/ECBy5iB9lzKF4+rcqz05txUl/WwggYL
-nX9bpj6ytxB50704RKJbSnwSi/BZFJ39lVlK6GQkloQVaSS9KjbYpA2qgHivzyeV
-e7E/yKVw
-=D80H
------END PGP SIGNATURE-----

xterm-suse.patch

@@ -3,10 +3,10 @@
 # from 7ecf75281e09a29875b61f38bb66920529368050:
 # improve display of chinese letters (bsc#1089049)
 
-Index: xterm-392/UXTerm.ad
+Index: xterm-385/UXTerm.ad
 ===================================================================
---- xterm-392.orig/UXTerm.ad
+--- xterm-385.orig/UXTerm.ad
-+++ xterm-392/UXTerm.ad
++++ xterm-385/UXTerm.ad
 @@ -35,10 +35,20 @@
  ! to set resources for UTF-8 mode with corresponding fonts.
  ! See the uxterm script for an example.
@@ -64,10 +64,10 @@ Index: xterm-392/UXTerm.ad
  
  ! 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
-Index: xterm-392/XTerm-col.ad
+Index: xterm-385/XTerm-col.ad
 ===================================================================
---- xterm-392.orig/XTerm-col.ad
+--- xterm-385.orig/XTerm-col.ad
-+++ xterm-392/XTerm-col.ad
++++ xterm-385/XTerm-col.ad
 @@ -76,15 +76,15 @@
  *VT100*color1: red3
  *VT100*color2: green3
@@ -87,10 +87,10 @@ Index: xterm-392/XTerm-col.ad
  *VT100*color13: magenta
  *VT100*color14: cyan
  *VT100*color15: white
-Index: xterm-392/XTerm.ad
+Index: xterm-385/XTerm.ad
 ===================================================================
---- xterm-392.orig/XTerm.ad
+--- xterm-385.orig/XTerm.ad
-+++ xterm-392/XTerm.ad
++++ xterm-385/XTerm.ad
 @@ -106,21 +106,37 @@
  *vtMenu*sixelScrolling*Label:  Sixel Scrolling
  *vtMenu*privateColorRegisters*Label:  Private Color Registers
@@ -196,11 +196,11 @@ Index: xterm-392/XTerm.ad
  ! 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.
-Index: xterm-392/xterm.man
+Index: xterm-385/xterm.man
 ===================================================================
---- xterm-392.orig/xterm.man
+--- xterm-385.orig/xterm.man
-+++ xterm-392/xterm.man
++++ xterm-385/xterm.man
-@@ -5640,9 +5640,13 @@ It is the XIM server's responsibility to
+@@ -5584,9 +5584,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.
@@ -216,4 +216,4 @@ Index: xterm-392/xterm.man
 +
  The \fBximFont\fP resource is provided to override this default font setting.
  .\"
- .SS "Tek4014 Widget Resources"
+ .SS Tek4014 Widget Resources

xterm.changes

@@ -1,102 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 15 14:00:27 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
-
-- Disable libutempter, it doesn't work anymore with the switch
-  from utmp to systemd-logind
-
--------------------------------------------------------------------
-Fri Jul 12 16:03:25 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
-
-- update to 393:
-  * add a check for ANSI SC/RC, to ignore CSI parameters.
-  * improve check for missing characters for bitmap-fonts
-  * fix regression in error-recovery for SGR parameters 
-  * change default for --enable-imake configure option
-  * fixes for wcwidth
-  * eliminate maxStringParse limit for SIXEL
-  * improve logic which ignores APC, PM and SOS controls to also
-    not accumulate their data temporarily in a buffer.
-  * exclude TERM_INGRESS from cleanup of environment variables
-  * fix some documentation typos
-
--------------------------------------------------------------------
-Tue Jul  2 14:45:13 UTC 2024 - Marcus Meissner <meissner@suse.com>
-
-- update to 392:
-  * improve input decoding for non-Latin1 character sets by preserving the sense of GL/GR.
-  * add resource preferLatin1 to simplify UPSS configuration (Gentoo #932154).
-  * build-fix for --disable-boxchars; patch #390 reuses that feature's code to draw the part of the DEC Technical character set which has no Unicode equivalent.
-  * improve definitions used in clock_gettime logic in graphics_sixel.c, as well as updating comments (patch by Ben Wong).
-  * amend allowC1Printable changes from patch #391, restoring a special case which caused C1 characters to be ignored (report/testcase by Dmytro Bagrii).
-
-- update to 391:
-  * improve integration between UTF-8 and allowC1Printable.
-  * alter SIXEL HLS computation to make blue 0 degrees (patch by Ben Wong).
-  * disable SIXEL aspect-ratio, pending a rewrite (patch by Ben Wong).
-  * add resource incrementalGraphics (prompted by patch by Ben Wong).
-  * reorganize graphics_sixel.c as a step toward eliminating graphics buffer-size (integrated patch by Ben Wong).
-  * fix regression in patch #390: non-UTF8 text pasted as a XA_UTF8_STRING was not decoded (report by Petri Kaukasoina).
-
-- update to 390:
-  * improve typography of control-sequences page (patches by Branden Robinson).
-  * amend UPSS change from patch #389, fixing a regression in VT100/VT220 character sets.
-  * modify ANSI conformance per ECMA-43 and DEC 070:
-    * set ANSI conformance level to 3 for DEC levels 2 and up.
-    * disable locking shifts in level 1, e.g., VT100.
-    * disable single-shifts from G2/G3 in level 1.
-    * use UPSS for G2/G3 in levels 2 and up.
-  * modify invisible-character attribute to permit DECRQCRA to report a consistent checksum (report/testcase by Thomas Wolff).
-  * align terminfo building blocks in terminfo to correspond to recent refactoring/trimming in ncurses.
-  * set flag in regexec call for onNClicks to handle “^” anchor (patch by Matthew Martin).
-  * add line-drawing data for the characters in DEC Technical which have no Unicode equivalents.
-  * remove a special case in encode_scs which made xterm report Latin-1 when encoding is set to UTF-8, where ASCII is the selected character set. This fixes a regression in vttest for the DECRSPS cursor test.
-  * correct values for Ps of DECAUPSS in ctlseqs.ms (report by James Holderness).
-  * simplify/correct expression for checking Unicode non-characters (report by Thomas Wolff).
-  * correct loop for trimming environment variables (report/patch by Casper Dik).
-
--------------------------------------------------------------------
-Sat Jan 27 16:53:56 UTC 2024 - Dirk Müller <dmueller@suse.com>
-
-- update to 389:
-  * interchange variables in subparameter parsing, fixing a bug
-    where subparameters after the first parameter could be
-    misidentified
-  * correct  popping of icon/window titles in a case where only
-    one was pushed from patch #385 changes.
-  * add XTQMODKEYS response in DECRQSS, as alternative for vim.
-  * correct  DECCIR encoded information on character set size,
-    handle a VT525 quirk, and add DECST8C (Windows Terminal
-    #14984).
-  * improve  DECRQCRA  (prompted  by  discussion with James
-    Holderness, Windows Terminal #14974).
-  * add part of VT525 color controls:
-    + DECAC,  to  update  default foreground/background, respond to
-      DECRQSS
-    + DECATC, to respond with DECRQSS
-  * prevent  Unicode  non-characters  from  being  printed
-  * modify  send_SGR()  to  avoid modifying colors 16 to 255 in
-    printed output (patch by Grady Martin).
-  * minor cleanup of miscellaneous error-codes with ERROR_MISC.
-  * remove legacy CSI 53 for locator status, corrected in patch
-  * modify  DECRQUPSS  and  DECAUPSS feature to support VT5xx
-    character sets (report by Thomas Wolff).
-  * improve EWMH handling (report/analysis by Edward Rosten)
-    + reset  _NET_WM_STATE_HIDDEN  flag  from _NET_WM_STATE  before
-      mapping the window to deiconify.
-    + cache  X  properties  to reduce latency (adapted
-    from patch by Edward Rosten).
-
--------------------------------------------------------------------
-Sun Nov 12 09:47:15 UTC 2023 - Dirk Müller <dmueller@suse.com>
-
-- update to 388:
-  * improve disallowPasteControls by adding a category for the
-    special characters known to stty (prompted by discussion
-    with David Leadbeater).
-  * amend support of DECAUPSS, undoing change to initialization of
-    G2/G3 so that pasting of GR characters work properly
-  * update config.guess, config.sub
-
 -------------------------------------------------------------------
 Mon Oct 16 21:07:38 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>
 
@@ -304,14 +205,14 @@ Sat Nov  5 19:20:27 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
 - update to 375:
   * improve error-recovery when setting a bitmap font for the VT100
     window, e.g., in case OSC 50 failed, restoring the most recent
-    valid font so that a subsequent OSC 50 reports this correctly
+    valid font so that a subsequent OSC 50 reports this correctly 
     CVE-2022-45063 boo#1205305
   * exclude MC_XDG_OPEN from environment variables trimmed on
     startup
   * check for null pointer in isSelect()
 - includes changes from 374:
   * change default for sixelScrolling resource to better match
-    VT330/VT340 DECSDM setting
+    VT330/VT340 DECSDM setting 
   * fix some gcc and coverity warnings.
   * improve memory usage for OSC 52
   * fix regression in xterm-373 change adding resources
@@ -461,7 +362,7 @@ Fri Nov 26 21:16:34 UTC 2021 - Dirk Müller <dmueller@suse.com>
     070.
   * amend a change in patch #348 which caused left/right margin mode to
     be  reset  when  resizing  the terminal window
-  * fix a misnamed macro-parameter
+  * fix a misnamed macro-parameter 
   * fix spacing of wideFont when its width is not exactly twice as wide
     as the normal font
   * suppress loading of italic font in a few places when colorITmode is
@@ -700,8 +601,8 @@ Tue Sep 15 21:25:08 UTC 2020 - Dirk Mueller <dmueller@suse.com>
   * enable SIXEL feature by default.
   * update config.guess, config.sub
   * correct logic for decodeTerminalID changes in patch #357
-  * modify makefile to use plink.sh when linking test-programs, to fix build when using pcre
+  * modify makefile to use plink.sh when linking test-programs, to fix build when using pcre 
-  * build-fix for test_ptydata program
+  * build-fix for test_ptydata program 
   * several minor optimizations for the ReGIS and SIXEL features, improving performance by 10%.
   * add resource decGraphicsID to allow displaying graphics when the emulation level would ordinarily disallow this
   * add control sequences for fast switching of color palettes: XTPUSHCOLORS, XTPOPCOLORS, XTREPORTCOLORS
@@ -738,7 +639,7 @@ Tue Sep 15 21:25:08 UTC 2020 - Dirk Mueller <dmueller@suse.com>
   * use improved xm example for xterm+x11mouse, xterm+sm+1006 from ncurses 6.2 terminfo.src
   * two fixes for left/right wheel mouse event reporting
   * filter identical button-events
-  * correct order of button-range versus protocol type
+  * correct order of button-range versus protocol type 
   * change “make check” makefile-rule to use test-drivers for charclass and wcwidth data.
   * quiet “did not find a usable xxx TrueType font” warnings by making fontWarnings apply to these messages
   * improve reinitialization of parameter list
@@ -911,7 +812,7 @@ Wed May 15 13:59:14 UTC 2019 - seanlew@opensuse.org
   * correct a typo in setDirectFG
   * add resource useBorderClipping
   * fix a special case in XTPOPSGR to check direct colors
-  * increase response-buffer size
+  * increase response-buffer size 
   * reduce the number of buffer-flashes for tcap-query batches
 
 -------------------------------------------------------------------
@@ -961,14 +862,14 @@ Sat Dec 29 07:01:48 UTC 2018 - sean@suspend.net
   * correct off-by-one right margin checks for double-width char adjustments
   * modify the initial pattern passed to fontconfig to disallow color bmps
   * improve error recovery for a case where fontconfig ignores the requested pattern
-
+ 
 -------------------------------------------------------------------
 Sun Sep 23 11:40:33 UTC 2018 - sean@suspend.net
 
 - Patch #337
   * regenerated configure script
   * revise/improve fix for scrolling in margins
-  * amend change to default-translations "select" to ensure that specific key-press actions are listed first
+  * amend change to default-translations "select" to ensure that specific key-press actions are listed first 
 
 -------------------------------------------------------------------
 Sun Aug 26 20:30:58 UTC 2018 - pcerny@suse.com
@@ -1241,7 +1142,7 @@ Sat Feb  3 04:26:19 UTC 2018 - avindra@opensuse.org
 Fri Nov 10 15:40:46 UTC 2017 - sndirsch@suse.com
 
 - xterm-settings.patch
-  * define also wideBoldFont to get rid of a warning (bsc#1067530)
+  * define also wideBoldFont to get rid of a warning (bsc#1067530) 
 
 -------------------------------------------------------------------
 Thu Aug 10 15:29:31 UTC 2017 - pcerny@suse.com
@@ -1735,18 +1636,18 @@ Wed Sep  2 13:50:49 UTC 2015 - pcerny@suse.com
 Sun Apr 19 09:03:43 UTC 2015 - mpluskal@suse.com
 
 - Update to version 318
-  * rename new(er) configure option --enable-initial-erase to
+  * rename new(er) configure option --enable-initial-erase to 
-    --enable-pty-erase, since that conflicted with an existing
+    --enable-pty-erase, since that conflicted with an existing 
     option (report by Jens Schweikhardt).
-  * fix cut/paste error in --with-builtin-xpms configure option
+  * fix cut/paste error in --with-builtin-xpms configure option 
     (reports by Jens Schweikhardt, Ross Combs).
-  * fix minor formatting issue in xterm manual (report by Jens
+  * fix minor formatting issue in xterm manual (report by Jens 
     Schweikhardt).
-  * eliminate unnecessary "#(vi" markers in autoconf macros by
+  * eliminate unnecessary "#(vi" markers in autoconf macros by 
-    using "(" to begin case-statement cases (suggested by Jens
+    using "(" to begin case-statement cases (suggested by Jens 
     Schweikhardt).
   * minor fixes to improve const usage (Ross Combs).
-- Add pkgconfig and groff as dependency as configure is looking
+- Add pkgconfig and groff as dependency as configure is looking 
   for them
 
 -------------------------------------------------------------------
@@ -1984,7 +1885,7 @@ Sun Oct 12 18:39:01 UTC 2014 - badshah400@gmail.com
 
 - Add xterm-desktop-item-in-gnome-utilities-appfolder.patch to
   group xterm desktop item in the Utilities app-folder in the
-  GNOME shell.
+  GNOME shell. 
 
 -------------------------------------------------------------------
 Mon Sep 29 14:12:20 UTC 2014 - pcerny@suse.com
@@ -2032,7 +1933,7 @@ Wed Sep 17 09:39:07 UTC 2014 - pcerny@suse.com
 -------------------------------------------------------------------
 Tue Aug 12 15:56:01 UTC 2014 - pcerny@suse.com
 
-- fix SUSE naming in the package files (bnc#888995)
+- fix SUSE naming in the package files (bnc#888995) 
 
 -------------------------------------------------------------------
 Thu Jul 31 10:39:19 UTC 2014 - pcerny@suse.com
@@ -2646,7 +2547,7 @@ Tue Oct 30 12:04:34 UTC 2012 - pcerny@suse.com
  * improve check for window-manager name needed to establish
    usable default for activeIcon resource. This works around a
    scenario where gdm does incomplete cleanup, leaving window
-   properties that refer to windows which no longer exist
+   properties that refer to windows which no longer exist 
    (Redhat #869959).
 
 

xterm.spec

@@ -1,8 +1,7 @@
 #
 # spec file for package xterm
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +18,7 @@
 
 %define splitbin 0%{?suse_version} >= 1300
 Name:           xterm
-Version:        393
+Version:        387
 Release:        0
 Summary:        The basic X terminal program
 License:        MIT
@@ -50,9 +49,7 @@ BuildRequires:  groff
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-%if 0%{?suse_version} < 1600
 BuildRequires:  utempter-devel
-%endif
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
@@ -111,9 +108,7 @@ bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}}
     --enable-mini-luit \
     --enable-sco-fkeys \
     --enable-wide-chars \
-%if 0%{?suse_version} < 1600
     --with-utempter \
-%endif
     --with-tty-group=tty \
     --with-app-defaults=%{xappdefs} \
     --enable-backarrow-is-erase \