85c2100f4c
- Patch #330 - 2017/06/20 * updates for ReGIS (Ross Combs): + remove redundant text command error check which broke T(B) and T(E). + retain the loading alphabet number across multiple “L” commands. + add S(T) delay handler. + fix some color handling error messages. + add stubbed-out macrograph handling. + use fragment_remaining() and fragment_consumed() instead of manually checking position / length in various places. + rename some local variables in string / extent / option parsing + wrap some long lines. + move macrograph command handling out of the top-level. * add a summary of the italic fonts loaded to -report-fonts option. * modify the font-lookup for italics to allow for “-i-” if no match is found with slant “-o-” (prompted by patch by Ben Wong). * change default values for mkSamplePass and mkSampleSize to reflect generally-improved locale support in various operating systems (FreeBSD #219800). * modify wcwidth.c to return -1 for non-Unicode values, and adjust a couple of blocks to better match assumptions about ambiguous-width characters in other implementations. Also modify wcwidth.c to support configurable soft-hyphen, so there is no drawback to using this version rather than a system wcwidth. * amend change made in patch #328 for cursor-visibility to OBS-URL: https://build.opensuse.org/request/show/528278 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=146
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
# check for libtinfo before falling back to ncurses
|
|
|
|
diff --git a/aclocal.m4 b/aclocal.m4
|
|
--- a/aclocal.m4
|
|
+++ b/aclocal.m4
|
|
@@ -792,20 +792,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
|
|
@@ -5754,20 +5754,20 @@ echo "$as_me:5753: 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" && {
|
|
cf_add_libs="-l$cf_termlib"
|
|
# Filter out duplicates - this happens with badly-designed ".pc" files...
|
|
for cf_add_1lib in $LIBS
|