From c5293143d33644542005b2547c9e1b9dfa4bf2a80e2b6c62d53504a7bf933ad6 Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Mon, 5 Jan 2015 13:51:05 +0000 Subject: [PATCH 1/3] Accepting request 267280 from home:dimstar:branches:X11:terminals - Add libX11-devel, libXft-devel and libXrender-devel BuildRequires: the configure script silently disables XRENDERFONT support if the dependencies are missing (boo#911683). - Add an extra check after configure to ensure we do not lose this support accidentally ever again. OBS-URL: https://build.opensuse.org/request/show/267280 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=123 --- xterm.changes | 9 +++++++++ xterm.spec | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xterm.changes b/xterm.changes index 9e48fea..554f001 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 5 13:41:57 UTC 2015 - dimstar@opensuse.org + +- Add libX11-devel, libXft-devel and libXrender-devel + BuildRequires: the configure script silently disables XRENDERFONT + support if the dependencies are missing (boo#911683). +- Add an extra check after configure to ensure we do not lose this + support accidentally ever again. + ------------------------------------------------------------------- Fri Dec 19 12:57:27 UTC 2014 - dimstar@opensuse.org diff --git a/xterm.spec b/xterm.spec index a8d59d9..c2c07f2 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,7 +1,7 @@ # # spec file for package xterm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -70,7 +70,10 @@ BuildRequires: utempter # separate package now BuildRequires: bdftopcf # post xorg libs split +BuildRequires: libX11-devel BuildRequires: libXaw-devel +BuildRequires: libXft-devel +BuildRequires: libXrender-devel %else # case for SLE10 and SLE 11 BuildRequires: xorg-x11 @@ -142,6 +145,8 @@ cd ../vttest-%{vttest_version} --enable-backarrow-is-erase \ --enable-sixel-graphics \ +#ensure we do not lose FreeType support (boo#911683) +grep "#define XRENDERFONT 1" xtermcfg.h make %{?_smp_mflags} pushd "../vttest-%{vttest_version}" From 346ba2ee12b555bbc090b0aa9bc7ecb798a529150768de44ac2bfa3751562f42 Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Mon, 5 Jan 2015 16:33:04 +0000 Subject: [PATCH 2/3] Accepting request 279963 from home:pcerny:factory - Patch #313 - 2014/11/28 * add regisScreenSize resource setting to allow custom screensizes for ReGIS graphics (prompted by discussion with Scott Froebe). * fix some minor issues in manpage (Jens Schweikhardt). * improve ReGIS font-handling (Ross Combs): + remove "random junk" generation for unknown characters + add xterm extension to load user glyphs for alphabet 0 + add xterm extension to specify loading an alphabet from a font by name + fix bug with use of empty alphabet slots which caused slot 0 to be clobbered + update/clarify ReGIS-related comments + add DECprint extension for printing/clearing the screen (only clearing is performed) * improve ReGIS colorspec conversion (Ross Combs): + avoid some floating point math for colorspace conversion + move two copies of colorspec parsing to a single function + change colorspec parsing to handle components being out of order or with spaces and commas between them + add support for an extension where RGB components can be given instead of HLS * improve use of const, e.g., for the LineData pointers (patch by Ross Combs). * clip of graphics that overlap the scrollback buffer and alt screen (patch by Ross Combs). * amend change to focus-change events in patch #287 to limit it to suppressing the reset of the urgency-hint, because some useful FocusOut events were lost (report by Joe Peterson). * modify dpkg build-script to configure xterm-dev as an OBS-URL: https://build.opensuse.org/request/show/279963 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=124 --- xterm-312.tgz | 3 - xterm-313.tgz | 3 + xterm-312.tgz.asc => xterm-313.tgz.asc | 6 +- xterm-decomposed_bitmaps.patch | 2 +- ...op-item-in-gnome-utilities-appfolder.patch | 12 ++-- xterm-double_width_fonts.patch | 2 +- xterm-enable_libtinfo.patch | 2 +- xterm-settings.patch | 2 +- xterm-sigwinch.patch | 2 +- xterm.changes | 55 +++++++++++++++++++ xterm.spec | 4 +- 11 files changed, 77 insertions(+), 16 deletions(-) delete mode 100644 xterm-312.tgz create mode 100644 xterm-313.tgz rename xterm-312.tgz.asc => xterm-313.tgz.asc (61%) diff --git a/xterm-312.tgz b/xterm-312.tgz deleted file mode 100644 index 09debbe..0000000 --- a/xterm-312.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fad48e1b14e564be1ff06d4a18793a2169037748ff456432f15484383485f36e -size 1186265 diff --git a/xterm-313.tgz b/xterm-313.tgz new file mode 100644 index 0000000..2f63492 --- /dev/null +++ b/xterm-313.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d4160e79b71c214f12fefe17b8b05bd33299908d03bf489d73012c53a88c6ee +size 1193145 diff --git a/xterm-312.tgz.asc b/xterm-313.tgz.asc similarity index 61% rename from xterm-312.tgz.asc rename to xterm-313.tgz.asc index a925fb3..36b6fcd 100644 --- a/xterm-312.tgz.asc +++ b/xterm-313.tgz.asc @@ -2,7 +2,7 @@ Version: GnuPG v1.4.10 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEYEABECAAYFAlQoqo8ACgkQcCNT4PfkjtuHigCgv4FremCCjSb3TuaUKuMO8cI+ -AyAAnjdHYVs/B+dx4n0ruXm2zT9jKr8g -=AGQV +iEYEABECAAYFAlR5MpUACgkQcCNT4PfkjtuZwACffkAr6RKkzVLzFiqHRtjkVAvC +xekAn3HEciSKiaOgLl5fTug0OQmk6YVu +=EdV4 -----END PGP SIGNATURE----- diff --git a/xterm-decomposed_bitmaps.patch b/xterm-decomposed_bitmaps.patch index 48fdd68..012600b 100644 --- a/xterm-decomposed_bitmaps.patch +++ b/xterm-decomposed_bitmaps.patch @@ -21,7 +21,7 @@ Signed-off-by: Egbert Eich diff --git a/misc.c b/misc.c --- a/misc.c +++ b/misc.c -@@ -2218,16 +2218,18 @@ ReportAnsiColorRequest(XtermWidget xw, i +@@ -2213,16 +2213,18 @@ ReportAnsiColorRequest(XtermWidget xw, i } static void diff --git a/xterm-desktop-item-in-gnome-utilities-appfolder.patch b/xterm-desktop-item-in-gnome-utilities-appfolder.patch index f2dceda..afced08 100644 --- a/xterm-desktop-item-in-gnome-utilities-appfolder.patch +++ b/xterm-desktop-item-in-gnome-utilities-appfolder.patch @@ -1,11 +1,15 @@ Group the desktop file into the Utilities folder in the GNOME shell application overview. -diff --git a/xterm.desktop.old b/xterm.desktop -index ea23c9b..5381d02 100644 ---- a/xterm.desktop.old +diff --git a/xterm.desktop b/xterm.desktop +--- a/xterm.desktop +++ b/xterm.desktop -@@ -39,4 +39,4 @@ Terminal=false +@@ -34,9 +34,9 @@ + Name=XTerm + #GenericName=Terminal + Comment=standard terminal emulator for the X window system + Exec=xterm + Terminal=false Type=Application Encoding=UTF-8 Icon=terminal diff --git a/xterm-double_width_fonts.patch b/xterm-double_width_fonts.patch index 5699a8c..98ebbe8 100644 --- 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 -@@ -702,77 +702,29 @@ is_double_width_font(XFontStruct *fs) +@@ -690,77 +690,29 @@ is_double_width_font(XFontStruct *fs) { return ((2 * fs->min_bounds.width) == fs->max_bounds.width); } diff --git a/xterm-enable_libtinfo.patch b/xterm-enable_libtinfo.patch index 5387c71..239933a 100644 --- a/xterm-enable_libtinfo.patch +++ b/xterm-enable_libtinfo.patch @@ -29,7 +29,7 @@ diff --git a/aclocal.m4 b/aclocal.m4 diff --git a/configure b/configure --- a/configure +++ b/configure -@@ -5587,20 +5587,20 @@ echo "$as_me:5586: checking for $cf_test +@@ -5599,20 +5599,20 @@ echo "$as_me:5598: 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 diff --git a/xterm-settings.patch b/xterm-settings.patch index 5c4c5ce..c7cd384 100644 --- a/xterm-settings.patch +++ b/xterm-settings.patch @@ -284,7 +284,7 @@ diff --git a/XTerm.ad b/XTerm.ad diff --git a/xterm.man b/xterm.man --- a/xterm.man +++ b/xterm.man -@@ -4144,19 +4144,23 @@ This option specifies the font to be use +@@ -4157,19 +4157,23 @@ This option specifies the font to be use in the \*(``OverTheSpot\*('' input method. .IP In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion) diff --git a/xterm-sigwinch.patch b/xterm-sigwinch.patch index 57b99df..9206816 100644 --- a/xterm-sigwinch.patch +++ b/xterm-sigwinch.patch @@ -1,7 +1,7 @@ diff --git a/screen.c b/screen.c --- a/screen.c +++ b/screen.c -@@ -2249,17 +2249,17 @@ ScreenResize(XtermWidget xw, +@@ -2246,17 +2246,17 @@ ScreenResize(XtermWidget xw, #ifdef USE_STRUCT_WINSIZE ts.ws_xpixel = (ttySize_t) width; ts.ws_ypixel = (ttySize_t) height; diff --git a/xterm.changes b/xterm.changes index 554f001..cedc130 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Mon Jan 5 15:57:44 UTC 2015 - pcerny@suse.com + +- Patch #313 - 2014/11/28 + * add regisScreenSize resource setting to allow custom + screensizes for ReGIS graphics (prompted by discussion with + Scott Froebe). + * fix some minor issues in manpage (Jens Schweikhardt). + * improve ReGIS font-handling (Ross Combs): + + remove "random junk" generation for unknown characters + + add xterm extension to load user glyphs for alphabet 0 + + add xterm extension to specify loading an alphabet from a + font by name + + fix bug with use of empty alphabet slots which caused slot + 0 to be clobbered + + update/clarify ReGIS-related comments + + add DECprint extension for printing/clearing the screen + (only clearing is performed) + * improve ReGIS colorspec conversion (Ross Combs): + + avoid some floating point math for colorspace conversion + + move two copies of colorspec parsing to a single function + + change colorspec parsing to handle components being out of + order or with spaces and commas between them + + add support for an extension where RGB components can be + given instead of HLS + * improve use of const, e.g., for the LineData pointers (patch + by Ross Combs). + * clip of graphics that overlap the scrollback buffer and alt + screen (patch by Ross Combs). + * amend change to focus-change events in patch #287 to limit it + to suppressing the reset of the urgency-hint, because some + useful FocusOut events were lost (report by Joe Peterson). + * modify dpkg build-script to configure xterm-dev as an + x-terminal-emulator alternative. + * extend the --with-xterm-symlink feature to make symbolic + links for the other programs and scripts. + * minor fix to vttests/resize.pl to avoid undefined variable + when receiving broken/missing response, e.g., from mrxvt. + * change the way that ReGIS graphics are refreshed (patch by + Ross Combs): + + it pre-composes any overlapping graphics to avoid + unnecessary and flickering draws + + it adds a three-dimensional lookup table for RGB -> pixel + values and uses this across all graphics + + it draws in line segments when there is a run of the same + color + + in cases where there are no transparent parts, it uses an + XImage to draw + + it hooks into the double-buffering support if it is + enabled (though this doesn't seem to get rid of all + flicker). + * This has the effect of reducing flicker and speeding up + redraws. + - fix build for SLE 10 + ------------------------------------------------------------------- Mon Jan 5 13:41:57 UTC 2015 - dimstar@opensuse.org diff --git a/xterm.spec b/xterm.spec index c2c07f2..bc1bd36 100644 --- a/xterm.spec +++ b/xterm.spec @@ -19,7 +19,7 @@ %define vttest_version 20120506 %define splitbin 0%{?suse_version} >= 1300 Name: xterm -Version: 312 +Version: 313 Release: 0 Summary: The basic X terminal program License: MIT @@ -216,7 +216,9 @@ 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 %{xappdefs}/KOI8RXTerm %{xappdefs}/KOI8RXTerm-color %{xappdefs}/UXTerm From 3a6ab9a44b4137624006445f39554a0fcb3a6d1d0b6270c5ee179ecd2d8d7fd5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 6 Jan 2015 10:42:13 +0000 Subject: [PATCH 3/3] Accepting request 279959 from home:pcerny:factory - Patch #313 - 2014/11/28 * add regisScreenSize resource setting to allow custom screensizes for ReGIS graphics (prompted by discussion with Scott Froebe). * fix some minor issues in manpage (Jens Schweikhardt). * improve ReGIS font-handling (Ross Combs): + remove "random junk" generation for unknown characters + add xterm extension to load user glyphs for alphabet 0 + add xterm extension to specify loading an alphabet from a font by name + fix bug with use of empty alphabet slots which caused slot 0 to be clobbered + update/clarify ReGIS-related comments + add DECprint extension for printing/clearing the screen (only clearing is performed) * improve ReGIS colorspec conversion (Ross Combs): + avoid some floating point math for colorspace conversion + move two copies of colorspec parsing to a single function + change colorspec parsing to handle components being out of order or with spaces and commas between them + add support for an extension where RGB components can be given instead of HLS * improve use of const, e.g., for the LineData pointers (patch by Ross Combs). * clip of graphics that overlap the scrollback buffer and alt screen (patch by Ross Combs). * amend change to focus-change events in patch #287 to limit it to suppressing the reset of the urgency-hint, because some useful FocusOut events were lost (report by Joe Peterson). * modify dpkg build-script to configure xterm-dev as an OBS-URL: https://build.opensuse.org/request/show/279959 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=125 --- xterm.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/xterm.changes b/xterm.changes index cedc130..a67c977 100644 --- a/xterm.changes +++ b/xterm.changes @@ -51,7 +51,6 @@ Mon Jan 5 15:57:44 UTC 2015 - pcerny@suse.com flicker). * This has the effect of reducing flicker and speeding up redraws. - - fix build for SLE 10 ------------------------------------------------------------------- Mon Jan 5 13:41:57 UTC 2015 - dimstar@opensuse.org