Accepting request 528278 from home:pcerny:factory

- Patch #330 - 2017/06/20 * updates for ReGIS (Ross Combs): + remove redundant text command error check which broke T(B) and T(E). + retain the loading alphabet number across multiple “L” commands. + add S(T) delay handler. + fix some color handling error messages. + add stubbed-out macrograph handling. + use fragment_remaining() and fragment_consumed() instead of manually checking position / length in various places. + rename some local variables in string / extent / option parsing + wrap some long lines. + move macrograph command handling out of the top-level. * add a summary of the italic fonts loaded to -report-fonts option. * modify the font-lookup for italics to allow for “-i-” if no match is found with slant “-o-” (prompted by patch by Ben Wong). * change default values for mkSamplePass and mkSampleSize to reflect generally-improved locale support in various operating systems (FreeBSD #219800). * modify wcwidth.c to return -1 for non-Unicode values, and adjust a couple of blocks to better match assumptions about ambiguous-width characters in other implementations. Also modify wcwidth.c to support configurable soft-hyphen, so there is no drawback to using this version rather than a system wcwidth. * amend change made in patch #328 for cursor-visibility to OBS-URL: https://build.opensuse.org/request/show/528278 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=146
2017-09-22 12:05:44 +00:00 · 2017-09-22 12:05:44 +00:00 · 85c2100f4c
commit 85c2100f4c
parent 4e371b8697
11 changed files with 257 additions and 58 deletions
--- a/xterm-327.tgz
+++ b/xterm-327.tgz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66fb2f6c35b342148f549c276b12a3aa3fb408e27ab6360ddec513e14376150b
-size 1240131
--- a/xterm-330.tgz
+++ b/xterm-330.tgz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aeef9f29f6b95e09f481173c8c3053357bf5ffe162585647f690fd1707556df
+size 1273183
--- a/xterm-330.tgz.asc
+++ b/xterm-330.tgz.asc
@ -2,7 +2,7 @@
 Version: GnuPG v1.4.12 (GNU/Linux)
 Comment: See http://invisible-island.net/public/public.html for info

-iEYEABECAAYFAlf4QagACgkQcCNT4Pfkjtu9KgCg0/5OzOqkPwVgjyMiLZhhjWZY
-cHkAmwY7UW7xOYME0XdA7ryIQ4rmgxqm
-=c5iZ
+iEYEABECAAYFAllJyZUACgkQcCNT4Pfkjtt3UwCfbaDPJe/tpjoPH+ES1dexv2VH
+v58An2sH6QjTZBt8JkHbQ6nadwdRf2xa
+=mO97
 -----END PGP SIGNATURE-----
--- a/xterm-decomposed_bitmaps.patch
+++ b/xterm-decomposed_bitmaps.patch
@ -21,7 +21,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
 diff --git a/misc.c b/misc.c
 --- a/misc.c
 +++ b/misc.c
-@@ -2237,16 +2237,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
+@@ -2260,16 +2260,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
 }
 
 static void
--- a/xterm-double_width_fonts.patch
+++ b/xterm-double_width_fonts.patch
@ -1,7 +1,7 @@
 diff --git a/fontutils.c b/fontutils.c
 --- a/fontutils.c
 +++ b/fontutils.c
-@@ -690,77 +690,29 @@ is_double_width_font(XFontStruct *fs)
+@@ -752,77 +752,29 @@ is_double_width_font(XFontStruct *fs)
 {
     return ((2 * fs->min_bounds.width) == fs->max_bounds.width);
 }
--- a/xterm-enable_libtinfo.patch
+++ b/xterm-enable_libtinfo.patch
@ -3,7 +3,7 @@
 diff --git a/aclocal.m4 b/aclocal.m4
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -761,20 +761,20 @@ if test "$cf_full_tgetent" = yes ; then
+@@ -792,20 +792,20 @@ if test "$cf_full_tgetent" = yes ; then
 else
 	cf_test_message="tgetent"
 fi
@ -29,7 +29,7 @@ diff --git a/aclocal.m4 b/aclocal.m4
 diff --git a/configure b/configure
 --- a/configure
 +++ b/configure
