Accepting request 51189 from X11:terminals

Accepted submit request 51189 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/51189
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=41

desktop.diff

@@ -8,4 +8,4 @@ Index: xterm.desktop
  Encoding=UTF-8
 -Icon=xterm-color_48x48
 +Icon=terminal
- Categories=System;
+ Categories=System;TerminalEmulator;

p_xterm-settings.diff

@@ -1,15 +1,17 @@
-Index: xterm-254/UXTerm.ad
+Index: xterm-264/UXTerm.ad
 ===================================================================
---- xterm-254.orig/UXTerm.ad
+--- xterm-264.orig/UXTerm.ad
-+++ xterm-254/UXTerm.ad
++++ xterm-264/UXTerm.ad
-@@ -35,8 +35,19 @@
+@@ -35,11 +35,21 @@
  ! to set resources for UTF-8 mode with corresponding fonts.
  ! See the uxterm script for an example.
  
 +! You need to have efont-unicode.rpm installed in order to use the
 +! efont-fixed fonts!
-+
+ #include "XTerm"
- #include "XTerm-color"
+ 
+ *fontMenu.Label:  Unicode Fonts
+ *VT100.utf8:	1
  
 +! always use iso10646-1 fonts and luit for non-UTF-8 locales:
 +*locale: true
@@ -19,10 +21,10 @@ Index: xterm-254/UXTerm.ad
 +! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930):
 +*ximFont: fixed
 +
- *fontMenu.Label:  Unicode Fonts
+ ! This includes "XTerm-color" which includes "XTerm", which defines fonts.
- *VT100.utf8:	1
+ ! Why set them here?
- 
+ !
-@@ -60,12 +71,29 @@
+@@ -60,12 +70,29 @@
  ! 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.
@@ -58,10 +60,10 @@ Index: xterm-254/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-254/XTerm-col.ad
+Index: xterm-264/XTerm-col.ad
 ===================================================================
---- xterm-254.orig/XTerm-col.ad
+--- xterm-264.orig/XTerm-col.ad
-+++ xterm-254/XTerm-col.ad
++++ xterm-264/XTerm-col.ad
 @@ -76,15 +76,15 @@
  *VT100*color1: red3
  *VT100*color2: green3
@@ -81,10 +83,10 @@ Index: xterm-254/XTerm-col.ad
  *VT100*color13: magenta
  *VT100*color14: cyan
  *VT100*color15: white
-Index: xterm-254/XTerm.ad
+Index: xterm-264/XTerm.ad
 ===================================================================
---- xterm-254.orig/XTerm.ad
+--- xterm-264.orig/XTerm.ad
-+++ xterm-254/XTerm.ad
++++ xterm-264/XTerm.ad
 @@ -98,21 +98,46 @@
  *vtMenu*vthide*Label:  Hide VT Window
  *vtMenu*altscreen*Label:  Show Alternate Screen
@@ -159,7 +161,7 @@ Index: xterm-254/XTerm.ad
  
  *tekMenu.Label:  Tek Options
  *tekMenu*tektextlarge*Label:  Large Characters
-@@ -226,6 +252,62 @@
+@@ -232,6 +258,62 @@
  ! Alternatively,
  !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
  
@@ -222,11 +224,11 @@ Index: xterm-254/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-254/xterm.man
+Index: xterm-264/xterm.man
 ===================================================================
