pool/xterm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 862971 from home:avindra:branches:X11:terminals

Browse Source 
Renamed merged patch and documented sources

OBS-URL: https://build.opensuse.org/request/show/862971
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=191
This commit is contained in:
Marcus Meissner 2021-01-25 10:12:45 +00:00 committed by Git OBS Bridge
parent a993a8fbaa
commit 1d4685e5a7
9 changed files with 141 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xterm-359.tgz
View File

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

7
xterm-359.tgz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Comment: See https://invisible-island.net/public/public.html for info
iF0EABECAB0WIQTFIEjAwHSP7iJ9R6JwI1Pg9+SO2wUCXzsLwAAKCRBwI1Pg9+SO
28/cAKC9FwMpUI+4C/Qg9RrI1E0B+pZIUQCcCb7m3tR7O96jRptgOq6DrLDd+0U=
=bM4K
-----END PGP SIGNATURE-----

3
xterm-363.tgz Normal file
View File

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

7
xterm-363.tgz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Comment: See https://invisible-island.net/public/public.html for info
iF0EABECAB0WIQTFIEjAwHSP7iJ9R6JwI1Pg9+SO2wUCX+eSWgAKCRBwI1Pg9+SO
2+5HAJ9JZY89nEwXGrk2vlpPYMCJ122hNgCffsUykuG97iTBKO1oRQ1aIKY+zsM=
=vzc8
-----END PGP SIGNATURE-----

29
xterm-better-fonts.patch
View File

@ -1,29 +0,0 @@
# 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
-*VT100.font: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1
-*VT100.wideFont: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1
-*VT100.wideBoldFont: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1
+*VT100*font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100*boldfont: -misc-fixed-bold-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100*wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
*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

20
xterm-sigwinch.patch
View File

