Accepting request 91918 from home:WernerFink:branches:X11:terminals

- Use libtinfo if available otherwise libncurses (required due
  bnc #729226)

OBS-URL: https://build.opensuse.org/request/show/91918
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=29
This commit is contained in:
Petr Cerny 2011-11-21 15:11:55 +00:00 committed by Git OBS Bridge
parent 927e20045b
commit 79cfd38db8
3 changed files with 38 additions and 0 deletions

30
libtinfo.diff Normal file
View File

@ -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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

View File

@ -50,6 +50,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 +64,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