Accepting request 631633 from X11:terminals

fix changelog (forwarded request 631632 from pcerny) OBS-URL: https://build.opensuse.org/request/show/631633 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=111
2018-08-27 11:47:37 +00:00 · 2018-08-27 11:47:37 +00:00 · dfbdd971a3
commit dfbdd971a3
parent 63799cd13a 8ee1ad033c
15 changed files with 195 additions and 28 deletions
--- a/xterm-332.tgz
+++ b/xterm-332.tgz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d4b112717e62032826082bec523aff2ab9d9b1531b1d2e81f6cab4c668cb27d
-size 1294006
--- a/xterm-335.tgz
+++ b/xterm-335.tgz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0bf172a9bf301bd9d5ae27957f4f54687b5d22382fd2f4d872d0a4db47fcb96
+size 1319009
--- a/xterm-335.tgz.asc
+++ b/xterm-335.tgz.asc
@ -2,7 +2,7 @@
 Version: GnuPG v1
 Comment: See https://invisible-island.net/public/public.html for info

-iEYEABECAAYFAlrT52sACgkQcCNT4PfkjtunMgCeKGGohDnzjbt3H0x2MOzhYov3
-oWoAoNRR4lgjpJpS+BAaa1ATFCy5uH36
-=idxD
+iEYEABECAAYFAltzhKwACgkQcCNT4PfkjtuHegCgufsnixowqMMSzOA4i9Hivwep
+/j8AoMl5u4Sd97Uc5qb5ibY6OfhGHTd5
+=TVG0
 -----END PGP SIGNATURE-----
--- a/xterm-allow_iso-utf_fonts_in_menu.patch
+++ b/xterm-allow_iso-utf_fonts_in_menu.patch
@ -1,3 +1,5 @@
+# HG changeset patch
+# Parent  0bdc9a50b149b2f85acde8e6b22b63259f36e057
 # allow UTF-8 fonts (iso-10464) as well

 diff --git a/XTerm.ad b/XTerm.ad
--- a/xterm-better-fonts.patch
+++ b/xterm-better-fonts.patch
@ -1,6 +1,15 @@
--- xterm/XTerm.ad	2018-07-10 14:16:04.913131251 +0200
-+++ xterm/XTerm.ad	2018-07-10 14:22:15.180237066 +0200
-@@ -116,9 +116,9 @@ 
+# HG changeset patch
+# Parent  7ecf75281e09a29875b61f38bb66920529368050
+
+diff --git a/XTerm.ad b/XTerm.ad
+--- a/XTerm.ad
+++ b/XTerm.ad
+@@ -111,19 +111,19 @@
+ 
+ ! don't use the compiled in default of "*" for ximFont because this
+ ! leads to very slow startup times for zh_CN.UTF-8 and zh_HK.UTF-8 locales
+ ! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930):
+ *ximFont: fixed
 
 *fontMenu.Label:  VT Fonts
 *fontMenu*fontdefault*Label:	Default
@ -13,3 +22,8 @@
 
 *fontMenu*font1*Label:	Unicode Best
 *VT100.font1:		-misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+ *VT100.wideFont1:	-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
+ !*VT100.font1:		nil2
+ !*VT100.wideFont1:
+ *IconFont:		nil2
+ *fontMenu*font2*Label:	Tiny
--- 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
-@@ -2260,16 +2260,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
+@@ -2350,16 +2350,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
 }
 
 static void
--- a/xterm-desktop-item-in-gnome-utilities-appfolder.patch
+++ b/xterm-desktop-item-in-gnome-utilities-appfolder.patch
@ -1,11 +1,17 @@
+# HG changeset patch
+# Parent  eb22ea61e475efde1f9576b471f4a4597523b1f4
 Group the desktop file into the Utilities folder in the GNOME
 shell application overview.

