Accepting request 100784 from X11:terminals

- Patch #278 - 2012/01/18
- Patch #277 - 2012/01/07 (forwarded request 100762 from pcerny)

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

libtinfo.diff

@@ -0,0 +1,30 @@
+--- 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

xterm-276.tar.bz2

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

xterm-278.tar.bz2

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

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

@@ -22,8 +22,8 @@ Index: xterm.man
  .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 \*(``true\*(''.
-+The default is \*(``false.\*(''
++The default is \*(``false\*(''.
  .TP 8
  .B "allowScrollLock (\fPclass\fB AllowScrollLock)"
  Specifies whether control sequences that set/query

xterm.changes

@@ -1,3 +1,93 @@
+-------------------------------------------------------------------
+Thu Jan 19 12:31:33 UTC 2012 - pcerny@suse.com
+
+- Patch #278 - 2012/01/18
+  * correct initialization for eightBitMeta resource
+    (FreeBSD #164101).
+  * make special check for Darwin 9 (and lower) to not use
+    posix_openpt (report by Christian Ebert).
+  * minor fixes (adding ".ne" directives) to reduce the cases
+    where groff's utility for generating images for tables dumps
+    core. Most versions of groff (I've found 1.19.2 to be the
+    most stable) dump core when attempting to report that there
+    are too few lines on a page for a table to be shown. 
+
+- Patch #277 - 2012/01/07
+  * remove special case for ISC pseudo-terminals which attempts
+    to open the pty in two different ways.
+  * move call to grantpt before asking utempter to add a record,
+    to work with kFreeBSD which does not update the terminal's
+    ownership until this point (Debian #652907).
+  * document limitation of XIM interface in manpage
+    (Debian #230787).
+  * cleanup error reporting with new xtermWarning function.
+  * add configure option --disable-selection-ops to make the new
+    actions optional.
+  * add four new actions for making the selection or data
+    directly copied from the screen (prompted by discussion in
+    Debian #637001, as well as report by Arjen van Tol):
+    o exec-formatted
+    o exec-selectable
+    o insert-formatted
+    o insert-selectable 
+  * add visualBellLine resource to allow visualBell to flash only
+    the current line (prompted by patch by Gertjan Halkes).
+  * add eightBitMeta resource to control the features which
+    modify or interpret the eighth bit of a key when the meta
+    modifier key is pressed (prompted by Debian #326200).
+  * improve discussion of eightBitInput in the manpage (prompted
+    by Debian #326200).
+  * correct logic for alt-sends-escape action, overlooked when
+    implementing altSendsEscape resource, which still used
+    eightBitInput resource value.
+  * add a workaround for XAllocColor(), which does not actually
+    allocate "a read-only colormap entry corresponding to the
+    closest RGB value supported by the hardware", but rather
+    a rough approximation (Debian #650291).
+  * undo parameter checks for RequestResize() added in patch #251
+    and amended in patch #270, because zeros also are special
+    cases (report by John S Urban).
+  * modify some test-scripts to use /bin/echo rather than the
+    shell's possibly-builtin echo, to work around broken
+    configuration on Mac OS X, i.e., neither honoring the option
+    nor flagging an error.
+  * add SGR 1006, as a better technical solution than SGR 1015:
+    o the responses will not be confused with line-deletion and
+      scrolling controls.
+    o the button encoding is a little simpler, since it does not
+      add an unnecessary 32 because the integer parameter does
+      not have to be represented as a printable character.
+    o the control responses for pressing and releasing a mouse
+      button differ, allowing an application to tell which button
+      was released. 
+  * Besides these improvements, in discussion, it was noted that
+    urxvt's implementation of 1005 is incorrect, relying upon
+    a locale that provides UTF-8 encoding. In contrast, vttest
+    demonstrates a correct decoding, independent of locale.
+  * add support for urxvt SGR 1015 to address shortcoming of
+    SGR 1005 with luit (patch by Egmont Koblinger).
+  * add ISO and DEC controls useful for left/right scrolling.
+  * add some changes for OpenBSD and MirBSD (adapted from patch
+    by Thorsten Glaser):
+    o disable search for non-Unix96 ptys.
+    o fix a gcc warning in timestamp_filename
+    o modify Imakefile to install xterm setgid to utmp. 
+  * add/use/prefer posix_openpt() for opening pseudo-terminal.
+  * modify special errno handling case in ptydata.c from
+    patch #158 to allow for the possibility that any platform may
+    have special cases where "/dev/tty" is absent. For example,
+    this can happen in a FreeBSD jail (patch by David Wolfskill).
+  * add keyboard logic to map shift-tab into XK_ISO_Left_Tab,
+    which is usually, not always, done by the X keyboard
+    configuration.
+  * portability fixes for some configure macros: CF_XOPEN_SOURCE 
+
+-------------------------------------------------------------------
+Thu Nov 17 10:54:07 UTC 2011 - werner@suse.de
+
+- Use libtinfo if available otherwise libncurses (required due
+  bnc #729226) 
+
 -------------------------------------------------------------------
 Wed Oct 19 01:47:15 UTC 2011 - pcerny@suse.com
 

xterm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xterm
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -19,19 +19,26 @@
 
 
 Name:           xterm
-BuildRequires:  freetype2-devel update-desktop-files xorg-x11 xorg-x11-devel
+BuildRequires:  freetype2-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  update-desktop-files
 %if 0%{?suse_version} > 1130
 BuildRequires:  utempter-devel
 %else
 BuildRequires:  utempter
 %endif
+%if 0%{?suse_version} >= 1000
+BuildRequires:  xorg-x11
+BuildRequires:  xorg-x11-devel
+%else
+BuildRequires:  XFree86-libs
+%endif
 Url:            http://invisible-island.net/xterm/
 License:        MIT
 Group:          System/X11/Utilities
 Provides:       xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
 AutoReqProv:    on
-Version:        276
+Version:        278
 Release:        1
 Summary:        The basic X terminal program
 Source:         ftp://invisible-island.net/xterm/%name-%version.tar.bz2
@@ -50,6 +57,7 @@ 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
 Patch293793:    bugzilla-293793-do-not-insist-on-iso8859-fonts-for-the-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -63,6 +71,7 @@ This package contains the basic X.Org terminal program.
 %patch3 -p1
 %patch4 -p0
 %patch5 -p0
+%patch6 -p0
 %patch293793 -p1
 cp $RPM_SOURCE_DIR/*bdf.bz2 .
 bunzip2 *.bdf.bz2