---- xterm-254.orig/xterm.man
+--- xterm-264.orig/xterm.man
-+++ xterm-254/xterm.man
++++ xterm-264/xterm.man
-@@ -1199,7 +1199,7 @@ Application specific resources (e.g., "\
+@@ -1208,7 +1208,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.
@@ -235,7 +237,7 @@ Index: xterm-254/xterm.man
  .TP 8
  .B "hold (\fPclass\fB Hold)"
  If true,
-@@ -2877,7 +2877,7 @@ always.
+@@ -2983,7 +2983,7 @@ always.
  .TP 8
  .B "pointerShape (\fPclass\fB Cursor)"
  Specifies the name of the shape of the pointer.
@@ -244,7 +246,7 @@ Index: xterm-254/xterm.man
  .TP 8
  .B "popOnBell (\fPclass\fB PopOnBell)"
  Specifies whether the window would be raised when Control-G is received.
-@@ -3288,9 +3288,13 @@ It is the XIM server's responsibility to
+@@ -3434,9 +3434,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.

xterm-255.tar.bz2

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

xterm-264.tar.bz2

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

xterm-disallow-window-and-fonts-ops.patch

@@ -2,7 +2,7 @@ Index: XTerm.ad
 ===================================================================
 --- XTerm.ad.orig
 +++ XTerm.ad
-@@ -252,6 +252,11 @@
+@@ -258,6 +258,11 @@
  ! Alternatively,
  !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
  
@@ -18,12 +18,12 @@ Index: xterm.man
 ===================================================================
 --- xterm.man.orig
 +++ xterm.man
-@@ -1499,7 +1499,7 @@ The default is \*(``true.\*(''
+@@ -1515,7 +1515,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 8
- .B "allowSendEvents (\fPclass\fB AllowSendEvents)"
+ .B "allowScrollLock (\fPclass\fB AllowScrollLock)"
- Specifies whether or not synthetic key and button events (generated using
+ Specifies whether control sequences that set/query

xterm.changes

@@ -1,3 +1,146 @@
+-------------------------------------------------------------------
+Fri Oct 15 17:37:48 CEST 2010 - meissner@suse.de
+
+- Patch #264 - 2010/10/14
+  * replace a null-pointer check with check for empty string in
+    xtermOpenFont, to eliminate a warning message from patch #263 changes.
+  * build-fix for patch #263 when toolbar is not configured (patch by
+    Chris Clayton) (reports by Robby Workman, David Wood).
+
+- Patch #263 - 2010/10/13
+  * corrected initialization of "misc" resource values, to ensure that
+    xterm has allocated a copy of strings which may not have been malloc'd
+    by the X library (Debian #600129).
+  * modify handling of any-event/any-button mouse protocol; it now is
+    active with any combination of key-modifiers.
+  * add debugging feature showWrapMarks, which marks lines which xterm
+    knows are wrapped, showing where a double-click will select past the
+    end of a line.
+  * build-fix to address change in include-guards for Xlib.h in ongoing
+    Xorg edits (patch by Jeremy Huddleston).
+  * improve pointerMode by continuing to watch for motion events after
+    mouse tracking is disabled if the pointer is hidden (Debian #594856).
+  * further extend initialization for active-icon font to check if the
+    font was not loaded succesfully, to retry with font1, or as even
+    (if TrueType fonts are used) to use a TrueType font. The retries
+    are to help with cases as in patch #241 where the bitmap fonts are
+    not available.
+  * fix special case of active-icon used when TrueType font is specified
+    for the xterm window, from patch #261 change. In that case, the
+    default font's size was used for layout of the active icon's window
+    (Debian #591265).
+
+- Patch #262 - 2010/8/30
+  * fix a case where changing the cursor color via escape sequences did
+    not immediately update the screen (report by Andreas Wagner).
+  * implement ANSI and DEC request-mode control sequences. The latter
+    includes the xterm-specific private modes such as the mouse mode. The
+    feature is ifdef'd with the rectangle operations since its decoding
+    overlaps that feature.
+  * correct typo in ctlseqs.ms for response of OSC 21 (patch by Kevin Schoedel).
+  * improve discussion of mouse tracking in ctlseqs.ms
+  * increase an array limit used in reporting mouse events (report by Ryan Johnson).
+  * add extended mouse-coordinates mode, allowing up to 2015x2015 windows,
+    using UTF-8 encoding (patch by Ryan Johnson).
+  * modify manpage hyphens to conform with Debian. 
+
+- Patch #261 - 2010/6/28
+  * fix regression in renderFont logic, from patch #260 changes (report
+    by Joseph Quinsey).
+
+- Patch #260 - 2010/6/20
+  * modify plink.sh to work around problem linking to recent PCRE libraries.
+  * extend renderFont resource to allow deferred switch to TrueType
+    fonts without affecting existing resource settings (Debian #585620).
+  * modify configure macro CF_X_TOOLKIT to work around omission of ICE
+    library from ".pc" file (report by Miroslav Lichvar).
+  * change configure script default for --enable-broken-st i.e., the
+    brokenStringTerm feature) to normally enable it. If the corresponding
+    resource is enabled, this feature eliminates an apparent freeze of
+    xterm when sending mis-encoded data to the screen (Debian #584801).
+  * document in manpage some actions which were overlooked:
+    o readline-button
+    o scroll-lock
+    o set-8-bit-control 
+  * undo a change to limit-check in ScrnRefresh in patch #257, which
+    broke fastScroll feature (Debian #584841).
+  * modify handling of brokenLinuxOSC and brokenStringTerm to also sound
+    the bell.
+  * add control/D and control/Q to controls which will cause early exit
+    from control string per brokenStringTerm resource.
+  * improve documentation of brokenStringTerm resource in manpage. 
+
+- Patch #259 - 2010/6/5
+  * modify configure check for luit to include new aliases for the program
+    (xterm-filter and bluit).
+  * add workaround in xtermClearLEDs() to account for Xkb's override,
+    making vttest's LED demo reset the scroll lock.
+  * filter out client-message events when deciding whether to hide cursor,
+    e.g., when using SCIM (patch/report by anonymous user).
+  * improve description of -bd option in manpage (report by Guy Daniel Clotilde).
+  * modify configure checks for PCRE and other libraries to use pkg-config, if available.
+  * amend change from patch #252, to take veryColorColors resource into
+    account when checking colorBDMode resource for TrueType fonts (report
+    by anonymous user).
+  * add vttests/query-fonts.pl script for demonstrating the OSC 50 font query.
+  * improve manpage discussion of Scroll Lock feature.
+  * improve configure macros CF_GCC_VERSION and CF_GCC_WARNINGS.
+  * fix warnings for "clang --analyze".
+  * change default for allowScrollLock resource to false, noting that
+    the supposedly unused key has been useful for various rebindings
+    (Debian #580946).
+
+- Patch #258 - 2010/5/1
+  * add pointer-checks in ScrnRefresh to fix a case in rapid scrolling
+    where an empty record is fetched from the scrollback FIFO.
+
+- Patch #257 - 2010/4/22
+  * correct ctlseqs.ms description of OSC 17 and OSC 19 (patch by Emanuele Giaquinta).
+  * corrected logic for menuLocale resource; the setlocale function
+    returns the original locale only when querying.
+  * improve filtering of translations resource, narrowing the scope of
+    the alwaysUseMods to address only the translations that would cause
+    a key to be sent to the host (report by Andrew Gaylard).
+  * change default value of menuLocale resource to "C", to work around
+    longstanding Xorg bug.
+  * modify handling of scrollKey feature to ignore XON/XOFF keys.
+  * implement scroll-lock feature.
+  * revise memory allocation in UTF8toLatin1() to fix an out-of-bounds
+    index (Mandriva #54531).
+  * compute value for first wide-character rather than assuming it is
+    256, fixes problem with -cjk_width introduced in patches 242 and 249
+    (report by Thomas Wolff).
+  * improve configure script:
+    o corrected check for _XOPEN_SOURCE for OpenSolaris.
+    o when possible, add rpath option for libraries in unusual places
+    o add configure option --disable-rpath-hack to control whether the rpath option can be added. 
+  * modify AllocateTermColor() to separate initialization from control
+    sequences, fixing problem from patch #254 changes where enabling
+    allowSendEvents resource prevents setting cursor color on command-line
+    (Debian #572928).
+  * amend logic from patch #185 to not reallocate cell-array if processing
+    ESC % G to switch from UTF-8 if already in ISO-8859-1 character set
+    (report by Michael Koehne).
+  * fix to avoid calling XmuInternStrings() with zero count (report by Johan Bockgård).
+  * fix build when --disable-ansi-color configure option is used.
+  * fix build when neither OPT_TCAP_QUERY or OPT_TCAP_FKEYS is defined
+    (patch by Matthieu Herrb)
+
+- Patch #256 - 2010/3/6
+  * add TerminalEmulator to desktop category files.
+  * modify sinstall.sh to ignore the "." appended to permissions by selinux.
+  * change app-defaults organization, installing UXTerm-color and
+    KOI8XTerm-color for consistent behavior regarding customization: color
+    (prompted by discussion in Ubuntu #421261).
+  * fix typo in minstall.sh from patch #255 changes, and add case for
+    /var/run needed for full path of utmp (report by Julien Cristau).
+  * minor fix to xterm manpage, remove a comment stating that margin bell
+    can be changed via the VT Options menu. That was replaced in patch #225
+  * add a "docs" rule to makefile.
+  * fix initialization of Atom used for XkbBell feature from patch 243
+    changes. Unlike the other calls to XInternAtom(), in this case the
+    flag telling X to create the Atom was unset (patch by Chris Adams).
+
 -------------------------------------------------------------------
 Thu Sep  9 18:44:03 UTC 2010 - aj@suse.de
 

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:        255
+Version:        264
 Release:        6
 Summary:        The basic X terminal program
 Source:         ftp://invisible-island.net/xterm/%name-%version.tar.bz2
@@ -125,9 +125,11 @@ if [ -d $RPM_BUILD_ROOT/usr/share/fonts/misc ]; then
 /usr/lib/X11/etc/xterm.termcap
 /usr/lib/X11/etc/xterm.terminfo
 /usr/share/X11/app-defaults/XTerm
-/usr/share/X11/app-defaults/UXTerm
 /usr/share/X11/app-defaults/XTerm-color
+/usr/share/X11/app-defaults/UXTerm
+/usr/share/X11/app-defaults/UXTerm-color
 /usr/share/X11/app-defaults/KOI8RXTerm
+/usr/share/X11/app-defaults/KOI8RXTerm-color
 /usr/share/fonts/misc/20x20ja.pcf.gz
 /usr/share/fonts/misc/20x20ko.pcf.gz
 EOF
@@ -135,6 +137,7 @@ else
   cat > files.xterm << EOF
 %dir /usr/X11R6/lib/X11/etc
 /usr/X11R6/lib/X11/app-defaults/UXTerm
+/usr/X11R6/lib/X11/app-defaults/UXTerm-color
 /usr/X11R6/lib/X11/app-defaults/XTerm
 /usr/X11R6/lib/X11/app-defaults/XTerm-color
 /usr/X11R6/lib/X11/etc/xterm.termcap