-Index: xterm-332/xterm.desktop
-===================================================================
--- xterm-332.orig/xterm.desktop
-+++ xterm-332/xterm.desktop
-@@ -39,5 +39,5 @@ Terminal=false
+diff --git a/xterm.desktop b/xterm.desktop
+--- a/xterm.desktop
+++ b/xterm.desktop
+@@ -34,10 +34,10 @@
+ Name=XTerm
+ #GenericName=Terminal
+ Comment=standard terminal emulator for the X window system
+ Exec=xterm
+ Terminal=false
 Type=Application
 Encoding=UTF-8
 Icon=terminal
--- a/xterm-desktop_file_icon.patch
+++ b/xterm-desktop_file_icon.patch
@ -1,3 +1,5 @@
+# HG changeset patch
+# Parent  fa7b175db269546b9408d1af03d9c04dddbc4d9b
 # use system stock icon for XTerm

 diff --git a/xterm.desktop b/xterm.desktop
--- a/xterm-double_width_fonts.patch
+++ b/xterm-double_width_fonts.patch
@ -1,7 +1,10 @@
+# HG changeset patch
+# Parent  682df5267f4b25286ab78bfbbfd91fe664cbbd21
+
 diff --git a/fontutils.c b/fontutils.c
 --- a/fontutils.c
 +++ b/fontutils.c
-@@ -752,77 +752,29 @@ is_double_width_font(XFontStruct *fs)
+@@ -755,77 +755,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
@ -1,9 +1,11 @@
+# HG changeset patch
+# Parent  d2d03d4f6634a54846af7503711ed356c87b1625
 # check for libtinfo before falling back to ncurses

 diff --git a/aclocal.m4 b/aclocal.m4
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -792,20 +792,20 @@ if test "$cf_full_tgetent" = yes ; then
+@@ -802,20 +802,20 @@ if test "$cf_full_tgetent" = yes ; then
 else
 	cf_test_message="tgetent"
 fi
@ -29,7 +31,7 @@ diff --git a/aclocal.m4 b/aclocal.m4
 diff --git a/configure b/configure
 --- a/configure
 +++ b/configure
-@@ -5754,20 +5754,20 @@ echo "$as_me:5753: checking for $cf_test
+@@ -6141,20 +6141,20 @@ echo "$as_me:6140: 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
@ -1,9 +1,11 @@
+# HG changeset patch
+# Parent  d5ffae3ffb4d7bccf09feb476eed67e7688d73cf
 # forbid dangerous escape sequences (font loading)

 diff --git a/XTerm.ad b/XTerm.ad
 --- a/XTerm.ad
 +++ b/XTerm.ad
-@@ -262,16 +262,21 @@
+@@ -263,16 +263,21 @@
 !*faceSize: 8
 
 ! Here is a pattern that is useful for double-clicking on a URL:
@ -28,10 +30,10 @@ diff --git a/XTerm.ad b/XTerm.ad
 diff --git a/xterm.man b/xterm.man
 --- a/xterm.man
 +++ b/xterm.man
