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

Accepting request 176959 from X11:terminals

Browse Source 
- Patch #293 - 2013/05/27
  * modify sample xterm.spec to use newer icon
  * add configure option --with-icon-symlink to work around
    systems which map icon requests for to a single "xterm" icon,
    but neglect to install the icon needed for window decorations
    (report by H Merijn Brand).
  * improve parameterizing of sample xterm.spec
  * amend fix for printer from patch #280, removing a reset of the
    signal handler for SIGCHLD (report by Joe Julian).
  * set environment variable XTERM_FILTER if a locale-filter is
    used.
  * enable DEBUG logic when --enable-trace configure option is
    given.
  * improve description of initialFont, set-vt-font and
    set-tex-text in manpage (Debian #707899).
  * fix regression from patch #292; selecting a word that ended at
    the right margin without wrapping would not select the last
    cell (report by Christian Weisgerber).

- cleanup of spec file and patches

OBS-URL: https://build.opensuse.org/request/show/176959
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=74
This commit is contained in:
Stephan Kulow 2013-06-05 11:25:08 +00:00 committed by Git OBS Bridge
commit 4324cb0aad
18 changed files with 334 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bugzilla-293793-do-not-insist-on-iso8859-fonts-for-the-menu.patch
View File

@ -1,13 +0,0 @@
Index: xterm-242/XTerm.ad
===================================================================
--- xterm-242.orig/XTerm.ad
+++ xterm-242/XTerm.ad
@@ -3,7 +3,7 @@
*saveLines: 1024
*SimpleMenu*BackingStore: NotUseful
-*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
+*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso*-*
*SimpleMenu*menuLabel.vertSpace: 100
*SimpleMenu*HorizontalMargins: 16
*SimpleMenu*Sme.height: 16

11
desktop.diff
View File

@ -1,11 +0,0 @@
Index: xterm.desktop
===================================================================
--- xterm.desktop.orig
+++ xterm.desktop
@@ -37,5 +37,5 @@ Exec=xterm
Terminal=false
Type=Application
Encoding=UTF-8
-Icon=xterm-color_48x48
+Icon=terminal
Categories=System;TerminalEmulator;

30
libtinfo.diff
View File

@ -1,30 +0,0 @@
--- aclocal.m4
+++ aclocal.m4 2011-11-17 09:31:16.663145702 +0000
@@ -621,10 +621,10 @@ AC_CACHE_CHECK(for $cf_test_message func
cf_save_LIBS="$LIBS"
cf_cv_lib_tgetent=no
if test "$cf_full_tgetent" = yes ; then
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
cf_TERMTST="buffer[[0]] == 0"
else
- cf_TERMLIB="termlib ncurses curses"
+ cf_TERMLIB="termlib tinfo ncurses curses"
cf_TERMTST="0"
fi
for cf_termlib in '' $cf_TERMLIB ; do
--- configure
+++ configure 2011-11-17 09:47:29.795646131 +0000
@@ -5600,10 +5600,10 @@ else
cf_save_LIBS="$LIBS"
cf_cv_lib_tgetent=no
if test "$cf_full_tgetent" = yes ; then
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
cf_TERMTST="buffer[0] == 0"
else
- cf_TERMLIB="termlib ncurses curses"
+ cf_TERMLIB="termlib tinfo ncurses curses"
cf_TERMTST="0"
fi
for cf_termlib in '' $cf_TERMLIB ; do

13
p_xterm-sigwinch.diff
View File

@ -1,13 +0,0 @@
Index: screen.c
===================================================================
--- screen.c.orig
+++ screen.c
@@ -2056,7 +2056,7 @@ ScreenResize(XtermWidget xw,
TRACE(("return %d from SET_TTYSIZE %dx%d\n", code, rows, cols));
(void) code;
-#if defined(SIGWINCH) && defined(TIOCGPGRP)
+#if defined(SIGWINCH) && (defined(TIOCGPGRP) || defined(linux))
if (screen->pid > 1) {
int pgrp;

15
config-guess-sub-update.patch → vttest-config_update_aarch64.patch
View File

@ -1,7 +1,7 @@
Index: config.guess
===================================================================
--- config.guess.orig
+++ config.guess
# provide aarch64 recognition to autotools scripts
diff --git a/config.guess b/config.guess
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,14 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@ -627,10 +627,9 @@ Index: config.guess
#endif
#endif
Index: config.sub
===================================================================
--- config.sub.orig
+++ config.sub
diff --git a/config.sub b/config.sub
--- a/config.sub
+++ b/config.sub
@@ -1,38 +1,33 @@
#! /bin/sh
# Configuration validation subroutine script.

3
xterm-292.tgz
View File

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

3
xterm-293.tgz Normal file
View File

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

6
xterm-292.tgz.asc → xterm-293.tgz.asc
View File

@ -2,7 +2,7 @@
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlF5tBgACgkQcCNT4PfkjtvEUACdGusQLrmdlJXHA+V6AR1nmSlu
JHcAoJ+5+742ye0SrwAuxISk4x2zXktW
=5FRd
iEYEABECAAYFAlGj9JkACgkQcCNT4PfkjtsO2gCg17jv2J3vxXRAIsL4iyeB52vn
hywAoMAv8PvBHnkO+vCuq2KeUXMx96ZO
=suhg
-----END PGP SIGNATURE-----

24
xterm-allow_iso-utf_fonts_in_menu.patch Normal file
View File

@ -0,0 +1,24 @@
# allow UTF-8 fonts (iso-10464) as well
diff --git a/XTerm.ad b/XTerm.ad
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -29,17 +29,17 @@
! holders shall not be used in advertising or otherwise to promote the
! sale, use or other dealings in this Software without prior written
! authorization.
! -----------------------------------------------------------------------------
*saveLines: 1024
*SimpleMenu*BackingStore: NotUseful
-*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
+*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso*-*
*SimpleMenu*menuLabel.vertSpace: 100
*SimpleMenu*HorizontalMargins: 16
*SimpleMenu*Sme.height: 16
*SimpleMenu*Cursor: left_ptr
*mainMenu.Label: Main Options
*mainMenu*toolbar*Label: Toolbar

17
xterm-desktop_file_icon.patch Normal file
View File

@ -0,0 +1,17 @@
# use system stock icon for XTerm
diff --git a/xterm.desktop b/xterm.desktop
--- a/xterm.desktop
+++ b/xterm.desktop
@@ -33,10 +33,10 @@
[Desktop Entry]
Name=XTerm
#GenericName=Terminal
Comment=standard terminal emulator for the X window system
Exec=xterm
Terminal=false
Type=Application
Encoding=UTF-8
-Icon=xterm-color_48x48
+Icon=terminal
Categories=System;TerminalEmulator;

29
xterm-disallow-window-and-fonts-ops.patch
View File

@ -1,29 +0,0 @@
Index: XTerm.ad
===================================================================
--- XTerm.ad.orig
+++ XTerm.ad
@@ -263,6 +263,11 @@
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+! Security: Disallow operations that might allow raw text being pasted to xterm to
+! execute code.
+*allowWindowOps: false
+*allowFontOps: false
+
!! We want a 8bit clean xterm
*eightBitInput: true
*eightBitOutput: true
Index: xterm.man
===================================================================
--- xterm.man.orig
+++ xterm.man
@@ -1707,7 +1707,7 @@ The default is \*(``true\*(''.
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
-The default is \*(``true\*(''.
+The default is \*(``false\*(''.
.TP 5
.B "allowPasteControls (\fPclass\fB AllowPasteControls)"
If true, allow control characters such as BEL and CAN to be pasted.

15
bug-246573-tentative-patch.diff → xterm-double_width_fonts.patch
View File

@ -1,8 +1,7 @@
--- xterm-275/fontutils.c 2011-09-11 15:22:34.000000000 +0200
+++ xterm-275/fontutils.c 2011-09-29 16:49:57.899419068 +0200
@@ -631,81 +631,33 @@ is_fixed_font(XFontStruct * fs)
static int
is_double_width_font(XFontStruct * fs)
diff --git a/fontutils.c b/fontutils.c
--- a/fontutils.c
+++ b/fontutils.c
@@ -636,77 +636,29 @@ is_double_width_font(XFontStruct * fs)
{
return ((2 * fs->min_bounds.width) == fs->max_bounds.width);
}
@ -12,13 +11,13 @@
#if OPT_WIDE_CHARS && OPT_RENDERFONT && defined(HAVE_TYPE_FCCHAR32)
-#define HALF_WIDTH_TEST_STRING "1234567890"
-
-/* '1234567890' in Chinese characters in UTF-8 */
-#define FULL_WIDTH_TEST_STRING "\xe4\xb8\x80\xe4\xba\x8c\xe4\xb8\x89" \
- "\xe5\x9b\x9b\xe4\xba\x94" \
- "\xef\xa7\x91\xe4\xb8\x83\xe5\x85\xab" \
- "\xe4\xb9\x9d\xef\xa6\xb2"
-
-/* '1234567890' in Korean script in UTF-8 */
-#define FULL_WIDTH_TEST_STRING2 "\xec\x9d\xbc\xec\x9d\xb4\xec\x82\xbc" \
- "\xec\x82\xac\xec\x98\xa4" \
@ -85,5 +84,3 @@
#define EmptyFont(fs) (fs != 0 \
&& ((fs)->ascent + (fs)->descent == 0 \
|| (fs)->max_bounds.width == 0))
#define FontSize(fs) (((fs)->ascent + (fs)->descent) \

54
xterm-enable_libtinfo.patch Normal file
View File

@ -0,0 +1,54 @@
# check for libtinfo before falling back to ncurses
diff --git a/aclocal.m4 b/aclocal.m4
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -743,20 +743,20 @@ if test "$cf_full_tgetent" = yes ; then
else
cf_test_message="tgetent"
fi
AC_CACHE_CHECK(for $cf_test_message function,cf_cv_lib_tgetent,[
cf_save_LIBS="$LIBS"
cf_cv_lib_tgetent=no
if test "$cf_full_tgetent" = yes ; then
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
cf_TERMTST="buffer[[0]] == 0"
else
- cf_TERMLIB="termlib ncurses curses"
+ cf_TERMLIB="termlib tinfo ncurses curses"
cf_TERMTST="0"
fi
for cf_termlib in '' $cf_TERMLIB ; do
LIBS="$cf_save_LIBS"
test -n "$cf_termlib" && CF_ADD_LIB($cf_termlib)
AC_TRY_RUN([
/* terminfo implementations ignore the buffer argument, making it useless for
* the xterm application, which uses this information to make a new TERMCAP
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5579,20 +5579,20 @@ echo "$as_me:5578: 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
else
cf_save_LIBS="$LIBS"
cf_cv_lib_tgetent=no
if test "$cf_full_tgetent" = yes ; then
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
cf_TERMTST="buffer[0] == 0"
else
- cf_TERMLIB="termlib ncurses curses"
+ cf_TERMLIB="termlib tinfo ncurses curses"
cf_TERMTST="0"
fi
for cf_termlib in '' $cf_TERMLIB ; do
LIBS="$cf_save_LIBS"
test -n "$cf_termlib" && LIBS="-l$cf_termlib $LIBS"
if test "$cross_compiling" = yes; then
echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
else

49
xterm-forbid_window_and_font_ops.patch Normal file
View File

@ -0,0 +1,49 @@
# forbid dangerous escape sequences (font loading)
diff --git a/XTerm.ad b/XTerm.ad
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -258,16 +258,21 @@
!*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
!
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+! Security: Disallow operations that might allow raw text being pasted to xterm to
+! execute code.
+*allowWindowOps: false
+*allowFontOps: false
+
!! We want a 8bit clean xterm
*eightBitInput: true
*eightBitOutput: true
!! Default Settings
*termName: xterm
*pointerShape: top_left_arrow
*scrollKey: true
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -1702,17 +1702,17 @@ The default is \*(``false\*(''.
.TP
.B "allowColorOps (\fPclass\fB AllowColorOps)"
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
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
-The default is \*(``true\*(''.
+The default is \*(``false\*(''.
.TP 5
.B "allowPasteControls (\fPclass\fB AllowPasteControls)"
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.

114
p_xterm-settings.diff → xterm-settings.patch
View File

@ -1,8 +1,14 @@
Index: xterm-264/UXTerm.ad
===================================================================
--- xterm-264.orig/UXTerm.ad
+++ xterm-264/UXTerm.ad
@@ -35,11 +35,21 @@
# various distribution configuration tweaks
diff --git a/UXTerm.ad b/UXTerm.ad
--- a/UXTerm.ad
+++ b/UXTerm.ad
@@ -30,21 +30,31 @@
! sale, use or other dealings in this Software without prior written
! authorization.
! -----------------------------------------------------------------------------
! Use
! xterm -class UXTerm
! to set resources for UTF-8 mode with corresponding fonts.
! See the uxterm script for an example.
@ -24,7 +30,17 @@ Index: xterm-264/UXTerm.ad
! This includes "XTerm-color" which includes "XTerm", which defines fonts.
! Why set them here?
!
@@ -60,12 +70,29 @@
! 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.
!
! 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.
@ -60,11 +76,20 @@ Index: xterm-264/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
Index: xterm-264/XTerm-col.ad
===================================================================
--- xterm-264.orig/XTerm-col.ad
+++ xterm-264/XTerm-col.ad
@@ -76,15 +76,15 @@
!*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
@@ -71,25 +71,25 @@
! These are the 8 ANSI colors and their bright equivalents. Depending on
! other resource settings, xterm may use the bright colors when displaying
! bold text (see the boldColors resource).
*VT100*color0: black
*VT100*color1: red3
*VT100*color2: green3
*VT100*color3: yellow3
@ -83,11 +108,20 @@ Index: xterm-264/XTerm-col.ad
*VT100*color13: magenta
*VT100*color14: cyan
*VT100*color15: white
Index: xterm-264/XTerm.ad
===================================================================
--- xterm-264.orig/XTerm.ad
+++ xterm-264/XTerm.ad
@@ -99,21 +99,46 @@
! Disclaimer: there are no standard colors used in terminal emulation.
!
! 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
+++ b/XTerm.ad
@@ -96,31 +96,56 @@
*vtMenu*softreset*Label: Do Soft Reset
*vtMenu*hardreset*Label: Do Full Reset
*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
@ -141,7 +175,17 @@ Index: xterm-264/XTerm.ad
*fontMenu*fontescape*Label: Escape Sequence
*fontMenu*fontsel*Label: Selection
!fontescape and fontsel overridden by application
@@ -131,12 +156,13 @@
*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
@@ -130,22 +155,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
@ -161,7 +205,17 @@ Index: xterm-264/XTerm.ad
*tekMenu.Label: Tek Options
*tekMenu*tektextlarge*Label: Large Characters
@@ -233,6 +259,62 @@
*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
@@ -232,16 +258,72 @@
!*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
!
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
@ -224,11 +278,20 @@ Index: xterm-264/XTerm.ad
! 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.
Index: xterm-264/xterm.man
===================================================================
--- xterm-264.orig/xterm.man
+++ xterm-264/xterm.man
@@ -3546,9 +3546,13 @@ It is the XIM server's responsibility to
!
! 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
@@ -4004,19 +4004,23 @@ This option specifies the font to be use
in the \*(``OverTheSpot\*('' input method.
.IP
In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion)
string is displayed at the position of the cursor.
It is the XIM server's responsibility to display the preedit string.
The XIM client must inform the XIM server of the cursor position.
For best results, the preedit string must be displayed with a proper font.
Therefore, \fI\*n\fP informs the XIM server of the proper font.
@ -245,3 +308,8 @@ Index: xterm-264/xterm.man
The \fBximFont\fP resource is provided to override this default font setting.
.\"
.SS Tek4014 Widget Resources
.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

22
xterm-sigwinch.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/screen.c b/screen.c
--- a/screen.c
+++ b/screen.c
@@ -2183,17 +2183,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;
-#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);
}

27
xterm.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue May 28 13:01:27 UTC 2013 - pcerny@suse.com
- Patch #293 - 2013/05/27
* modify sample xterm.spec to use newer icon
* add configure option --with-icon-symlink to work around
systems which map icon requests for to a single "xterm" icon,
but neglect to install the icon needed for window decorations
(report by H Merijn Brand).
* improve parameterizing of sample xterm.spec
* amend fix for printer from patch #280, removing a reset of the
signal handler for SIGCHLD (report by Joe Julian).
* set environment variable XTERM_FILTER if a locale-filter is
used.
* enable DEBUG logic when --enable-trace configure option is
given.
* improve description of initialFont, set-vt-font and
set-tex-text in manpage (Debian #707899).
* fix regression from patch #292; selecting a word that ended at
the right margin without wrapping would not select the last
cell (report by Christian Weisgerber).
-------------------------------------------------------------------
Thu May 2 17:22:57 UTC 2013 - pcerny@suse.com
- cleanup of spec file and patches
-------------------------------------------------------------------
Fri Apr 26 11:06:37 UTC 2013 - meissner@suse.com

60
xterm.spec
View File

@ -52,34 +52,34 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm
%if 0%{?suse_version} > 1210
Requires: luit
%endif
Version: 292
Version: 293
Release: 0
Summary: The basic X terminal program
License: MIT
Group: System/X11/Utilities
Source: ftp://invisible-island.net/xterm/%name-%version.tgz
Source2: ftp://invisible-island.net/xterm/%name-%version.tgz.asc
Source1: luitx
Source: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
Source1: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz.asc
Source2: luitx
Source3: Backarrow2Delete
Source4: Backarrow2BackSpace
Source5: README.SuSE
Source6: terminal.png
%define vttest_version 20120506
Source7: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz
Source10: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz.asc
Source11: %name.keyring
Source11: %{name}.keyring
Source8: 20x20ja.bdf.bz2
Source9: 20x20ko.bdf.bz2
# Snoop for the escape sequence assignment of the keypad
Source20: snooper.tar.bz2
Patch1: p_xterm-settings.diff
Patch2: p_xterm-sigwinch.diff
Patch3: bug-246573-tentative-patch.diff
Patch4: desktop.diff
Patch5: xterm-disallow-window-and-fonts-ops.patch
Patch6: libtinfo.diff
Patch7: config-guess-sub-update.patch
Patch293793: bugzilla-293793-do-not-insist-on-iso8859-fonts-for-the-menu.patch
%define vttest_version 20120506
Source100: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz
Source101: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz.asc
Patch1: %{name}-settings.patch
Patch2: %{name}-sigwinch.patch
Patch3: %{name}-double_width_fonts.patch
Patch4: %{name}-desktop_file_icon.patch
Patch5: %{name}-forbid_window_and_font_ops.patch
Patch6: %{name}-enable_libtinfo.patch
Patch7: %{name}-allow_iso-utf_fonts_in_menu.patch
Patch101: vttest-config_update_aarch64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1220
%reconfigure_fonts_prereq
@ -90,20 +90,22 @@ This package contains the basic X.Org terminal program.
%prep
%if 0%{?suse_version} > 1220
%gpg_verify %{S:2} %{S:10}
%gpg_verify %{S:1}
%gpg_verify %{S:101}
%endif
%setup -q -b7
%patch1 -p1 -b .xterm-settings
%patch2 -p0 -b .xterm-sigwinch
%setup -q -b100
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p0
%patch5 -p0
%patch6 -p0
%patch293793 -p1
cp $RPM_SOURCE_DIR/*bdf.bz2 .
bunzip2 *.bdf.bz2
cd ../vttest-%vttest_version
%patch7
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
cp -t . %{S:8} %{S:9}
bunzip2 %{basename:%{S:8}} %{basename:%{S:9}}
cd ../vttest-%{vttest_version}
pwd
%patch101 -p1
%build
# suse 10.x uses older X11 directory structure
@ -136,7 +138,7 @@ cd ../vttest-%vttest_version
make %{?_smp_mflags}
pushd "../vttest-%vttest_version"
pushd "../vttest-%{vttest_version}"
%configure
make %{?_smp_mflags}
popd