Accepting request 1115035 from X11:terminals

- update to 385:
  * fixes for ReGIS (report by Ben Wong).
    + correct conversion from HLS to RGB
    + improve font-caching performance.
  * update tables in wcwidth.c based on Unicode 15.1.0
  * improve fastScroll resource:
    + suppress screen-refreshes for carriage-returns
    + add -jf option to simplify use of this resource.
    + add a control sequence for enabling/disabling the resource.
    + enable this feature by default
  * extend  title-stack  feature  to  allow  an additional parameter to
    directly  access  the  stack, like the XTPUSHCOLORS and XTPOPCOLORS
    feature.
  * correct  size  and  position of box shown for double-cell character
    which  happens  to be missing from the bitmap font (report by Peter
    Fabinski).
  * improved configure script:
    + add  pattern for uClibc-ng to CF_XOPEN_SOURCE (report/patch by
      Waldemar Brodkorb).
    + add configure options --with-utmp-path and --with-wtmp-path to
      override  configure  script's  check  for  utmp/wtmp pathnames
      which are shown in the manual (Debian #1042767).
    + CF_XOPEN_SOURCE  provides  for  defining  _DEFAULT_SOURCE  for
      MinGW32 and MinGW64.
    + sed expression used to report gcc version now works with MinGW
  * ensure   that  line-attributes  are  reset  after  drawing  missing
    character (report by Christian Weisgerber).
  * update config.guess, config.sub
- rebased all patches

OBS-URL: https://build.opensuse.org/request/show/1115035
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=141

xterm-384.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373
-size 1539955

xterm-384.tgz.asc

@@ -1,15 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: See https://invisible-island.net/public/public.html for info
-
-iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmSskbIACgkQzCr0RyFn
-vgNemQv/RsVwBZ9T5r2RzEWf5BoR5ouW3L33Qh2PXtOmsh20cDUPD+wtSOdb78xk
-JyhRaPX7p3g53AsxrDqziFLq7kQRjLxihom+TLmffmowU223JbEsrUFQRtDJL5jN
-y5e/t5u1ZJY26fDveQwRohH4MLmEcFualKtKHHPXBFqcxU/GQAFIRyFfGD/mg5m8
-BkKXNssA9xWExGma+CJ/fYsigFi+ZKjIBhP8xmih8DVAWzI4eJVQc+j1CaygRXr4
-PTKkOjmU7t5DbubHXkYJW0ITho23kwKLxKch1Hq0pSyID8+JwGqHeW/a/KjnW6zP
-x1woJjM5LHafP6J9+Xwsx/D7C5MxM38GqzMz1VcnBn/lj83tCuj++MCbvuE/YoHK
-4Il4r/0tLQ0HLywJin1rMZbTEQNou0gnnXKaGqJ7NRVL3cI8+O9AKQrsqW2NxVei
-oVepE9JtgqEjHJDnNyk+OxJENXjU3klniSpaejEnVqVXFrxMJx9WLSO+CD+Yi57H
-b4HmKtf9
-=2yJJ
------END PGP SIGNATURE-----

xterm-385.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37592d8fef0b22bf2f62d8b840d3b22baff2b965265e8fe5b0582f0b1d637e55
+size 1543993

xterm-385.tgz.asc

@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: See https://invisible-island.net/public/public.html for info
+
+iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmUaECcACgkQzCr0RyFn
+vgPwmQv/S1X2RL/vFcsdfjG2ANFLOvfRcCr+86a5bEjfEkwXgezSfONwPM9ir4nq
+64fA+97tgYQ1p/2vUjp3qYj8+P4KpUKeu8zGtVgwVF9MHhXcRx3E1I51N+aEJJL4
+JxksRfXhFFPHXu7YAfYOH983bZ01e2xMgYjeUu6eOxMoU8h4et4wNJOjf5lGArM7
+Tc5xKwrwamfO0rVeNeyc4zEx6PGwRLWxt5AoKBF5zG5mE4bpTZewN3jgHLtbNaEM
+TmeTK+J9MuWzSpUa3Ue2dXtalvIZptTOnjXbYGtew4HHY2fe8aNpQBq2rKWisqbK
+PeAoLnZm1yBEXR6p3kNtoVQsCENZbVgCH6F4sWShHoYJbWNEViBCqP+Jn/aQyn/S
+FhgqoKE1XxPCCOWjBDaAhI+SWQ0G5IKwfR3ECMbNn5A4i3iaEv/G3IRtlAU8o5eb
+ZA41EfJCBzzPB0bGKhFtran72ELhuUxiNhg7yZRVlJS/JjbI6pzbxMrD5uxDs+WE
+mzukV1K/
+=GgjM
+-----END PGP SIGNATURE-----

xterm-decomposed_bitmaps.patch

@@ -18,15 +18,11 @@ Signed-off-by: Egbert Eich <eich@suse.de>
  xterm-299/misc.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/misc.c b/misc.c
+Index: xterm-385/misc.c
---- a/misc.c
+===================================================================
-+++ b/misc.c
+--- xterm-385.orig/misc.c
-@@ -2350,16 +2350,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
++++ xterm-385/misc.c
- }
+@@ -2698,6 +2698,8 @@ getColormapInfo(XtermWidget xw, unsigned
- 
- static void
- getColormapInfo(XtermWidget xw, unsigned *typep, unsigned *sizep)
- {
      if (getVisualInfo(xw)) {
  	*typep = (unsigned) xw->visInfo->class;
  	*sizep = (unsigned) xw->visInfo->colormap_size;
@@ -35,8 +31,3 @@ diff --git a/misc.c b/misc.c
      } else {
  	*typep = 0;
  	*sizep = 0;
-     }
- }
- 
- #define MAX_COLORTABLE 4096
- 

xterm-desktop_file_icon.patch

@@ -2,10 +2,10 @@
 # Parent  fa7b175db269546b9408d1af03d9c04dddbc4d9b
 # use system stock icon for XTerm
 
-Index: xterm-373/xterm.desktop
+Index: xterm-385/xterm.desktop
 ===================================================================
---- xterm-373.orig/xterm.desktop
+--- xterm-385.orig/xterm.desktop
-+++ xterm-373/xterm.desktop
++++ xterm-385/xterm.desktop
 @@ -38,7 +38,7 @@ Exec=xterm
  Terminal=false
  Type=Application

xterm-double_width_fonts.patch

@@ -1,11 +1,11 @@
 # HG changeset patch
 # Parent  682df5267f4b25286ab78bfbbfd91fe664cbbd21
 
-Index: xterm-353/fontutils.c
+Index: xterm-385/fontutils.c
 ===================================================================
---- xterm-353.orig/fontutils.c
+--- xterm-385.orig/fontutils.c
-+++ xterm-353/fontutils.c
++++ xterm-385/fontutils.c
-@@ -857,67 +857,19 @@ is_double_width_font(XFontStruct *fs)
+@@ -883,67 +883,19 @@ is_double_width_font(XFontStruct *fs)
  #endif
  
  #if OPT_WIDE_CHARS && OPT_RENDERFONT && defined(HAVE_TYPE_FCCHAR32)

xterm-forbid_window_and_font_ops.patch

@@ -2,15 +2,11 @@
 # Parent  d5ffae3ffb4d7bccf09feb476eed67e7688d73cf
 # forbid dangerous escape sequences (font loading)
 
-diff --git a/XTerm.ad b/XTerm.ad
+Index: xterm-385/XTerm.ad
---- a/XTerm.ad
+===================================================================
-+++ b/XTerm.ad
+--- xterm-385.orig/XTerm.ad
-@@ -263,16 +263,21 @@
++++ xterm-385/XTerm.ad
- !*faceSize: 8
+@@ -269,6 +269,11 @@
- 
- ! Here is a pattern that is useful for double-clicking on a URL:
- !*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
- !
  ! Alternatively,
  !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
  
@@ -22,20 +18,11 @@ diff --git a/XTerm.ad b/XTerm.ad
  !! We want a 8bit clean xterm
  *eightBitInput:        true
  *eightBitOutput:       true
- 
+Index: xterm-385/xterm.man
- !! Default Settings
+===================================================================
- *termName:             xterm-256color
+--- xterm-385.orig/xterm.man
- *pointerShape:         top_left_arrow
++++ xterm-385/xterm.man
- *scrollKey:            true
+@@ -2277,7 +2277,7 @@ The default is \*(``true\*(''.
-diff --git a/xterm.man b/xterm.man
---- a/xterm.man
-+++ b/xterm.man
-@@ -2091,17 +2091,17 @@ The default is \*(``false\*(''.
- .B "allowColorOps\fP (class\fB AllowColorOps\fP)"
- Specifies whether control sequences that
- set/query the dynamic colors should be allowed.
- ANSI colors are unaffected by this resource setting.
- The default is \*(``true\*(''.
  .TP
  .B "allowFontOps\fP (class\fB AllowFontOps\fP)"
  Specifies whether control sequences that set/query the font should be allowed.
@@ -44,8 +31,3 @@ diff --git a/xterm.man b/xterm.man
  .TP
  .B "allowMouseOps\fP (class\fB AllowMouseOps\fP)"
  Specifies whether control sequences that enable \fI\*n\fP to send
- escape sequences to the host on mouse-clicks and movement.
- The default is \*(``true\*(''.
- .TP 8
- .B "allowPasteControls\fP (class\fB AllowPasteControls\fP)"
- If true, allow control characters such as BEL and CAN to be pasted.

xterm-sigwinch.patch

@@ -1,11 +1,11 @@
 # HG changeset patch
 # Parent  547d2ea5029c2c3edd129a9d23e424877c6f29f0
 
-Index: xterm-372/screen.c
+Index: xterm-385/screen.c
 ===================================================================
---- xterm-372.orig/screen.c
+--- xterm-385.orig/screen.c
-+++ xterm-372/screen.c
++++ xterm-385/screen.c
-@@ -2246,7 +2246,7 @@ ScreenResize(XtermWidget xw,
+@@ -2257,7 +2257,7 @@ ScreenResize(XtermWidget xw,
  
  #ifdef TTYSIZE_STRUCT
      if (update_winsize(screen, rows, cols, height, width) == 0) {

xterm-suse.patch

@@ -3,10 +3,10 @@
 # from 7ecf75281e09a29875b61f38bb66920529368050:
 # improve display of chinese letters (bsc#1089049)
 
-Index: xterm-372/UXTerm.ad
+Index: xterm-385/UXTerm.ad
 ===================================================================
---- xterm-372.orig/UXTerm.ad
+--- xterm-385.orig/UXTerm.ad
-+++ xterm-372/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-372/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-372/XTerm-col.ad
+Index: xterm-385/XTerm-col.ad
 ===================================================================
---- xterm-372.orig/XTerm-col.ad
+--- xterm-385.orig/XTerm-col.ad
-+++ xterm-372/XTerm-col.ad
++++ xterm-385/XTerm-col.ad
 @@ -76,15 +76,15 @@
  *VT100*color1: red3
  *VT100*color2: green3
@@ -87,10 +87,10 @@ Index: xterm-372/XTerm-col.ad
  *VT100*color13: magenta
  *VT100*color14: cyan
  *VT100*color15: white
-Index: xterm-372/XTerm.ad
+Index: xterm-385/XTerm.ad
 ===================================================================
---- xterm-372.orig/XTerm.ad
+--- xterm-385.orig/XTerm.ad
-+++ xterm-372/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-372/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-372/xterm.man
+Index: xterm-385/xterm.man
 ===================================================================
---- xterm-372.orig/xterm.man
+--- xterm-385.orig/xterm.man
-+++ xterm-372/xterm.man
++++ xterm-385/xterm.man
-@@ -5487,9 +5487,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.

xterm.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Tue Oct  3 06:34:28 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
+
+- update to 385:
+  * fixes for ReGIS (report by Ben Wong).
+    + correct conversion from HLS to RGB
+    + improve font-caching performance.
+  * update tables in wcwidth.c based on Unicode 15.1.0
+  * improve fastScroll resource:
+    + suppress screen-refreshes for carriage-returns
+    + add -jf option to simplify use of this resource.
+    + add a control sequence for enabling/disabling the resource.
+    + enable this feature by default
+  * extend  title-stack  feature  to  allow  an additional parameter to
+    directly  access  the  stack, like the XTPUSHCOLORS and XTPOPCOLORS
+    feature.
+  * correct  size  and  position of box shown for double-cell character
+    which  happens  to be missing from the bitmap font (report by Peter
+    Fabinski).
+  * improved configure script:
+    + add  pattern for uClibc-ng to CF_XOPEN_SOURCE (report/patch by
+      Waldemar Brodkorb).
+    + add configure options --with-utmp-path and --with-wtmp-path to
+      override  configure  script's  check  for  utmp/wtmp pathnames
+      which are shown in the manual (Debian #1042767).
+    + CF_XOPEN_SOURCE  provides  for  defining  _DEFAULT_SOURCE  for
+      MinGW32 and MinGW64.
+    + sed expression used to report gcc version now works with MinGW
+  * ensure   that  line-attributes  are  reset  after  drawing  missing
+    character (report by Christian Weisgerber).
+  * update config.guess, config.sub
+- rebased all patches
+
 -------------------------------------------------------------------
 Sat Jul 15 14:57:12 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

xterm.spec

@@ -19,7 +19,7 @@
 %define splitbin 0%{?suse_version} >= 1300
 
 Name:           xterm
-Version:        384
+Version:        385
 Release:        0
 Summary:        The basic X terminal program
 License:        MIT