Marcus Meissner
bcff3f73f9
! temporarily pass gpg verification, since it claims that ! the signature file is inaccessible - 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/176920 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=74
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
# 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
|