From 9433f701285dca4d76ea0b50355c5435af55bd15f12c725b71159c21f256fce8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 28 Jul 2011 15:52:43 +0000 Subject: [PATCH] Accepting request 77353 from home:pcerny:factory - Patch #271 - 2011/07/14 OBS-URL: https://build.opensuse.org/request/show/77353 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=21 --- p_xterm-settings.diff | 17 +++------- xterm-270.tar.bz2 | 3 -- xterm-271.tar.bz2 | 3 ++ xterm.changes | 72 +++++++++++++++++++++++++++++++++++++++++++ xterm.spec | 2 +- 5 files changed, 80 insertions(+), 17 deletions(-) delete mode 100644 xterm-270.tar.bz2 create mode 100644 xterm-271.tar.bz2 diff --git a/p_xterm-settings.diff b/p_xterm-settings.diff index 6203b66..d05a67a 100644 --- a/p_xterm-settings.diff +++ b/p_xterm-settings.diff @@ -231,30 +231,21 @@ Index: xterm-264/xterm.man @@ -1227,7 +1227,7 @@ Application specific resources (e.g., "\ Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources together by setting the DECBKM state according to whether the initial value of - stty erase is a backspace (8) or delete (127) character. + \fIstty\fP erase is a backspace (8) or delete (127) character. -The default is \*(``false\*('', which disables this feature. +The default is \*(``true\*('', which disables this feature. .TP 8 .B "fullscreen (\fPclass\fB Fullscreen)" Specifies whether or not \fIxterm\fP should ask the window manager to -@@ -3045,7 +3045,7 @@ always. - .TP 8 - .B "pointerShape (\fPclass\fB Cursor)" - Specifies the name of the shape of the pointer. --The default is \*(``xterm.\*('' -+The default is \*(``top_left_arrow.\*('' - .TP 8 - .B "popOnBell (\fPclass\fB PopOnBell)" - Specifies whether the window would be raised when Control-G is received. @@ -3546,9 +3546,13 @@ It is the XIM server's responsibility to 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, \fIxterm\fP informs the XIM server of the proper font. --The font is be supplied by a "fontset", whose default value is "*". +-The font is be supplied by a "fontset", whose default value is \*(``*\*(''. -This matches every font, the X library automatically chooses fonts with -proper charsets. -+The font is be supplied by a "fontset", whose default value is -+"fixed" on openSUSE. The upstream default value is "*" ++The font is to be supplied by a "fontset", whose default value is ++"fixed" on openSUSE. The upstream default value is \*(``*\*('' +which matches every font, the X library automatically chooses fonts with +proper charsets. But this can be extremely slow in some locales and +at least for the XIM servers "scim" and "kinput2" it doesn't improve diff --git a/xterm-270.tar.bz2 b/xterm-270.tar.bz2 deleted file mode 100644 index d67ef05..0000000 --- a/xterm-270.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c036dcb36546497cdbb1852dbc0bcdc6b178f3c00a12486ca34ec2b565a45518 -size 812938 diff --git a/xterm-271.tar.bz2 b/xterm-271.tar.bz2 new file mode 100644 index 0000000..18a94f0 --- /dev/null +++ b/xterm-271.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52b1c69a96db09dcf7e4dde6b18317e867266a14d1d655176d170b9a226d3300 +size 819667 diff --git a/xterm.changes b/xterm.changes index 189200e..533c3fd 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Wed Jul 27 12:11:45 UTC 2011 - pcerny@novell.com + +- Patch #271 - 2011/07/14 + * omit permissions adjustments to pty on exit except for + pre-Unix98 ptys, since modern implementations handle this + (report by Sean C Farley). + * modify logic for switching fonts between UTF-8 and non-UTF-8 + * encoding to not merge the derivable bold-, wide- and widebold + * values from the VT100 fonts. Also suppress warning when not + * using UTF-8 fonts if wide- and widebold-fonts cannot be + * derived or otherwise loaded (report by Werner Scheinast). + * modify menu-creation to suppress entries which will never be + used in the current configuration, rather than simply disabling + them. + * add resource printModeImmediate and menu item to allow print + of screen plus saved lines to a file. + * add menu item to allow runtime enable/disable of the + printFileOnXError feature. + * append a timestamp to filename used in printFileOnXError + feature, and restrict its permissions (request by Vincent + Lefevre). + * add a check when cancelling cursor-blinking, in case the + cursor is blinked off. Fix so that the cursor is repainted + without waiting for other events, e.g., keypress (report by + Ailin Nemui). + * add configure --with-app-class option, to simplify building + "xterm-dev" packages with filenames that do not conflict with + conventional "xterm" packages. + * corrected logic flow for DECSCL, which prevented the updated + operating level from being reported via DECRQSS (report by + Ailin Nemui). + * corrected default for brokenStringTerm resource to match + manpage. + * add vttests/dynamic.pl + * add runtime check for locale not supported by X libraries, and + fallback to XA_STRING in this case (request by Bryan + Henderson). + * fix a special case in configure script after no FreeType + libraries are found. The script was proceeding to check for a + usable configuration. + * add xterm+tmux building block to terminfo (adapted from + changes proposed by Ailin Nemui and Nicholas Marriott). + * improve discussion of faceName resource in manpage (adapted + from suggestions by Jens Schweikhardt). + * correct mapping of shifted up/down cursor-keys in termcap + function-keys mode, i.e., resource tcapFunctionKeys (patch by + Gertjan Halkes). + * update AIX case in CF_XOPEN_SOURCE configure macro to add + release 7.x. + * modify ifdef's in xterm_io.h for __hpux to force that to use + the hacked SYSV support in that file. This fixes a problem + with a non-blocking socket call (patch by Paul Lampert). + * improve filtering of desktop category scanning, to exclude + XFCE. + * modify configure script to work with systems that have both + ncurses (or other terminfo) as well as a real termcap library, + e.g., Slackware (report by Alan Watts). + * modify configure script to work around special case where + user's environment adds compiler flags to the CC variable + (prompted by report by Paul Lampert). + * amend change for Debian #110226 so that "-h" or "-v" options + cause an exit, rather than simply printing to stdout while the + window is displayed (Debian #629358). + * add response for DECRQSS which gives the setting for DECSCUSR. + * modify AllocateTermColor() to handle XtDefaultForeground and + XtDefaultBackground, which are not recognized by XParseColor. + For example, this fixes the use of OSC 112 when no explicit + cursor color was set (report by Ailin Nemui). + * handle special-case of KeyPress translated to popup-menu + action (Ubuntu #756273). + ------------------------------------------------------------------- Tue Jul 12 13:00:23 UTC 2011 - pcerny@novell.com diff --git a/xterm.spec b/xterm.spec index feea9ea..5d3ab99 100644 --- a/xterm.spec +++ b/xterm.spec @@ -31,7 +31,7 @@ License: MIT Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm AutoReqProv: on -Version: 270 +Version: 271 Release: 1 Summary: The basic X terminal program Source: ftp://invisible-island.net/xterm/%name-%version.tar.bz2