-@@ -2036,17 +2036,17 @@ The default is \*(``false\*(''.
- .TP
+@@ -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.
+ 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
--- a/xterm-settings.patch
+++ b/xterm-settings.patch
@ -1,3 +1,5 @@
+# HG changeset patch
+# Parent  c7753810ca3026190c5da0536ecf86e9b13800d3
 # various distribution configuration tweaks

 diff --git a/UXTerm.ad b/UXTerm.ad
@ -181,7 +183,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
-@@ -237,16 +262,70 @@
+@@ -237,16 +263,70 @@
 !*faceSize: 8
 
 ! Here is a pattern that is useful for double-clicking on a URL:
@ -255,7 +257,7 @@ diff --git a/XTerm.ad b/XTerm.ad
 diff --git a/xterm.man b/xterm.man
 --- a/xterm.man
 +++ b/xterm.man
-@@ -4603,19 +4603,23 @@ This option specifies the font to be use
+@@ -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)
@ -280,5 +282,5 @@ diff --git a/xterm.man b/xterm.man
 .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\*('':
- .TP 8
+ These are specified by patterns
+ such as \*(``\fB__default_class__.tek4014.\fP\fINAME\fP\*('':
--- a/xterm-sigwinch.patch
+++ b/xterm-sigwinch.patch
@ -1,7 +1,10 @@
+# HG changeset patch
+# Parent  547d2ea5029c2c3edd129a9d23e424877c6f29f0
+
 diff --git a/screen.c b/screen.c
 --- a/screen.c
 +++ b/screen.c
-@@ -2230,17 +2230,17 @@ ScreenResize(XtermWidget xw,
+@@ -2229,17 +2229,17 @@ ScreenResize(XtermWidget xw,
 	XConfigureWindow(XtDisplay(xw), screen->iconVwin.window,
 			 CWWidth | CWHeight | CWBorderWidth, &changes);
     }
--- a/xterm.changes
+++ b/xterm.changes
@ -1,3 +1,132 @@
+-------------------------------------------------------------------
+Sun Aug 26 20:30:58 UTC 2018 - pcerny@suse.com
+
+- Patch #335 - 2018/08/14
+  * add colorInnerBorder resource to make a change from patch
+    #334 configurable (reports by H Merijn Brand, Gabriele
+    Balducci).
+- Patch #334 - 2018/08/12
+  * modify Imakefile to reflect the fact that NetBSD no longer
+    has a working termcap emulation.
+  * add resource-setting validShells which can be used to augment
+    the system's /etc/shell (prompted by discussion with Paul
+    Lampert).
+  * stifle some useless warnings from lintian in test-packages.
+  * add the ncurses extension “RGB” to the responses for the
+    termcap-query feature.
+  * improved getopts-handling in sample scripts.
+  * fix some warnings from gcc8 and clang --analyze.
+  * update note about incorrect documentation for DECRQSS to
+    include VT525 (report by Markus Schmidt).
+  * correct check for default-values in rectangular parsing; a
+    zero counts as a missing or default parameter
+    (report/testcase by Markus Schmidt).
+  * correct some ranges in the ambiguous[] table in wcwidth
+    (adapted from patch by KUGA Tsutomu).
+  * fix a special case with faint video attribute incorrectly
+    combined with default color.
+  * add private control XTREPORTSGR for reporting
+    video-attributes and color on a rectangle, and script
+    report-sgr.pl to demonstrate it.
+  * modify some of the markup in ctlseqs.ms to work around
+    groff's reassignment of ASCII punctuation characters as
+    documented in groff_char(7).
+  * treat ECMA-48 SGR 6 the same as SGR 5.
+  * add private controls XTPUSHSGR and XTPOPSGR for
+    saving/restoring the current video-attributes on a stack
+    (adapted from patch by Dan Thompson).
+  * modify DECRPM response for logging enable to indicate its
+    state even when enabling/disabling it is not allowed.
+  * implement DECSNLS
+  * implement DECRSPS
+  * improve fill-color for double-buffer configuration, which was
+    sharing a graphic context with the cursor.
+  * fix a couple of cases where double-sized VT100 characters
+    were not clipped, seen in Joe Smith's VT100 torture test.
+  * color the inner border using the same borderColor as the
+    outer border, rather than filling with the VT100's default
+    background.
+  * change encoding of “THANKS” to UTF-8.
+  * modify handling of DECELR to recognize MotionNotify events
+    again, amending a check for allowMouseOps which limited that
+    to button-events in patch #328 (Olaf Rogalsky).
+  * fix some screen-painting problems with left/right margins
+    when using insert-line or delete-line (report/testcase by
+    Martin Hostettler). also fix similar case with
+    index/reverse-index.
+  * several minor performance improvements using macros, e.g.,
+    inline checks for character width.
+  * add DECSCPP and DECSLPP to DECRQSS.
+  * implement DECSCPP.
+  * implement DECCIR and DECTABSR presentation reports.
+  * modify checksum computation for DECRQCRA to treat
+    uninitialized cells as blanks rather than nulls.
+  * drop custom-entity from HTML-dump, use UTF-8 for &nbsp;
+    (Debian #902381).
+  * modify display of non-BMP characters when using bitmap fonts
+    to show a null/empty box rather than the replacement
+    character which was used in cleanup changes for patch #233
+    (report by Christian Weisgerber).
+  * when setting up clipping rectangle for Xft, allow for the
+    case where xterm is only displaying a combining character,
+    where the base was already written (report by Joshua
+    Crowgey).
+  * allow reset Xft's state if switching font-sizes when
+    double-buffering is used.
+  * fix repainting, e.g., on resize, when double-buffering is
+    used with Xft (patch by Daniel Colascione).
+  * correct some interchanged pairs of symbols in
+    unicode/keysym.map (Brad Town).
+  * improve configure macros CF_GCC_WARNINGS, CF_GNU_SOURCE,
+    CF_POSIX_C_SOURCE, CF_TRY_XOPEN_SOURCE, CF_XOPEN_SOURCE,
+    CF_X_ATHENA_CPPFLAGS.
+  * modify logFile resource to interpret “-” as the standard
+    output (adapted patch by Colum Paget).
+  * improve documentation of Tek4014 menu options; fix a case
+    where the Tek4014 window was not displayed before switching
+    modes.
+  * re-correct parameter for pid used for DECCKSR, DECRQCSR (see
+    xterm #315).
+  * hard/soft reset now resets the cursor-blinking state that may
+    have been set via escape sequences; the cursor-blinking
+    menu-entry feature is unmodified (report by Matthieu Herrb).
+  * update config.guess, config.sub
+- Patch #333 - 2018/05/03
+  * ensure that i18n is enabled if input-method is enabled.
+  * modify logic for pre-edit to update spot-location while the
+    cursor is invisible (Kakoune #1940).
+  * change default icon to newer one, "mini.xterm".
+  * install a complete set of icons, to simplify post-install
+    customization.
+  * add resource disallowedPasteControls to extend filtering of
+    control characters from pastes.
+  * add print-on-error action-hook, and document action-hooks for
+    dump-html, dump-svg.
+  * provide action-hook for print-immediate, which was available
+    only as a menu-item (report by Rastislav Barlik).
+  * continue to improve notes in ctlseqs.ms which mention where
+    various controls originated.
+  * add case to accept ECMA-48's bogus SD, but document the issue
+    in ctlseqs.ms.
+  * add control sequence for loading XPM-icon file, using the
+    analogous control sequence from shelltool/dtterm.
+  * add -report-icons option, to report on XPM-icon and title-bar
+    updates.
+  * correct a discrepancy between locator-reports for VT220 vs
+    VT330.
+  * add window-ops control sequences to complement existing ones
+    for reporting window-position and text-area size with reports
+    for text-area position and window-size.
+  * display vt52 graphics mode characters.
+  * correct case-statement for window-ops 10, overlooked since
+    some window managers equate vertical-maximize and
+    horizontal-maximize window hints with full-screen maximize.
+
+-------------------------------------------------------------------
+Wed Aug 15 07:55:59 UTC 2018 - schwab@suse.de
+
+- Copy updated config.sub config.guess files into vttest sources
+
 -------------------------------------------------------------------
 Tue Jul 10 14:20:54 UTC 2018 - meissner@suse.com

--- a/xterm.spec
+++ b/xterm.spec
@ -18,8 +18,9 @@

 %define vttest_version 20140305
 %define splitbin 0%{?suse_version} >= 1300
+
 Name:           xterm
-Version:        332
+Version:        335
 Release:        0
 Summary:        The basic X terminal program
 License:        MIT
@ -99,6 +100,7 @@ This package contains the basic X.Org terminal program.
 %patch10 -p1
 cp -t . %{SOURCE8} %{SOURCE9}
 bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}}
+cp config.guess config.sub ../vttest-%{vttest_version}
 cd ../vttest-%{vttest_version}

 %build