From 11135293b213d17370cebbfbe3b4a25bb4564ccdca47b297401ab193ab998b5d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 19 Feb 2018 13:26:54 +0000 Subject: [PATCH] Accepting request 572173 from home:avindra MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Patch #331 - 2017/12/30 * add workaround for improper grayscale adjustments made in FreeType library, exposed by changes to rounding in 2.8.1, which shows up as a gap in line-drawing characters * improve a special case where a non-Unicode font's line-drawing characters were not used, when specifying it via the utf8Fonts resource. * replace constant 10msec delay for next X event with new resource nextEventDelay, and reduce that to 1msec to accommodate faster machines than used when -hold was implemented in 1999 * add scroll-to action, which simplifies binding a key to scroll to the beginning or end of the saved-lines * add building blocks for alternate screen and/or title-stack features in the terminfo file. * improve calculations for cell-data size. * configure script: enable XHTML/SVG screen dumps by default. * configure script: enable 256-colors by default. * update config.guess, config.sub * configure script: option for --with-man2html to use improved script by default. * add case for private mode 1044 in DECRQM, to report the keepClipboard resource setting and corresponding menu entry. * fix an inconsistency between private mode 12 (the AT&T 610 cursor blink) and DECSCUSR: the former relied on having the cursorBlink resource set initially to enable the escape sequence, while the latter does not. * add private modes 13 and 14, as well as resource cursorBlinkXOR to allow better control over the cursor-blinking state * modify the html and svg screen dumps to support direct color * modify media copy (screen-printing) to support the same SGR codes as DECRQSS, including 88/256 indexed color as well as direct color. * improve options-parsing for query-status.pl script. * modify parsing of SGR direct-color control making color space identitier optional. The corresponding DECRQSS reply always returns an empty (default) field for the identifier. * add wide-attributes to DECRQSS reply for SGR. * add private mode 1046 to help with scripting applications. * correct expression used for readline-flags in DECRQM; to test the current flag rather than information stacked within the same variable. * correct typo in ctlseqs.ms reference to ISO-8613-6 * fix lintian warning for test-package. * fix typo in DECRQSS for SGR 48, which printed the foreground value for colors past 15. Also use colon delimiter for codes 38/48 in response * improve workaround for Debian #542434 by using the font's maximum width when no ISO-8859-1 glyphs are provided * work around a special case of Xft's mismanagement of its cached data by adding a check before the -report-fonts option to ensure that it does not use an XftPattern which may have been freed during a call to XftFontOpenPattern. * improve manual page description of regex option for onXClicks resources * add directColor resource. * additional manpage macro cleanup * add optional support for direct-colors * improve legacy/NRC character set mapping: + enable alternate NRC set designators for French and French Canadian, ‘9’ and ‘f’ respectively, as documented in ctlseqs. (‘9’ is documented for VT510, ‘f’ is a Kermit feature). + correct the Unicode value in the DEC Technical table to show capital delta. + referring to * http://vt100.net/docs/vt220-rm/table2-3b.html * http://vt100.net/docs/vt320-uu/appendixe.html + add entries for the DEC Supplemental Graphics table to display 0x28/0xa8 as ¤ and 0x5d/0xdd as Ÿ. referring to * http://www.vt100.net/charsets/technical.html * alter the Unicode values used for 0x2b through 0x2c to use curly braces to work with the “middle” parts displayed with 0x2f and 0x30. + modify the VT220 “Supplemental” table, giving a hint that it was probably meant to be “Supplemental Graphics” and is the same as VT320's table. * quiet a few font-warnings when a derived fontname cannot be opened, overlooked in refactoring of font resources in patch #328 * correct error response for DECRQSS broken in cleanup of Coverity reports in patch #288 * improve DECRPM responses by returning mode not recognized for modes which may not be settable due to the selected decTerminalID resource * correct logic for print-immediate action, and enable corresponding menu entry * add configure option --with-pcre2 * fix a misspelled subsection title in ctlseqs.ms and add a note regarding blink which was rendered as bold in X11R6. Blinking text was implemented in Patch #60. * fix typos in xterm.man * fix typography in xterm.man * fix typo in INSTALL * add xterm-direct terminal description based on changes introduced in patch #277, and relying upon ncurses RGB extension. * modify xterm-new terminal description to use ECMA-48 REP, reflecting its use in xterm since patch #32 (1996). * clarify comment in ctlseqs.ms regarding blink: it has been part of xterm since patch #60 (1998). * update ftp URLs in documentation. OBS-URL: https://build.opensuse.org/request/show/572173 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=151 --- xterm-330.tgz | 3 -- xterm-330.tgz.asc | 8 ---- xterm-331.tgz | 3 ++ xterm-331.tgz.asc | 8 ++++ xterm.changes | 103 ++++++++++++++++++++++++++++++++++++++++++++++ xterm.spec | 30 +++++++------- 6 files changed, 128 insertions(+), 27 deletions(-) delete mode 100644 xterm-330.tgz delete mode 100644 xterm-330.tgz.asc create mode 100644 xterm-331.tgz create mode 100644 xterm-331.tgz.asc diff --git a/xterm-330.tgz b/xterm-330.tgz deleted file mode 100644 index 627ad75..0000000 --- a/xterm-330.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7aeef9f29f6b95e09f481173c8c3053357bf5ffe162585647f690fd1707556df -size 1273183 diff --git a/xterm-330.tgz.asc b/xterm-330.tgz.asc deleted file mode 100644 index 7a4acd3..0000000 --- a/xterm-330.tgz.asc +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) -Comment: See http://invisible-island.net/public/public.html for info - -iEYEABECAAYFAllJyZUACgkQcCNT4Pfkjtt3UwCfbaDPJe/tpjoPH+ES1dexv2VH -v58An2sH6QjTZBt8JkHbQ6nadwdRf2xa -=mO97 ------END PGP SIGNATURE----- diff --git a/xterm-331.tgz b/xterm-331.tgz new file mode 100644 index 0000000..7bc7ab1 --- /dev/null +++ b/xterm-331.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ae856a30fd93046be93952a6898ba47f6f88ad6a988a7c949c4c80d5199ef10 +size 1286312 diff --git a/xterm-331.tgz.asc b/xterm-331.tgz.asc new file mode 100644 index 0000000..e518f0a --- /dev/null +++ b/xterm-331.tgz.asc @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 +Comment: See http://invisible-island.net/public/public.html for info + +iEYEABECAAYFAlpH6iEACgkQcCNT4Pfkjtvn9wCeP5Xn1EhsJYS1GaYR5tcJTqRm +OsAAn2bpiu8CoFwiN88zd858eaviEAM5 +=6VcI +-----END PGP SIGNATURE----- diff --git a/xterm.changes b/xterm.changes index f64f4dc..f32506c 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,106 @@ +------------------------------------------------------------------- +Sat Feb 3 04:26:19 UTC 2018 - avindra@opensuse.org + +- Patch #331 - 2017/12/30 + * add workaround for improper grayscale adjustments made in + FreeType library, exposed by changes to rounding in 2.8.1, + which shows up as a gap in line-drawing characters + * improve a special case where a non-Unicode font's line-drawing + characters were not used, when specifying it via the utf8Fonts + resource. + * replace constant 10msec delay for next X event with new resource + nextEventDelay, and reduce that to 1msec to accommodate faster + machines than used when -hold was implemented in 1999 + * add scroll-to action, which simplifies binding a key to scroll + to the beginning or end of the saved-lines + * add building blocks for alternate screen and/or title-stack + features in the terminfo file. + * improve calculations for cell-data size. + * configure script: enable XHTML/SVG screen dumps by default. + * configure script: enable 256-colors by default. + * update config.guess, config.sub + * configure script: option for --with-man2html to use improved + script by default. + * add case for private mode 1044 in DECRQM, to report the + keepClipboard resource setting and corresponding menu entry. + * fix an inconsistency between private mode 12 (the AT&T 610 + cursor blink) and DECSCUSR: the former relied on having the + cursorBlink resource set initially to enable the escape sequence, + while the latter does not. + * add private modes 13 and 14, as well as resource cursorBlinkXOR + to allow better control over the cursor-blinking state + * modify the html and svg screen dumps to support direct color + * modify media copy (screen-printing) to support the same SGR + codes as DECRQSS, including 88/256 indexed color as well as + direct color. + * improve options-parsing for query-status.pl script. + * modify parsing of SGR direct-color control making color space + identitier optional. The corresponding DECRQSS reply always + returns an empty (default) field for the identifier. + * add wide-attributes to DECRQSS reply for SGR. + * add private mode 1046 to help with scripting applications. + * correct expression used for readline-flags in DECRQM; to test + the current flag rather than information stacked within the + same variable. + * correct typo in ctlseqs.ms reference to ISO-8613-6 + * fix lintian warning for test-package. + * fix typo in DECRQSS for SGR 48, which printed the foreground + value for colors past 15. Also use colon delimiter for codes + 38/48 in response + * improve workaround for Debian #542434 by using the font's + maximum width when no ISO-8859-1 glyphs are provided + * work around a special case of Xft's mismanagement of its + cached data by adding a check before the -report-fonts option + to ensure that it does not use an XftPattern which may have been + freed during a call to XftFontOpenPattern. + * improve manual page description of regex option for onXClicks + resources + * add directColor resource. + * additional manpage macro cleanup + * add optional support for direct-colors + * improve legacy/NRC character set mapping: + + enable alternate NRC set designators for French and French + Canadian, ‘9’ and ‘f’ respectively, as documented in ctlseqs. + (‘9’ is documented for VT510, ‘f’ is a Kermit feature). + + correct the Unicode value in the DEC Technical table to show + capital delta. + + referring to + * http://vt100.net/docs/vt220-rm/table2-3b.html + * http://vt100.net/docs/vt320-uu/appendixe.html + + add entries for the DEC Supplemental Graphics table to display + 0x28/0xa8 as ¤ and 0x5d/0xdd as Ÿ. + referring to + * http://www.vt100.net/charsets/technical.html + * alter the Unicode values used for 0x2b through 0x2c to use + curly braces to work with the “middle” parts displayed with + 0x2f and 0x30. + + modify the VT220 “Supplemental” table, giving a hint that it + was probably meant to be “Supplemental Graphics” and is the + same as VT320's table. + * quiet a few font-warnings when a derived fontname cannot be + opened, overlooked in refactoring of font resources in patch #328 + * correct error response for DECRQSS broken in cleanup of + Coverity reports in patch #288 + * improve DECRPM responses by returning mode not recognized for + modes which may not be settable due to the selected + decTerminalID resource + * correct logic for print-immediate action, and enable + corresponding menu entry + * add configure option --with-pcre2 + * fix a misspelled subsection title in ctlseqs.ms and add a note + regarding blink which was rendered as bold in X11R6. Blinking + text was implemented in Patch #60. + * fix typos in xterm.man + * fix typography in xterm.man + * fix typo in INSTALL + * add xterm-direct terminal description based on changes + introduced in patch #277, and relying upon ncurses RGB extension. + * modify xterm-new terminal description to use ECMA-48 REP, + reflecting its use in xterm since patch #32 (1996). + * clarify comment in ctlseqs.ms regarding blink: it has been + part of xterm since patch #60 (1998). + * update ftp URLs in documentation. + ------------------------------------------------------------------- Fri Nov 10 15:40:46 UTC 2017 - sndirsch@suse.com diff --git a/xterm.spec b/xterm.spec index e3e9c20..aac4b82 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,7 +1,7 @@ # # spec file for package xterm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX 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: 330 +Version: 331 Release: 0 Summary: The basic X terminal program License: MIT @@ -49,16 +49,15 @@ Patch7: xterm-allow_iso-utf_fonts_in_menu.patch Patch8: xterm-decomposed_bitmaps.patch Patch9: xterm-desktop-item-in-gnome-utilities-appfolder.patch BuildRequires: freetype2-devel +BuildRequires: groff BuildRequires: ncurses-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files +Provides: XFree86:%{_prefix}/X11R6/bin/xterm +Provides: xorg-x11:%{_prefix}/X11R6/bin/xterm %if %{splitbin} Requires: %{name}-bin %endif -Provides: XFree86:%{_prefix}/X11R6/bin/xterm -Provides: xorg-x11:%{_prefix}/X11R6/bin/xterm -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: groff -BuildRequires: pkgconfig %if 0%{?suse_version} > 1220 BuildRequires: fontpackages-devel %endif @@ -85,7 +84,7 @@ BuildRequires: xorg-x11-devel Requires: luit %endif %if 0%{?suse_version} > 1220 -%{reconfigure_fonts_prereq} +%reconfigure_fonts_prereq %endif %description @@ -161,18 +160,18 @@ do done %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install mkdir -p %{buildroot}%{xterminfo} install -m 644 terminfo %{buildroot}%{xterminfo}/xterm.terminfo install -m 644 termcap %{buildroot}%{xterminfo}/xterm.termcap pushd "../vttest-%{vttest_version}" -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install popd -install -m 755 $RPM_SOURCE_DIR/luitx %{buildroot}%{_prefix}/bin -install -m 755 $RPM_SOURCE_DIR/Backarrow2Delete %{buildroot}%{_prefix}/bin -install -m 755 $RPM_SOURCE_DIR/Backarrow2BackSpace %{buildroot}%{_prefix}/bin +install -m 755 $RPM_SOURCE_DIR/luitx %{buildroot}%{_bindir} +install -m 755 $RPM_SOURCE_DIR/Backarrow2Delete %{buildroot}%{_bindir} +install -m 755 $RPM_SOURCE_DIR/Backarrow2BackSpace %{buildroot}%{_bindir} install -m 644 $RPM_SOURCE_DIR/README.SUSE . mkdir -p %{buildroot}%{_datadir}/pixmaps @@ -184,17 +183,15 @@ install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/ %suse_update_desktop_file -i xterm TerminalEmulator %if 0%{?suse_version} > 1220 -%{reconfigure_fonts_scriptlets} +%reconfigure_fonts_scriptlets %endif %files -%defattr(-,root,root) %{_datadir}/applications/xterm.desktop %{_datadir}/pixmaps/* %if %{splitbin} %files bin -%defattr(-,root,root) %endif %doc README README.i18n README.SUSE %{_bindir}/vttest @@ -216,6 +213,7 @@ install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/ %dir %{xfontsd}/misc %{xfontsd}/misc/20x20ja.pcf.gz %{xfontsd}/misc/20x20ko.pcf.gz + %if 0%{?suse_version} > 1050 %dir %{xappdefs} %endif