-@@ -5444,20 +5444,20 @@ echo "$as_me:5443: checking for $cf_test
+@@ -5754,20 +5754,20 @@ echo "$as_me:5753: checking for $cf_test
 echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6
 if test "${cf_cv_lib_tgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
--- a/xterm-forbid_window_and_font_ops.patch
+++ b/xterm-forbid_window_and_font_ops.patch
@ -28,7 +28,7 @@ diff --git a/XTerm.ad b/XTerm.ad
 diff --git a/xterm.man b/xterm.man
 --- a/xterm.man
 +++ b/xterm.man
-@@ -1992,17 +1992,17 @@ The default is \*(``false\*(''.
+@@ -2036,17 +2036,17 @@ The default is \*(``false\*(''.
 .TP
 .B "allowColorOps\fP (class\fB AllowColorOps\fP)"
 Specifies whether control sequences that set/query the dynamic colors should be allowed.
@ -39,11 +39,11 @@ diff --git a/xterm.man b/xterm.man
 Specifies whether control sequences that set/query the font should be allowed.
 -The default is \*(``true\*(''.
 +The default is \*(``false\*(''.
+ .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.
- Formatting characters (tab, newline) are always allowed.
- Other C0 control characters are suppressed unless this resource is enabled.
- The exact set of control characters (C0 and C1)
- depends upon whether UTF-8 encoding is used,
- as well as the \fBallowC1Printable\fP resource.
--- a/xterm-settings.patch
+++ b/xterm-settings.patch
@ -180,37 +180,7 @@ diff --git a/XTerm.ad b/XTerm.ad
 *fontMenu*font-doublesize*Label: Doublesized Characters
 *fontMenu*font-loadable*Label:	VT220 Soft Fonts
 *fontMenu*font-packed*Label:	Packed Font
-@@ -134,22 +159,23 @@
- *fontMenu*utf8-title*Label:	UTF-8 Titles
- 
- *fontMenu*allow-color-ops*Label:	Allow Color Ops
- *fontMenu*allow-font-ops*Label:	Allow Font Ops
- *fontMenu*allow-tcap-ops*Label:	Allow Termcap Ops
- *fontMenu*allow-title-ops*Label:	Allow Title Ops
- *fontMenu*allow-window-ops*Label:	Allow Window Ops
- 
-*VT100.utf8Fonts.font2:	-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-*VT100.utf8Fonts.font:	-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-*VT100.utf8Fonts.font3:	-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
-*VT100.utf8Fonts.font4:	-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-*VT100.utf8Fonts.font5:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-*VT100.utf8Fonts.font6:	-misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
-+! upstream configuration, which simply has broken our xterm font configuration completely
-+!*VT100.utf8Fonts.font2:	-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-+!*VT100.utf8Fonts.font:	-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-+!*VT100.utf8Fonts.font3:	-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
-+!*VT100.utf8Fonts.font4:	-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-+!*VT100.utf8Fonts.font5:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-+!*VT100.utf8Fonts.font6:	-misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
- 
- *tekMenu.Label:  Tek Options
- *tekMenu*tektextlarge*Label:  Large Characters
- *tekMenu*tektext2*Label:  #2 Size Characters
- *tekMenu*tektext3*Label:  #3 Size Characters
- *tekMenu*tektextsmall*Label:  Small Characters
- *tekMenu*tekpage*Label:  PAGE
- *tekMenu*tekreset*Label:  RESET
-@@ -236,16 +262,70 @@
+@@ -237,16 +262,70 @@
 !*faceSize: 8
 
 ! Here is a pattern that is useful for double-clicking on a URL:
@ -284,7 +254,7 @@ diff --git a/XTerm.ad b/XTerm.ad
 diff --git a/xterm.man b/xterm.man
 --- a/xterm.man
 +++ b/xterm.man
-@@ -4275,19 +4275,23 @@ This option specifies the font to be use
+@@ -4603,19 +4603,23 @@ This option specifies the font to be use
 in the \*(``OverTheSpot\*('' input method.
 .IP
 In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion)
--- a/xterm-sigwinch.patch
+++ b/xterm-sigwinch.patch
@ -1,14 +1,14 @@
 diff --git a/screen.c b/screen.c
 --- a/screen.c
 +++ b/screen.c
-@@ -2248,17 +2248,17 @@ ScreenResize(XtermWidget xw,
- #ifdef USE_STRUCT_WINSIZE
-     ts.ws_xpixel = (ttySize_t) width;
-     ts.ws_ypixel = (ttySize_t) height;
- #endif
-     code = SET_TTYSIZE(screen->respond, ts);
-     TRACE(("return %d from SET_TTYSIZE %dx%d\n", code, rows, cols));
-     (void) code;
+@@ -2230,17 +2230,17 @@ ScreenResize(XtermWidget xw,
+ 	XConfigureWindow(XtDisplay(xw), screen->iconVwin.window,
+ 			 CWWidth | CWHeight | CWBorderWidth, &changes);
+     }
+ #endif /* NO_ACTIVE_ICON */
+ 
+ #ifdef TTYSIZE_STRUCT
+     update_winsize(screen->respond, rows, cols, height, width);
 
 -#if defined(SIGWINCH) && defined(TIOCGPGRP)
 +#if defined(SIGWINCH) && (defined(TIOCGPGRP) || defined(linux))
--- a/xterm.changes
+++ b/xterm.changes
@ -1,3 +1,232 @@
+-------------------------------------------------------------------
+Thu Aug 10 15:29:31 UTC 2017 - pcerny@suse.com
+
+- Patch #330 - 2017/06/20
+  * updates for ReGIS (Ross Combs):
+     + remove redundant text command error check which broke
+       T(B) and T(E).
+     + retain the loading alphabet number across multiple “L”
+       commands.
+     + add S(T) delay handler.
+     + fix some color handling error messages.
+     + add stubbed-out macrograph handling.
+     + use fragment_remaining() and fragment_consumed() instead
+       of manually checking position / length in various places.
+     + rename some local variables in string / extent / option
+       parsing
+     + wrap some long lines.
+     + move macrograph command handling out of the top-level.
+  * add a summary of the italic fonts loaded to -report-fonts
+    option.
+  * modify the font-lookup for italics to allow for “-i-” if no
+    match is found with slant “-o-” (prompted by patch by Ben
+    Wong).
+  * change default values for mkSamplePass and mkSampleSize to
+    reflect generally-improved locale support in various
+    operating systems (FreeBSD #219800).
+  * modify wcwidth.c to return -1 for non-Unicode values, and
+    adjust a couple of blocks to better match assumptions about
+    ambiguous-width characters in other implementations. Also
+    modify wcwidth.c to support configurable soft-hyphen, so
+    there is no drawback to using this version rather than a
+    system wcwidth.
+  * amend change made in patch #328 for cursor-visibility to
+    handle case where an application is updating the
+    reverse-video state (FreeBSD #219800).
+  * update tables of combining and ambiguous-width characters in
+    wcwidth.c based on Unicode 10.0.0.
+  * build-fix for --enable-sixel-graphics without
+    --enable-regis-graphics (reports by Sven Joachim, FreeBSD
+    #219945).
+- Patch #329 - 2017/06/12
+  * add control sequences for reading the Sixel and ReGIS
+    graphics sizes (suggested by Ben Wong).
+  * add a workaround for wcwidth returning -1 for characters
+    which should have been printable (FreeBSD #219800).
+  * fix a bug in font initialization from patch #328 (FreeBSD
+    #219800).
+  * fix a special case in HideCursor which assigned a bold font
+    to the slot used for normal font in changes for italics in
+    patch #307 (Debian #858304).
+  * updates for ReGIS (Ross Combs):
+     + Strings specified with no command are used as "comments".
+       Print these in the log when tracing.
+     + Catch attempts to use "alternate display" mode (AKA
+       "blink") from the GIGI, but do not implement it.
+     + The T(M) command should only multiply the height by 10,
+       not 20.
+     + Make the S(E) command reset more state than just the
+       screen contents.
+     + Remove two rotation variables which were only being
+       printed.
+     + Numerous minor fixes and comment updates in the R
+       command.
+     + Unknown R command option names trigger an empty response.
+     + Fix the output position after printing rotated text (it
+       was missing the the sign before).
+     + Fix the position change with pixelvectors and rotated
+       text (the rotation transform was not being applied).
+     + Update the TODO list and remove a verification FIXME
+       (slanted text positioning is correct as is).
+     + Emulate the approximately 1.4x enlargement for text which
+       isn't rotated at right angles.
+     + Only update the color planes specified in the plane mask
+       (the W command's F option).
+  * fix a bug introduced by the changes to font information in
+    patch #328. When processing the "checkfont" option of the
+    locale resource, the program referred to the request data, to
+    an array which was only allocated in the new/result widget
+    (report by H Merijn Brand).
+  * fix a missing assignment initialization to make the utf8
+    resource control whether escape sequences to enable/disable
+    UTF-8 mode are allowed.
+- Patch #328 - 2017/06/01
+  * revise parser for charClass resource, making these
+    improvements:
+     + accept octal and hexadecimal values
+     + allow embedded whitespace
+     + allow the class after colon to be optional, e.g., to
+       clear class settings for a range of characters.
+  * add command-line option -report-charclass.
+  * fix most lintian warnings about test-package
+  * add eraseSavedLines resource.
+  * document DECSED 3 in ctlseqs.ms (report by Ben Longmans).
+  * improve integration between configure-events and updates for
+    reported screensize, in particular when switching between
+    vt100 and tek4014 modes.
+  * modify selection-highlighting of reverse-video text to keep
+    that distinct, e.g., by reversing the selection foreground
+    and background colors as one would expect. This fixes a
+    "useless" case in the description of highlightColorMode.
+  * improve fix for Debian #759734, addressing a case where
+    non-colored cursor would be invisible against reverse-video
+    (see patch #311).
+  * updates for ReGIS (Ross Combs):
+     + the "H" option of the "T" command should multiply by 10,
+       not 20.
+     + display unknown glyphs as a solid block.
+     + given a succession of text-direction options, use the
+       last.
+     + fix the direction of ReGIS slanted text so that negative
+       values produce oblique output .
+     + fix the ReGIS text direction option to only rotate
+       characters when no following size option is used.
+  * update terminfo to better match corresponding entries in
+    ncurses, e.g., u8 pattern to match the VT220, VT420, etc.,
+    primary responses, as well as adding smxx and rmxx.
+  * fixes from Jörg Sommer:
+     + corrected a trace-message regarding maximum
+       graphics-size; it used the similar ReGIS maximum size
+       which might not be configured.
+     + in do_select_regex, clear selection if there is no match.
+       If the regex does not match anything around the cursor,
+       the selection returned must be empty, otherwise the whole
+       line is treated as a match. This way the command defined
+       by exec-selectable will not be executed if there is no
+       match.
+     + modify limit in do_select_regex to include the character
+       at the cursor in the match, making it easier to type
+       something and then hit the key to trigger
+       exec-selectable.
+     + If exec-selectable or insert-selection is triggered by a
+       mouse button click, the position of the mouse pointer
+       should be used. This makes it easier to address any
+       position on the window and it makes it possible to use
+       the mouse, e.g., for applications such as mutt where you
+       cannot move the cursor.
+  * modify DECRC to save/restore xterm's last-column flag used to
+    control wrapping behavior rather than manipulating DECAWM
+    (report/analysis by Mattias Engdegård).
+  * add configure option --enable-terminfo-env to use the value
+    set by --with-own-terminfo for the $TERMINFO environment
+    variable. That variable was set automatically for HPUX, but
+    would be useful in other systems, e.g., for Solaris (request
+    by Jeff Wieland).
+  * fix a race condition when setting up a signal handler to
+    timeout if opening /dev/tty hangs (patch by Tobias
+    Stoeckmann).
+  * review/cleanup resources which were not in the manual page
+    (report by Maxwell Anselm):
+     + add manual page description as needed.
+     + drop resource name for menuBar, as unnecessary.
+     + modify fallback numeric value for regisScreenSize
+       resource to match that for maxGraphicSize.
+  * updated configure macros CF_ADD_CFLAGS, CF_CC_ENV_FLAGS,
+    CF_GNU_SOURCE, CF_MATH_LIB, and CF_XOPEN_SOURCE from other
+    program-changes.
+  * update config.guess, config.sub
+  * change “maximum screensize” assumed by resize to 9999x9999,
+    to accommodate people using the Unreadable font.
+  * drop Utility from default value of --with-desktop-category
+    (Debian #780176).
+  * widen the configure script pattern used for finding related
+    ".desktop" files, including “Terminal”
+  * several minor improvements to font utility functions:
+     + provide for later modification to implement font-sets by
+       parsing the font resources as comma-separated lists.
+     + parse -fn and -fa similarly, using “x:” and “xft:”
+       prefixes for font name/family strings to distinguish
+       between XLFD and Xft font specifications.
+     + use loops to iterate over font classes
+     + use getters/setters for font data to allow for on-demand
+       lookups.
+     + make the debugging trace for missing glyph less verbose
+       since that interferes with the -report-fonts option.
+     + refactor xtermLoadFont to make it clearer how some fonts
+       are derived from others, e.g., bold, wide.
+     + make the triggering and suppressing of font-warnings more
+       consistent by storing the last state in the widget.
+     + reduce font-warnings by checking for repeated warnings.
+  * add vttests/query-status.pl
+  * add vttests/closest-rgb
+  * add special case for displaying soft-hyphen if it happens to
+    fall at the right margin, and omitting similar case such as
+    the BIDI markers, where a zero-width character is neither a
+    control character nor a combining character (Debian #844325).
+  * modify logic for OSC 52, manipulate selection data, to update
+    the selection-time to include the latest X events. This fixes
+    some cases where the selection was invalid, e.g., after an
+    event due to focus-follows-mouse (report/testcase by Stephane
+    Chauveau).
+  * revise macro CastMallocN as new macro TextAlloc to make
+    explicit use of sizeof(char) (prompted by patch by Cade
+    Foster).
+  * add “Mouse Ops” menu entry and related resources to allow
+    runtime disabling/enabling of the mouse protocol escape
+    sequences (discussion with Bob Proulx).
+  * improve discussion of mouse actions versus protocol in the
+    manual (discussion with Bob Proulx).
+  * improve discussion of environment variables in the manual,
+    pointing out where some features (such as termcap and the
+    System5 COLUMNS and LINES variables) are used rarely, mainly
+    to support legacy applications.
+  * add examples of translations resource for select/paste, and
+    for font-size changes to the manual.
+  * minor reordering of some entries in ctlseqs.ms for
+    consistency (report by Arran Ubels).
+  * add -s option to 256colors2.pl and 88colors2.pl, to
+    demonstrate modifying the “system” colors 0–15.
+  * omit XFT_SPACING property from call to XftPatternBuild, to
+    work around a bug in fontconfig for handling Google Go fonts,
+    whose names sort in an order not expected by fontconfig,
+    causing the request for a monospaced font to return italics,
+    e.g.,
+        $ fc-match 'Go Mono:spacing=monospace'
+        Go-Mono-Italic.ttf: "Go Mono" "Italic"
+        (report by Giacomo Boffi on Stackoverflow).
+  * modify minstall.in to improve a workaround added to the
+    manual page in patch #182 to avoid having the C preprocessor
+    used in the imake configuration strip out the comments in the
+    character classes section (reports by Ted Unangst, Anthony J
+    Bentley).
+- patch rebase:
+  [xterm-decomposed_bitmaps.patch]
+  [xterm-double_width_fonts.patch]
+  [xterm-enable_libtinfo.patch]
+  [xterm-forbid_window_and_font_ops.patch]
+  [xterm-settings.patch]
+  [xterm-sigwinch.patch]
+
 -------------------------------------------------------------------
 Sat Apr 29 15:11:43 UTC 2017 - bwiedemann@suse.com

--- a/xterm.spec
+++ b/xterm.spec
@ -1,7 +1,7 @@
 #
 # spec file for package xterm
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # 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 vttest_version 20140305
 %define splitbin 0%{?suse_version} >= 1300
 Name:           xterm
-Version:        327
+Version:        330
 Release:        0
 Summary:        The basic X terminal program
 License:        MIT