@ -2,24 +2,14 @@
# Parent 547d2ea5029c2c3edd129a9d23e424877c6f29f0
diff --git a/screen.c b/screen.c
index 6fb6b3b..238591f 100644
--- a/screen.c
+++ b/screen.c
@@ -2229,17 +2229,17 @@ ScreenResize(XtermWidget xw,
XConfigureWindow(XtDisplay(xw), screen->iconVwin.window,
CWWidth | CWHeight | CWBorderWidth, &changes);
}
#endif /* NO_ACTIVE_ICON */
@@ -2330,7 +2330,7 @@ ScreenResize(XtermWidget xw,
#ifdef TTYSIZE_STRUCT
update_winsize(screen->respond, rows, cols, height, width);
if (update_winsize(screen->respond, rows, cols, height, width) == 0) {
-#if defined(SIGWINCH) && defined(TIOCGPGRP)
+#if defined(SIGWINCH) && (defined(TIOCGPGRP) || defined(linux))
if (screen->pid > 1) {
int pgrp;
TRACE(("getting process-group\n"));
if (ioctl(screen->respond, TIOCGPGRP, &pgrp) != -1) {
TRACE(("sending SIGWINCH to process group %d\n", pgrp));
kill_process_group(pgrp, SIGWINCH);
}
if (screen->pid > 1) {
int pgrp;

113
xterm-settings.patch → xterm-suse.patch
View File

@ -1,16 +1,13 @@
# HG changeset patch
# Parent c7753810ca3026190c5da0536ecf86e9b13800d3
# from c7753810ca3026190c5da0536ecf86e9b13800d3
# various distribution configuration tweaks
# from 7ecf75281e09a29875b61f38bb66920529368050:
# improve display of chinese letters (bsc#1089049)
diff --git a/UXTerm.ad b/UXTerm.ad
--- a/UXTerm.ad
diff --git a/UXTerm.ad.1 b/UXTerm.ad
index 0eac2dd..2ba471d 100644
--- a/UXTerm.ad.1
+++ b/UXTerm.ad
@@ -30,21 +30,31 @@
! sale, use or other dealings in this Software without prior written
! authorization.
! -----------------------------------------------------------------------------
! Use
! xterm -class UXTerm
@@ -35,10 +35,20 @@
! to set resources for UTF-8 mode with corresponding fonts.
! See the uxterm script for an example.
@ -20,7 +17,6 @@ diff --git a/UXTerm.ad b/UXTerm.ad
*fontMenu.Label: Unicode Fonts
*VT100.utf8: 1
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
+*locale: true
+
@ -29,20 +25,10 @@ diff --git a/UXTerm.ad b/UXTerm.ad
+! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930):
+*ximFont: fixed
+
! This includes "XTerm-color" which includes "XTerm", which defines fonts.
! Why set them here?
!
! Here is a simple description. A technically precise one would be very long.
! When xterm starts up, it uses the
!
! *VT100.font
!
@@ -55,22 +65,39 @@
!
! to obtain a wide font. A "wide" font has more than 256 glyphs. Typical
! wide fonts have 10,000 glyphs. If the original "*VT100.font" is not wide,
! and xterm can load the *VT100.utf8Fonts.font, it will use that.
!
@@ -60,13 +70,28 @@
! Making the wide fonts associated with *VT100.font in this file allows uxterm
! to skip that step. It will use the fonts that the XTerm file gives for the
! *VT100.uft8Fonts.font pattern.
@ -52,11 +38,11 @@ diff --git a/UXTerm.ad b/UXTerm.ad
-*VT100.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-*VT100.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
+
-*VT100.font7: -adobe-courier-medium-r-normal--24-240-75-75-m-150-iso10646-1
+*VT100.fontMenu*fontdefault*Label: Default
+*VT100.font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100.wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
+
+
+*fontMenu*font1.Label: efont 10 pixel
+*VT100.font1: -efont-fixed-medium-r-normal--10-100-75-75-c-50-iso10646-1
+*VT100.wideFont1: -efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1
@ -78,11 +64,6 @@ diff --git a/UXTerm.ad b/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
!*VT100.font: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
!*VT100.font3: -efont-biwidth-medium-r-normal--12-120-75-75-p-60-iso10646-1
!*VT100.font4: -efont-biwidth-medium-r-normal--14-140-75-75-p-70-iso10646-1
!*VT100.font5: -efont-biwidth-medium-r-normal--16-160-75-75-p-80-iso10646-1
!*VT100.font6: -efont-biwidth-medium-r-normal--24-240-75-75-p-120-iso10646-1
diff --git a/XTerm-col.ad b/XTerm-col.ad
--- a/XTerm-col.ad
+++ b/XTerm-col.ad
@ -115,15 +96,11 @@ diff --git a/XTerm-col.ad b/XTerm-col.ad
!
! The choice for color4 and color12 is a tradeoff between contrast, depending
! on whether they are used for text or backgrounds. Note that either color4 or
diff --git a/XTerm.ad b/XTerm.ad
--- a/XTerm.ad
diff --git a/XTerm.ad.1 b/XTerm.ad
index dd6ef52..69aac16 100644
--- a/XTerm.ad.1
+++ b/XTerm.ad
@@ -100,31 +100,57 @@
*vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines
*vtMenu*tekshow*Label: Show Tek Window
*vtMenu*tekmode*Label: Switch to Tek Mode
*vtMenu*vthide*Label: Hide VT Window
*vtMenu*altscreen*Label: Show Alternate Screen
@@ -105,21 +105,37 @@
*vtMenu*sixelScrolling*Label: Sixel Scrolling
*vtMenu*privateColorRegisters*Label: Private Color Registers
@ -140,55 +117,35 @@ diff --git a/XTerm.ad b/XTerm.ad
*fontMenu*fontdefault*Label: Default
-*fontMenu*font1*Label: Unreadable
-*VT100.font1: nil2
+*VT100.font: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1
+*VT100.wideFont: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1
+*VT100.wideBoldFont: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1
+*VT100*font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100*boldfont: -misc-fixed-bold-r-normal-*-18-120-100-100-c-90-iso10646-1
+*VT100*wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1
+
+*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:
+*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
*IconFont: nil2
*fontMenu*font2*Label: Tiny
-*VT100.font2: 5x7
+!*VT100.font2: 5x7
+*VT100.font2: -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
+!*VT100.widefont2:
+*VT100.font2: -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
*fontMenu*font3*Label: Small
-*VT100.font3: 6x10
+!*VT100.font3: 6x10
+*VT100.font3: -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
+!*VT100.wideFont3:
+*VT100.font3: -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
*fontMenu*font4*Label: Medium
-*VT100.font4: 7x13
+!*VT100.font4: 7x13
+*VT100.font4: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1
+*VT100.wideFont4: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1
+*VT100.font4: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1
+*VT100.wideFont4: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1
*fontMenu*font5*Label: Large
-*VT100.font5: 9x15
+!*VT100.font5: 9x15
+*VT100.font5: -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
+!*VT100.wideFont5:
+*VT100.font5: -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
*fontMenu*font6*Label: Huge
-*VT100.font6: 10x20
+!*VT100.font6: 10x20
+*VT100.font6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-100-iso10646-1
+*VT100.wideFont6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-200-iso10646-1
*fontMenu*fontescape*Label: Escape Sequence
*fontMenu*fontsel*Label: Selection
!fontescape and fontsel overridden by application
*fontMenu*allow-bold-fonts*Label: Bold Fonts
*fontMenu*font-linedrawing*Label: Line-Drawing Characters
*fontMenu*font-doublesize*Label: Doublesized Characters
*fontMenu*font-loadable*Label: VT220 Soft Fonts
*fontMenu*font-packed*Label: Packed Font
@@ -237,16 +263,70 @@
!*faceSize: 8
! 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
!
+*VT100.font6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-100-iso10646-1
+*VT100.wideFont6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-200-iso10646-1
*fontMenu*font7*Label: Enormous
!*VT100.font7: 12x24
*VT100.font7: -adobe-courier-medium-r-normal--24-240-75-75-m-150-iso10646-1
@@ -252,6 +268,59 @@
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
@ -244,16 +201,10 @@ diff --git a/XTerm.ad b/XTerm.ad
+*charClass: 33:48,37:48,43:48,45-47:48,64:48,126:48,95:48
+!! Bug #52655
+*utf8Title: true
+
+
! 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.
!
! In addition, xterm recognizes several escape sequences which can be used to
! set fonts, window properties, return settings via escape sequences. Some
! find these useful; others are concerned with the possibility of unexpected
! inputs.
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man

89
xterm.changes
View File

@ -1,3 +1,92 @@
-------------------------------------------------------------------
Tue Jan 12 02:57:05 UTC 2021 - Avindra Goolcharan <avindra@opensuse.org>
- Update to Patch#363 - 2020/12/26
* disable groff hyphenation in generated html when using man2html.
* change SCS “&4” Cyrillic to non-NRCS, per VT520 manual.
* amend fix for SCS in patch #198 to remove DEL rather than converting
it to a space (report by Thomas Wolff).
* modify state transitions for selecting character sets to eliminate
an ambiguity between the “A” used in VT220 versus VT320.
improve error recovery when selecting characters by resetting to US
ASCII when no suitable encoding is found, e.g., attempting to use
an NRCS sequence when NRCS is not enabled.
* turn off hyphenation in “.txt” conversion, prompted by groff changes.
* add VT5xx ISO Latin-2 (prompted by discussion with Thomas Wolff).
* amend change from patch #361 to event-handling in CopyWait to handle
active-icon as a special case (Debian #975687).
* add call to loadColorTable to get the visual information needed to
decode BE RGBA32 color format (patch by Leandro Lupori).
* modify the resource-parsing for disallowedPasteControls and similar
lists of names/numbers to recognize “~;” (tilde) for cancelling a given name/number.
* add ENQ, EOT and NUL to default for disallowedPasteControls.
* change default for disallowedPasteControls to omit the tab character
(suggested by Harald Dunkel).
* fix swapped height/width in regisScreenSize and maxGraphicSize resources
using "auto" value, from patch #314 (report by Anton Lavrentiev)
* revise patch #362 change for shift-modifier versus mouse protocol
and select/paste by adding resource shiftEscape, which can be enabled
via a control sequence (prompted by discussion with Matthijs van Duin).
* simplify/improve ifdef in trace code for using a separate set of files
for each run of xterm.
* add options -r and -t to vttests/query-color.pl to show the 6-digit
RGB code and actual colors.
* add nel to xterm-basic terminfo.
* alter vttests/modify-keys.pl to omit HTML reference links to the
modified-keys table where no keycode was available.
- includes Patch #361 - 2020/10/14
* treat the return value of strerror as readonly (patch by Philipp
Klaus Krause).
* modify event-handling in CopyWait to work around hanging while writing
large amounts of text to an active icon and at the same time iconifying/
deiconifying (report by Dave Kemper).
* initialize double-buffer for active-icon window.
* improve manual page description of scrollbar resources (report by Brian Lindholm).
correct ifdef for menu entry for active-icon, when initializing
it with toolbar configuration.
* add preprocessor option to makefile to set internal definition of
pixmaps directory to match the install-configuration (FreeBSD #250036)
* cleanup of calls to free, removing checks for null (Walter Harms)
* add fallback actions pointer-button and pointer-motion which handle
events for the mouse control-sequences protocol if the select-related
translations are omitted with *omitTranslation:select (prompted by
discussion with "Ergus")
* amend rule for using shift-key to override mouse-protocol for select/
paste to limit that feature to mouse-buttons which are actually
bound to select/paste actions (prompted by discussion with "Ergus").
* corrected mapping in special case for repainting wrap-marks when viewing
the scrollback area.
* use separate GCs for showWrapMarks feature, to work around cursor
coloring change in patch #345 (report by Paulo Silva de Alíbano).
- includes Patch #360 - 2020/09/20
* mention decGraphicsID in ctlseqs.ms (suggested by Thomas Wolff).
* modify pixel-coordinate mouse reponse to use as origin the VT100-
window rather than the underlying widget, which includes the scrollbar (report by Thomas Wolff).
* add configure option --disable-print-graphics (Ross Combs).
* add test_ptydata to “make check” rule.
* minor fixes for ctlseqs.ms (report by Jean-Marc Bourguet).
* minor fixes for manpage style (report/patch by "a1346054").
* correct cleanup from switch between italics/normal font in the show/
hide cursor functions (report/testcase by Peter Fabinski)
* integrated patch by Ross Combs:
internal renaming of GraphicsID symbols, for readability.
adjust logic for VT125, treating it as a ReGIS terminal.
* update configure macros, for compiler-warning fixes.
* integrated patch by Ross Combs:
add control sequence modes for graphics printing.
improve conversion to bitmaps for TrueType fonts in ReGIS
add font7 resource, for an “enormous” bitmap font.
do not reset graphics in a soft-reset.
add pointerFont resource, and -pf command-line option.
* improve typography of manual page (patch by Branden Robinson).
* amend patch #359 change to df-install.in to ignore a command-line
assignment to DESTDIR if followed by an explicit --dir (report by Sven Joachim)
- merged 2 patches to form xterm-suse.patch
- remove xterm-settings.patch
- remove xterm-better-fonts.patch
- rebase xterm-sigwinch.patch
- cleanup spec
-------------------------------------------------------------------
Tue Sep 15 21:25:08 UTC 2020 - Dirk Mueller <dmueller@suse.com>

21
xterm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xterm
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# 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 splitbin 0%{?suse_version} >= 1300
Name: xterm
Version: 359
Version: 363
Release: 0
Summary: The basic X terminal program
License: MIT
@ -37,7 +37,7 @@ Source9: 20x20ko.bdf.bz2
Source11: xterm.keyring
# Snoop for the escape sequence assignment of the keypad
Source20: snooper.tar.bz2
Patch1: xterm-settings.patch
Patch1: xterm-suse.patch
Patch2: xterm-sigwinch.patch
Patch3: xterm-double_width_fonts.patch
Patch4: xterm-desktop_file_icon.patch
@ -46,7 +46,6 @@ Patch6: xterm-enable_libtinfo.patch
Patch7: xterm-allow_iso-utf_fonts_in_menu.patch
Patch8: xterm-decomposed_bitmaps.patch
Patch9: xterm-desktop-item-in-gnome-utilities-appfolder.patch
Patch10: xterm-better-fonts.patch
BuildRequires: groff
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
@ -85,17 +84,7 @@ Group: System/X11/Utilities
This package contains the basic X.Org terminal program.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%autosetup -p1
cp -t . %{SOURCE8} %{SOURCE9}
bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}}
@ -120,7 +109,7 @@ bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}}
#ensure we do not lose FreeType support (boo#911683)
grep "#define XRENDERFONT 1" xtermcfg.h
make %{?_smp_mflags}
%make_build
if ! which bdftopcf &> /dev/null; then exit 1; fi
for i in *.bdf