testing/ncurses
SHA256
3
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Accepting request 50375 from Base:System

Browse Source 
Copy from Base:System/ncurses based on submit request 50375 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/50375
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=35
This commit is contained in:
OBS User autobuild 2010-10-14 09:59:24 +00:00 committed by Git OBS Bridge
commit bfca966993
7 changed files with 294 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ncurses-5.7-20100109-patch.tar.bz2
View File

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

3
ncurses-5.7-20101009-patch.tar.bz2 Normal file
View File

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

22
ncurses-5.7-overwrite.dif
View File

@ -1,12 +1,20 @@
Make ncurses-config report the correct directory for ncurses.h. --- configure
+++ configure 2010-10-11 14:04:42.000000000 +0000
--- configure 2007/10/29 13:59:32 1.9 @@ -6083,6 +6083,7 @@ else
+++ configure 2007/10/29 14:18:12
@@ -5679,6 +5679,7 @@
fi; fi;
echo "$as_me:5680: result: $with_overwrite" >&5 echo "$as_me:6084: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6 echo "${ECHO_T}$with_overwrite" >&6
+WITH_OVERWRITE="$with_overwrite" +WITH_OVERWRITE="$with_overwrite"
echo "$as_me:5683: checking if external terminfo-database is used" >&5 echo "$as_me:6087: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
--- configure.in
+++ configure.in 2010-10-12 08:14:30.779926168 +0000
@@ -435,6 +435,7 @@ AC_ARG_ENABLE(overwrite,
[with_overwrite=$enableval],
[if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi])
AC_MSG_RESULT($with_overwrite)
+WITH_OVERWRITE=$with_overwrite
AC_MSG_CHECKING(if external terminfo-database is used)
AC_ARG_ENABLE(database,

165
ncurses-5.7-pthread.dif
View File

@ -1,160 +1,25 @@
--- ncurses/base/lib_getch.c
+++ ncurses/base/lib_getch.c 2010-05-07 19:02:11.222924328 +0200
@@ -264,7 +264,14 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_e
ch = buf;
#else
unsigned char c2 = 0;
+# ifdef USE_EINTR
+ if ((pthread_self) && (pthread_kill) && (pthread_equal))
+ _nc_globals.read_thread = pthread_self();
+# endif
n = read(sp->_ifd, &c2, 1);
+#ifdef USE_EINTR
+ _nc_globals.read_thread = 0;
+#endif
ch = c2;
#endif
}
@@ -279,7 +286,11 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_e
* We don't want this difference to show. This piece of code
* tries to make it look like we always have restarting signals.
*/
- if (n <= 0 && errno == EINTR)
+ if (n <= 0 && errno == EINTR
+# ifdef USE_EINTR
+ && (_nc_globals.have_sigwinch == 0)
+# endif
+ )
goto again;
#endif
--- ncurses/base/lib_mouse.c
+++ ncurses/base/lib_mouse.c 2010-05-07 19:01:35.658924370 +0200
@@ -838,6 +838,10 @@ _nc_mouse_inline(SCREEN *sp)
* Wheel mice may return buttons 4 and 5 when the wheel is turned.
* We encode those as button presses.
*/
+# ifdef USE_EINTR
+ if ((pthread_self) && (pthread_kill) && (pthread_equal))
+ _nc_globals.read_thread = pthread_self();
+# endif
for (grabbed = 0; grabbed < 3; grabbed += (size_t) res) {
/* For VIO mouse we add extra bit 64 to disambiguate button-up. */
@@ -849,6 +853,9 @@ _nc_mouse_inline(SCREEN *sp)
if (res == -1)
break;
}
+#ifdef USE_EINTR
+ _nc_globals.read_thread = 0;
+#endif
kbuf[3] = '\0';
TR(TRACE_IEVENT,
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2010-05-07 18:51:15.686924218 +0200 +++ ncurses/curses.priv.h 2010-10-12 11:56:43.640426282 +0200
@@ -448,8 +448,10 @@ extern NCURSES_EXPORT(int) _nc_mutex_unl @@ -490,6 +490,7 @@ extern NCURSES_EXPORT(int) _nc_mutex_unl
#endif
#ifdef USE_PTHREADS #ifdef USE_PTHREADS
+# define USE_EINTR
# if USE_WEAK_SYMBOLS # if USE_WEAK_SYMBOLS
weak_symbol(pthread_sigmask); weak_symbol(pthread_sigmask);
+weak_symbol(pthread_kill); +weak_symbol(pthread_kill);
weak_symbol(pthread_self); weak_symbol(pthread_self);
weak_symbol(pthread_equal); weak_symbol(pthread_equal);
weak_symbol(pthread_mutex_init); weak_symbol(pthread_mutex_init);
@@ -471,6 +473,38 @@ extern NCURSES_EXPORT(int) _nc_sigprocma
#else /* !USE_PTHREADS */
+#if defined(linux) && USE_SIGWINCH
+# define USE_EINTR
+#endif
+
+#ifdef USE_EINTR
+#if defined(__GNUC__)
+# if defined __USE_ISOC99
+# define _cat_pragma(exp) _Pragma(#exp)
+# define _weak_pragma(exp) _cat_pragma(weak name)
+# else
+# define _weak_pragma(exp)
+# endif
+# define _declare(name) __extension__ extern __typeof__(name) name
+# define weak_symbol(name) _weak_pragma(name) _declare(name) __attribute__((weak))
+#endif
+
+#include <pthread.h>
+weak_symbol(pthread_sigmask);
+weak_symbol(pthread_kill);
+weak_symbol(pthread_self);
+weak_symbol(pthread_equal);
+static inline int _nc_sigprocmask(int how, const sigset_t *newmask, sigset_t *oldmask)
+{
+ if ((pthread_sigmask))
+ return pthread_sigmask(how, newmask, oldmask);
+ else
+ return sigprocmask(how, newmask, oldmask);
+}
+# undef sigprocmask
+# define sigprocmask _nc_sigprocmask
+#endif /* USE_EINTR */
+
#define _nc_init_pthreads() /* nothing */
#define _nc_mutex_init(obj) /* nothing */
@@ -798,6 +832,9 @@ typedef struct {
int use_pthreads;
#define _nc_use_pthreads _nc_globals.use_pthreads
#endif
+#ifdef USE_EINTR
+ pthread_t read_thread; /* The reading thread */
+#endif
} NCURSES_GLOBALS;
extern NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals;
--- ncurses/tinfo/lib_data.c
+++ ncurses/tinfo/lib_data.c 2010-05-07 18:46:59.706924518 +0200
@@ -193,6 +193,9 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_
0, /* nested_tracef */
0, /* use_pthreads */
#endif
+#ifdef USE_EINTR
+ 0, /* read_thread */
+#endif
};
#define STACK_FRAME_0 { { 0 }, 0 }
--- ncurses/tinfo/tinfo_driver.c 2009-10-31 21:32:01.000000000 +0100
+++ ncurses/tinfo/tinfo_driver.c 2010-05-07 19:01:44.686924794 +0200
@@ -1248,7 +1248,14 @@ drv_read(TERMINAL_CONTROL_BLOCK * TCB, i
assert(buf);
SetSP();
+# ifdef USE_EINTR
+ if ((pthread_self) && (pthread_kill) && (pthread_equal))
+ _nc_globals.read_thread = pthread_self();
+# endif
n = read(sp->_ifd, &c2, 1);
+#ifdef USE_EINTR
+ _nc_globals.read_thread = 0;
+#endif
*buf = (int) c2;
return n;
}
--- ncurses/tty/lib_tstp.c --- ncurses/tty/lib_tstp.c
+++ ncurses/tty/lib_tstp.c 2010-05-07 18:55:04.326924859 +0200 +++ ncurses/tty/lib_tstp.c 2010-10-12 12:02:27.856426710 +0200
@@ -286,6 +286,13 @@ static void @@ -288,7 +288,11 @@ sigwinch(int sig GCC_UNUSED)
sigwinch(int sig GCC_UNUSED)
{
_nc_globals.have_sigwinch = 1; _nc_globals.have_sigwinch = 1;
+# ifdef USE_EINTR # if USE_PTHREADS_EINTR
+ if (_nc_globals.read_thread) { if (_nc_globals.read_thread) {
+ if (!pthread_equal(pthread_self(), _nc_globals.read_thread)) - if (!pthread_equal(pthread_self(), _nc_globals.read_thread))
+ pthread_kill(_nc_globals.read_thread, SIGWINCH); + if (
+ _nc_globals.read_thread = 0; +# if USE_WEAK_SYMBOLS
+ } + (pthread_self) && (pthread_kill) && (pthread_equal) &&
+# endif +# endif
} + !pthread_equal(pthread_self(), _nc_globals.read_thread))
#endif /* USE_SIGWINCH */ pthread_kill(_nc_globals.read_thread, SIGWINCH);
_nc_globals.read_thread = 0;
}

251
ncurses-5.7.dif
View File

@ -1,20 +1,6 @@
--- .pkgextract
+++ .pkgextract 2006-05-18 14:07:14.000000000 +0000
@@ -0,0 +1,11 @@
+rm -fr tack
+rm -f Ada95/src/terminal_interface-curses.adb
+rm -f mkinstalldirs
+tar Oxfj ../ncurses-5.6-20080804-patch.tar.bz2 | patch -p1 -s
+tar xfj ../tack-1.06.tar.bz
+patch -p0 -s --suffix=.va < ../ncurses-5.3-printw.dif
+patch -p0 -s --suffix=.pt < ../ncurses-5.6-pthread.dif
+patch -p0 -s --suffix=.ov < ../ncurses-5.6-overwrite.dif
+patch -p0 -s --suffix=.hs < ../ncurses-5.6-hash.dif
+patch -p0 -s --suffix=.tack < ../ncurses-5.6-tack.dif
+patch -p0 -s --suffix=.gpm < ../ncurses-5.6-gpm.dif
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2008-04-08 15:08:00.000000000 +0000 +++ aclocal.m4 2010-10-11 13:57:42.000000000 +0000
@@ -477,7 +477,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -549,7 +549,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[ AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out rm -f cf_test.out
AC_TRY_RUN([ AC_TRY_RUN([
@ -23,7 +9,7 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -3475,12 +3475,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -3768,12 +3768,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -41,7 +27,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -3490,7 +3493,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -3783,7 +3786,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -50,7 +36,7 @@
CF_EOF CF_EOF
fi fi
@@ -3523,7 +3526,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -3816,7 +3819,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -59,7 +45,7 @@
CF_EOF CF_EOF
fi fi
@@ -3532,23 +3535,23 @@ case "$MANPAGE_FORMAT" in #(vi @@ -3825,23 +3828,23 @@ case "$MANPAGE_FORMAT" in #(vi
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -89,7 +75,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -3557,15 +3560,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -3850,7 +3853,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -98,17 +84,29 @@
then then
continue continue
fi fi
fi @@ -3860,18 +3863,18 @@ CF_EOF
echo .. \$verb alias \$cf_alias\${suffix} case "x$LN_S" in #(vi
*-f) #(vi
cat >>$cf_edit_man <<CF_EOF
- $LN_S \$cf_target \$cf_alias\${suffix}
+ $LN_S \$t \$cf_alias\${suffix}
CF_EOF
;;
*)
cat >>$cf_edit_man <<CF_EOF
rm -f \$cf_alias\${suffix} rm -f \$cf_alias\${suffix}
- $LN_S \$cf_target \$cf_alias\${suffix} - $LN_S \$cf_target \$cf_alias\${suffix}
- elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+ $LN_S \$t \$cf_alias\${suffix} + $LN_S \$t \$cf_alias\${suffix}
CF_EOF
;;
esac
cat >>$cf_edit_man <<CF_EOF
- elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+ elif test "\$t" != "\$cf_alias\${suffix}" ; then + elif test "\$t" != "\$cf_alias\${suffix}" ; then
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -3585,9 +3588,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -3891,9 +3894,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -121,7 +119,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -3607,6 +3610,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -3913,6 +3916,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -130,17 +128,17 @@
esac esac
done done
--- configure --- configure
+++ configure 2010-01-12 10:41:12.407430275 +0000 +++ configure 2010-10-12 08:54:45.515926837 +0000
@@ -5391,7 +5391,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat @@ -5355,7 +5355,7 @@ irix*) #(vi
;; fi
linux*|gnu*|k*bsd*-gnu) ;;
if test "$DFT_LWR_MODEL" = "shared" ; then linux*|gnu*|k*bsd*-gnu) #(vi
- LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" - LD_RPATH_OPT="-Wl,-rpath,"
+ LOCAL_LDFLAGS="-Wl,-rpath-link,\$(LOCAL_LIBDIR)" + LD_RPATH_OPT="-Wl,-rpath-link,"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" ;;
fi openbsd[2-9].*) #(vi
if test "$cf_cv_ld_rpath" = yes ; then LD_RPATH_OPT="-Wl,-rpath,"
@@ -9341,12 +9341,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -9811,12 +9811,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -158,7 +156,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -9356,7 +9359,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -9826,7 +9829,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -167,7 +165,7 @@
CF_EOF CF_EOF
fi fi
@@ -9389,7 +9392,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -9859,7 +9862,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -176,7 +174,7 @@
CF_EOF CF_EOF
fi fi
@@ -9398,23 +9401,23 @@ case "$MANPAGE_FORMAT" in #(vi @@ -9868,23 +9871,23 @@ case "$MANPAGE_FORMAT" in #(vi
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -206,7 +204,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -9423,15 +9426,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -9893,7 +9896,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -215,17 +213,29 @@
then then
continue continue
fi fi
fi @@ -9903,18 +9906,18 @@ CF_EOF
echo .. \$verb alias \$cf_alias\${suffix} case "x$LN_S" in #(vi
*-f) #(vi
cat >>$cf_edit_man <<CF_EOF
- $LN_S \$cf_target \$cf_alias\${suffix}
+ $LN_S \$t \$cf_alias\${suffix}
CF_EOF
;;
*)
cat >>$cf_edit_man <<CF_EOF
rm -f \$cf_alias\${suffix} rm -f \$cf_alias\${suffix}
- $LN_S \$cf_target \$cf_alias\${suffix} - $LN_S \$cf_target \$cf_alias\${suffix}
- elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+ $LN_S \$t \$cf_alias\${suffix} + $LN_S \$t \$cf_alias\${suffix}
CF_EOF
;;
esac
cat >>$cf_edit_man <<CF_EOF
- elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+ elif test "\$t" != "\$cf_alias\${suffix}" ; then + elif test "\$t" != "\$cf_alias\${suffix}" ; then
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -9451,9 +9454,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -9934,9 +9937,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -238,7 +248,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -9473,6 +9476,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -9956,6 +9959,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -246,8 +256,19 @@
;; ;;
esac esac
done done
@@ -16160,7 +16164,7 @@ else @@ -11091,7 +11095,9 @@ LIBS=`echo "$LIBS" | sed -e 's/-lpthread
#line 16159 "configure" TEST_LIBS="-lpthread $TEST_LIBS"
TEST_LIBS2="-lpthread $TEST_LIBS2"
fi
- LIB_SUFFIX="t${LIB_SUFFIX}"
+ if test $cf_cv_weak_symbols != yes ; then
+ LIB_SUFFIX="t${LIB_SUFFIX}"
+ fi
cat >>confdefs.h <<\EOF
#define USE_REENTRANT 1
EOF
@@ -17467,7 +17473,7 @@ else
#line 17466 "configure"
#include "confdefs.h" #include "confdefs.h"
-#include <stdlib.h> -#include <stdlib.h>
@ -255,7 +276,7 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -17219,6 +17223,7 @@ if test "$with_termlib" != no ; then @@ -18588,6 +18594,7 @@ if test "$with_termlib" != no ; then
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -264,8 +285,19 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- configure.in --- configure.in
+++ configure.in 2010-01-12 10:42:14.975430227 +0000 +++ configure.in 2010-10-12 08:54:23.859926357 +0000
@@ -1787,6 +1787,7 @@ if test "$with_termlib" != no ; then @@ -1150,7 +1150,9 @@ if test "$with_reentrant" = yes ; then
CF_ADD_LIB(pthread,TEST_LIBS)
CF_ADD_LIB(pthread,TEST_LIBS2)
fi
- LIB_SUFFIX="t${LIB_SUFFIX}"
+ if test $cf_cv_weak_symbols != yes ; then
+ LIB_SUFFIX="t${LIB_SUFFIX}"
+ fi
AC_DEFINE(USE_REENTRANT)
CF_NCURSES_ABI_6
else
@@ -1761,6 +1763,7 @@ if test "$with_termlib" != no ; then
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -274,16 +306,17 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2008-04-09 13:44:07.000000000 +0000 +++ include/curses.h.in 2010-10-11 13:57:42.000000000 +0000
@@ -144,6 +144,8 @@ typedef unsigned @cf_cv_typeof_chtype@ c @@ -144,6 +144,9 @@ typedef unsigned @cf_cv_typeof_chtype@ c
typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t; typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
#endif #endif
+#include <features.h> +#include <features.h>
+#include <sys/types.h> +#include <sys/types.h>
#include <stdio.h> +
#include <stdarg.h> /* we need va_list */ /*
#ifdef _XOPEN_SOURCE_EXTENDED * We need FILE, etc. Include this before checking any feature symbols.
*/
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2006-05-18 14:07:15.000000000 +0000 +++ include/termcap.h.in 2006-05-18 14:07:15.000000000 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
@ -314,7 +347,7 @@
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2006-05-18 14:07:15.000000000 +0000 +++ man/man_db.renames 2006-05-18 14:07:15.000000000 +0000
@@ -163,6 +163,8 @@ tput.1 tput.1 @@ -167,6 +167,8 @@ tput.1 tput.1
tset.1 tset.1 tset.1 tset.1
vprintf.3s vprintf.3 vprintf.3s vprintf.3
wresize.3x wresize.3ncurses wresize.3x wresize.3ncurses
@ -325,7 +358,7 @@
tack.1m tack.1 tack.1m tack.1
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2006-05-18 14:07:15.000000000 +0000 +++ man/ncurses.3x 2006-05-18 14:07:15.000000000 +0000
@@ -110,6 +110,10 @@ after the shell environment variable \fB @@ -113,6 +113,10 @@ after the shell environment variable \fB
\fBtset(1)\fR is usually responsible for doing this. \fBtset(1)\fR is usually responsible for doing this.
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fR(\*n) for further details.]
.PP .PP
@ -337,7 +370,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/ncurses-config.in --- misc/ncurses-config.in
+++ misc/ncurses-config.in 2010-01-12 10:43:30.679929564 +0000 +++ misc/ncurses-config.in 2010-01-12 10:43:31.000000000 +0000
@@ -75,7 +75,7 @@ while test $# -gt 0; do @@ -75,7 +75,7 @@ while test $# -gt 0; do
if test "${includedir}" != /usr/include ; then if test "${includedir}" != /usr/include ; then
INCS="-I${includedir}" INCS="-I${includedir}"
@ -348,7 +381,7 @@
fi fi
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2010-01-12 10:44:35.359430067 +0000 +++ misc/terminfo.src 2010-10-11 13:59:41.000000000 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -360,7 +393,7 @@
gn, use=dumb, gn, use=dumb,
lpr|printer|line printer, lpr|printer|line printer,
OTbs, hc, os, OTbs, hc, os,
@@ -791,9 +793,15 @@ linux-c|linux console 1.3.6+ for older n @@ -936,9 +938,15 @@ linux-c|linux console 1.3.6+ for older n
# The 2.2.x kernels add a private mode that sets the cursor type; use that to # The 2.2.x kernels add a private mode that sets the cursor type; use that to
# get a block cursor for cvvis. # get a block cursor for cvvis.
# reported by Frank Heckenbach <frank@g-n-u.de>. # reported by Frank Heckenbach <frank@g-n-u.de>.
@ -377,7 +410,7 @@
# Subject: linux 2.6.26 vt back_color_erase # Subject: linux 2.6.26 vt back_color_erase
# Changes to the Linux console driver broke bce model as reported in # Changes to the Linux console driver broke bce model as reported in
@@ -2229,6 +2237,7 @@ vt132|DEC vt132, @@ -2374,6 +2382,7 @@ vt132|DEC vt132,
# at the top of the keyboard. The "DO" key is used as F10 to avoid conflict # at the top of the keyboard. The "DO" key is used as F10 to avoid conflict
# with the key marked (ESC) on the vt220. See vt220d for an alternate mapping. # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping.
# PF1--PF4 are used as F1--F4. # PF1--PF4 are used as F1--F4.
@ -385,7 +418,7 @@
# #
vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
OTbs, OTpt, am, mir, xenl, xon, OTbs, OTpt, am, mir, xenl, xon,
@@ -2238,7 +2247,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e @@ -2383,7 +2392,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l,
clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M, clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M,
csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C,
@ -394,7 +427,7 @@
dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>,
is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B,
@@ -2386,6 +2395,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. @@ -2531,6 +2540,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
# to SMASH the 1k-barrier... # to SMASH the 1k-barrier...
# From: Adam Thompson <athompso@pangea.ca> Sept 10 1995 # From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
# (vt320: uncommented <fsl> --esr) # (vt320: uncommented <fsl> --esr)
@ -402,7 +435,7 @@
vt320|vt300|dec vt320 7 bit terminal, vt320|vt300|dec vt320 7 bit terminal,
am, eslok, hs, mir, msgr, xenl, am, eslok, hs, mir, msgr, xenl,
cols#80, lines#24, wsl#80, cols#80, lines#24, wsl#80,
@@ -2395,7 +2405,7 @@ vt320|vt300|dec vt320 7 bit terminal, @@ -2540,7 +2550,7 @@ vt320|vt300|dec vt320 7 bit terminal,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -411,7 +444,7 @@
ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$}, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$},
home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL,
il1=\E[L, ind=\ED, il1=\E[L, ind=\ED,
@@ -2829,13 +2839,14 @@ putty-vt100|VT100+ keyboard layout, @@ -2974,13 +2984,14 @@ putty-vt100|VT100+ keyboard layout,
# retrieving the window title, and for setting the window size (i.e., using # retrieving the window title, and for setting the window size (i.e., using
# "resize -s"), though it does not pass SIGWINCH to the application if the # "resize -s"), though it does not pass SIGWINCH to the application if the
# user resizes the window with the mouse. # user resizes the window with the mouse.
@ -427,7 +460,7 @@
dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG, flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG,
il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~,
@@ -3031,6 +3042,7 @@ xterm-r6|xterm-old|xterm X11R6 version, @@ -3180,6 +3191,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
use=vt100+enq, use=vt100+enq,
# This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
# The name has been changed and some aliases have been removed. # The name has been changed and some aliases have been removed.
@ -435,7 +468,7 @@
xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
OTbs, am, bce, km, mir, msgr, xenl, OTbs, am, bce, km, mir, msgr, xenl,
cols#80, it#8, lines#24, ncv@, cols#80, it#8, lines#24, ncv@,
@@ -3040,7 +3052,7 @@ xterm-xf86-v32|xterm terminal emulator ( @@ -3189,7 +3201,7 @@ xterm-xf86-v32|xterm terminal emulator (
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -444,7 +477,7 @@
ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
@@ -3480,8 +3492,26 @@ xterm-noapp|xterm with cursor keys in no @@ -3629,8 +3641,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System), xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old, lines#24, use=xterm-old,
@ -471,7 +504,7 @@
use=xterm-new, use=xterm-new,
# These entries allow access to the X titlebar and icon name as a status line. # These entries allow access to the X titlebar and icon name as a status line.
@@ -3574,7 +3604,7 @@ xterm-color|nxterm|generic color xterm, @@ -3723,7 +3753,7 @@ xterm-color|nxterm|generic color xterm,
op=\E[m, use=xterm-r6, use=klone+color, op=\E[m, use=xterm-r6, use=klone+color,
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@ -480,7 +513,7 @@
bce, bce,
kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color, use=xterm-color,
@@ -3710,10 +3740,14 @@ mgt|Multi GNOME Terminal, @@ -3859,10 +3889,14 @@ mgt|Multi GNOME Terminal,
# This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
# or not is debatable). # or not is debatable).
@ -496,13 +529,9 @@
# Konsole 1.0.1 # Konsole 1.0.1
# (formerly known as kvt) # (formerly known as kvt)
# #
@@ -3824,17 +3858,18 @@ konsole-256color|KDE console window with @@ -3976,14 +4010,14 @@ konsole-256color|KDE console window with
# control/alt kf1 to kf12 \E[11;7~ to \E[24;7~
# control/shift/alt kf1 to kf12 \E[11;8~ to \E[24;8~
#
+# Add cvvis <werner@suse.de>
mlterm|multi lingual terminal emulator, mlterm|multi lingual terminal emulator,
am, eslok, km, mc5i, mir, msgr, npc, xenl, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
colors#8, cols#80, it#8, lines#24, pairs#64, colors#8, cols#80, it#8, lines#24, pairs#64,
- acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
@ -518,7 +547,7 @@
home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
@@ -3885,6 +3920,7 @@ mlterm+pcfkeys|fragment for PC-style fke @@ -4037,6 +4071,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
# rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
# Since rxvt is not really compatible with xterm, it should be configured as # Since rxvt is not really compatible with xterm, it should be configured as
# "rxvt" or "rxvt-color". # "rxvt" or "rxvt-color".
@ -526,7 +555,7 @@
# #
# removed dch/dch1 because they are inconsistent with bce/ech -TD # removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD # remove km as per tack test -TD
@@ -3896,13 +3932,14 @@ rxvt-basic|rxvt terminal base (X Window @@ -4048,13 +4083,14 @@ rxvt-basic|rxvt terminal base (X Window
clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
@ -544,7 +573,7 @@
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
rmul=\E[24m, rmul=\E[24m,
rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
@@ -3911,7 +3948,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -4063,7 +4099,7 @@ rxvt-basic|rxvt terminal base (X Window
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
@ -553,7 +582,7 @@
# Key Codes from rxvt reference: # Key Codes from rxvt reference:
# #
# Note: Shift + F1-F10 generates F11-F20 # Note: Shift + F1-F10 generates F11-F20
@@ -3994,8 +4031,8 @@ rxvt-basic|rxvt terminal base (X Window @@ -4146,8 +4182,8 @@ rxvt-basic|rxvt terminal base (X Window
# Removed kDN6, etc (control+shift) since rxvt does not implement this -TD # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
rxvt+pcfkeys|fragment for PC-style fkeys, rxvt+pcfkeys|fragment for PC-style fkeys,
kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
@ -564,8 +593,8 @@
kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
@@ -4033,6 +4070,29 @@ rxvt-cygwin-native|rxvt terminal emulato @@ -4185,6 +4221,29 @@ rxvt-cygwin-native|rxvt terminal emulato
acsc=0\333+\257\,\256-\^`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376, acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin, use=rxvt-cygwin,
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 +# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
@ -594,7 +623,7 @@
# This variant is supposed to work with rxvt 2.7.7 when compiled with # This variant is supposed to work with rxvt 2.7.7 when compiled with
# NO_BRIGHTCOLOR defined. rxvt needs more work... # NO_BRIGHTCOLOR defined. rxvt needs more work...
rxvt-16color|xterm with 16 colors like aixterm, rxvt-16color|xterm with 16 colors like aixterm,
@@ -4050,7 +4110,7 @@ mrxvt|multitabbed rxvt, @@ -4212,7 +4271,7 @@ mrxvt-256color|multitabbed rxvt with 256
# Eterm 0.9.3 # Eterm 0.9.3
# #
# removed kf0 which conflicts with kf10 -TD # removed kf0 which conflicts with kf10 -TD
@ -603,7 +632,7 @@
# Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT
# but does otherwise follow the rxvt+pcfkeys model -TD # but does otherwise follow the rxvt+pcfkeys model -TD
# remove nonworking flash -TD # remove nonworking flash -TD
@@ -4064,13 +4124,13 @@ Eterm|Eterm-color|Eterm with xterm-style @@ -4226,13 +4285,13 @@ Eterm|Eterm-color|Eterm with xterm-style
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -619,7 +648,7 @@
kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
@@ -4440,7 +4500,7 @@ pty|4bsd pseudo teletype, @@ -4604,7 +4663,7 @@ pty|4bsd pseudo teletype,
smso=\Ea$, smul=\Ea!, use=cbunix, smso=\Ea$, smul=\Ea!, use=cbunix,
# The codes supported by the term.el terminal emulation in GNU Emacs 19.30 # The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@ -628,7 +657,7 @@
am, mir, xenl, am, mir, xenl,
cols#80, lines#24, cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
@@ -4453,6 +4513,13 @@ eterm|gnu emacs term.el terminal emulati @@ -4617,6 +4676,13 @@ eterm|gnu emacs term.el terminal emulati
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
smul=\E[4m, smul=\E[4m,
@ -642,7 +671,7 @@
# The codes supported by the term.el terminal emulation in GNU Emacs 22.2 # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
@@ -4501,7 +4568,7 @@ screen|VT 100/ANSI X3.64 virtual termina @@ -4665,7 +4731,7 @@ screen|VT 100/ANSI X3.64 virtual termina
cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
@ -651,7 +680,7 @@
kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
@@ -4633,7 +4700,7 @@ screen2|old VT 100/ANSI X3.64 virtual te @@ -4842,7 +4908,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL,
@ -660,7 +689,7 @@
kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH,
nel=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, nel=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
@@ -6352,7 +6419,7 @@ hp700-wy|HP700/41 emulating wyse30, @@ -6561,7 +6627,7 @@ hp700-wy|HP700/41 emulating wyse30,
ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@ -669,7 +698,7 @@
am, da, db, xhp, am, da, db, xhp,
cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA,
@@ -9483,6 +9550,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit @@ -9692,6 +9758,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
# at support for the VT320 itself. # at support for the VT320 itself.
# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
# (vt320-k3: I added <rmam>/<smam> based on the init string -- esr) # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -677,7 +706,7 @@
vt320-k3|MS-Kermit 3.00's vt320 emulation, vt320-k3|MS-Kermit 3.00's vt320 emulation,
am, eslok, hs, km, mir, msgr, xenl, am, eslok, hs, km, mir, msgr, xenl,
cols#80, it#8, lines#49, pb#9600, vt#3, cols#80, it#8, lines#49, pb#9600, vt#3,
@@ -9492,7 +9560,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio @@ -9701,7 +9768,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -686,7 +715,7 @@
dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l, flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
@@ -13767,7 +13835,7 @@ ibm3101|i3101|IBM 3101-10, @@ -13976,7 +14043,7 @@ ibm3101|i3101|IBM 3101-10,
cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
el=\EI, home=\EH, hts=\E0, ind=^J, kcub1=\ED, kcud1=\EB, el=\EI, home=\EH, hts=\E0, ind=^J, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH, kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
@ -695,7 +724,7 @@
is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B,
sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162, sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162,
@@ -13995,7 +14063,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De @@ -14204,7 +14271,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m, sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
tbc=\E[3g, tbc=\E[3g,
@ -705,19 +734,19 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- ncurses/Makefile.in
+++ ncurses/Makefile.in 2010-01-12 10:45:12.143429507 +0000 +++ ncurses/Makefile.in 2010-10-11 13:57:42.000000000 +0000
@@ -185,7 +185,7 @@ $(DESTDIR)$(libdir) : @@ -200,7 +200,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
./fallback.c : $(tinfo)/MKfallback.sh ./fallback.c : $(tinfo)/MKfallback.sh
- sh -e $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ - sh -e $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ @TIC_PATH@ $(FALLBACK_LIST) >$@
+ sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ + sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ @TIC_PATH@ $(FALLBACK_LIST) >$@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000 +++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000
@@ -1791,6 +1791,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ @@ -1866,6 +1866,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_
extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int); extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int);
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -742,7 +771,7 @@
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2006-05-18 14:07:15.000000000 +0000 +++ ncurses/tinfo/MKfallback.sh 2006-05-18 14:07:15.000000000 +0000
@@ -57,6 +57,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -755,7 +784,7 @@
cat <<EOF cat <<EOF
/* /*
* DO NOT EDIT THIS FILE BY HAND! It is generated by MKfallback.sh. * DO NOT EDIT THIS FILE BY HAND! It is generated by MKfallback.sh.
@@ -76,7 +82,7 @@ EOF @@ -87,7 +93,7 @@ EOF
for x in $* for x in $*
do do
echo "/* $x */" echo "/* $x */"
@ -764,7 +793,7 @@
done done
cat <<EOF cat <<EOF
@@ -87,7 +93,7 @@ EOF @@ -98,7 +104,7 @@ EOF
for x in $* for x in $*
do do
echo "$comma /* $x */" echo "$comma /* $x */"
@ -774,18 +803,18 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2006-05-18 14:07:15.000000000 +0000 +++ ncurses/tinfo/access.c 2010-10-11 13:57:42.000000000 +0000
@@ -37,6 +37,9 @@ @@ -36,6 +36,9 @@
#include <sys/stat.h>
#include <tic.h> #include <tic.h>
#include <nc_alloc.h>
+#ifdef linux +#ifdef linux
+# include <sys/fsuid.h> +# include <sys/fsuid.h>
+#endif +#endif
MODULE_ID("$Id: access.c,v 1.15 2009/04/05 00:03:10 tom Exp $") MODULE_ID("$Id: access.c,v 1.16 2010/01/23 17:57:43 tom Exp $")
@@ -106,6 +109,30 @@ _nc_basename(char *path) @@ -105,6 +108,30 @@ _nc_basename(char *path)
return path + _nc_pathlast(path); return path + _nc_pathlast(path);
} }
@ -818,7 +847,7 @@
{ {
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2006-05-18 15:52:22.000000000 +0000 +++ ncurses/tinfo/lib_setup.c 2006-05-18 15:52:22.000000000 +0000
@@ -557,6 +557,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) @@ -551,6 +551,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
if ((env = getenv("NCURSES_NO_UTF8_ACS")) != 0) { if ((env = getenv("NCURSES_NO_UTF8_ACS")) != 0) {
return atoi(env); return atoi(env);
} else if ((env = getenv("TERM")) != 0) { } else if ((env = getenv("TERM")) != 0) {
@ -848,7 +877,7 @@
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2006-05-18 14:07:15.000000000 +0000 +++ ncurses/tinfo/read_termcap.c 2006-05-18 14:07:15.000000000 +0000
@@ -324,14 +324,18 @@ _nc_getent( @@ -323,14 +323,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
(void) lseek(fd, (off_t) 0, SEEK_SET); (void) lseek(fd, (off_t) 0, SEEK_SET);
@ -874,7 +903,7 @@
myfd = TRUE; myfd = TRUE;
} }
lineno = 0; lineno = 0;
@@ -1102,8 +1106,10 @@ _nc_read_termcap_entry(const char *const @@ -1101,8 +1105,10 @@ _nc_read_termcap_entry(const char *const
for (i = 0; i < filecount; i++) { for (i = 0; i < filecount; i++) {
T(("Looking for %s in %s", tn, termpaths[i])); T(("Looking for %s in %s", tn, termpaths[i]));
@ -885,7 +914,7 @@
_nc_set_source(termpaths[i]); _nc_set_source(termpaths[i]);
/* /*
@@ -1115,6 +1121,7 @@ _nc_read_termcap_entry(const char *const @@ -1114,6 +1120,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp); (void) fclose(fp);
} }

82
ncurses.changes
View File

@ -1,3 +1,85 @@
-------------------------------------------------------------------
Tue Oct 12 16:32:10 CEST 2010 - werner@suse.de
- Enforce the correct libraries for tic to generate the fallback.c
-------------------------------------------------------------------
Tue Oct 12 13:53:32 CEST 2010 - werner@suse.de
- Avoid libncursest6 by re-enabling weak symbol for pthread_kill()
- Fix broken manual page terminfo(5) by disabling tbl during install
- Add ncurses*-config manual pages to file list of devel package
-------------------------------------------------------------------
Mon Oct 11 16:09:48 CEST 2010 - werner@suse.de
- Update to test version 5.7.20101009 (bnc#644831 and bnc#540571)
* correct comparison used for setting 16-colors in linux-16color
entry (Novell #644831) -TD
* improve linux-16color entry, using "dim" for color-8 which makes it
gray rather than black like color-0 -TD
* add checks in tic for inconsistent cursor-movement controls, and for
inconsistent printer-controls.
* fill in no-parameter forms of cursor-movement where a parameterized
form is available -TD
* fill in missing cursor controls where the form of the controls is
ANSI -TD
* fix inconsistent punctuation in form_variables manpage (patch by
Sven Joachim).
* add parameterized cursor-controls to linux-basic (report by Dae) -TD
* add "XT" capability to entries for terminals that support both
xterm-style mouse- and title-controls, for "screen" which
special-cases TERM beginning with "xterm" or "rxvt" -TD
* add configure check for pthread_kill(), needed for some old
platforms.
* modify nsterm, xnuppc and tek4115 to make sgr/sgr0 consistent -TD
* add check in terminfo source-reader to provide more informative
message when someone attempts to run tic on a compiled terminal
description (prompted by Debian #593920).
* note in infotocap and captoinfo manpages that they read terminal
descriptions from text-files (Debian #593920).
* improve acsc string for vt52, show arrow keys (patch by Benjamin
Sittler).
* correct a typo in mk-1st.awk (patch by Gabriele Balducci)
(cf: 20100724)
* document tabs "-0" and "-8" options in manpage.
* add a check in tic for missing set_tab if clear_all_tabs given.
* add mlterm+256color entry, for mlterm 3.0.0 -TD
* fix configure script for combining --with-pthread
and --enable-weak-symbols options.
* add configure option --enable-pthreads-eintr to control whether the
new EINTR feature is enabled.
* modify logic in pthread configuration to allow EINTR to interrupt
a read operation in wgetch() (Novell #540571, patch by Werner Fink).
* modify _nc_capcmp() to work with cancelled strings.
* correct translation of "^" in _nc_infotocap(), used to transform
terminfo to termcap strings
* simplify logic in _nc_get_screensize() to make it easier to see how
environment variables may override system- and terminfo-values
(prompted by discussion with Igor Bujna).
* add check if Gpm_Open() returns a -2, e.g., for "xterm". This is
normally suppressed but can be overridden using $NCURSES_GPM_TERMS.
Ensure that Gpm_Close() is called in this case.
* use va_copy() in _nc_printf_string() to avoid conflicting use of
va_list value in _nc_printf_length() (report by Wim Lewis).
* add several screen-bce.XXX entries -TD
* update mrxvt terminfo entry -TD
* modify win_driver.c to support mouse single-clicks.
* correct name for termlib in ncurses*-config, e.g., if it is renamed
to provide a single file for ncurses/ncursesw libraries (patch by
Miroslav Lichvar).
* for term-driver configuration, ensure that the driver pointer is
initialized in setupterm so that terminfo/termcap programs work.
* amend fix for Debian #542031 to ensure that wattrset() returns only
OK or ERR, rather than the attribute value (report by Miroslav
Lichvar).
* reorder WINDOWLIST to put WINDOW data after SCREEN pointer, making
_nc_screen_of() compatible between normal/wide libraries again (patch
by Miroslav Lichvar)
* modify win_driver.c to initialize TERMINAL struct so that programs
such as test/lrtest.c and test/ncurses.c which test string
capabilities can run.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 7 12:54:57 UTC 2010 - aj@suse.de Tue Sep 7 12:54:57 UTC 2010 - aj@suse.de

51
ncurses.spec
View File

@ -37,11 +37,11 @@ Obsoletes: ncurses-64bit
%endif %endif
# #
Version: 5.7 Version: 5.7
Release: 10 Release: 11
Summary: New curses Libraries Summary: New curses Libraries
Url: http://invisible-island.net/ncurses/ncurses.html Url: http://invisible-island.net/ncurses/ncurses.html
Source0: ncurses-%{version}.tar.bz2 Source0: ncurses-%{version}.tar.bz2
Source1: ncurses-%{version}-20100109-patch.tar.bz2 Source1: ncurses-%{version}-20101009-patch.tar.bz2
Source2: handle.linux Source2: handle.linux
Source3: README.devel Source3: README.devel
Source4: ncurses-rpmlintrc Source4: ncurses-rpmlintrc
@ -279,6 +279,10 @@ mv tack-* tack
%patch -P 6 -p0 -b .fb %patch -P 6 -p0 -b .fb
%patch -P 7 -p0 %patch -P 7 -p0
%patch -P 0 -p0 %patch -P 0 -p0
rm -vf include/ncurses_dll.h
rm -vf mkdirs.sh
rm -vf tar-copy.sh
rm -vf mk-dlls.sh
%build %build
test ! -f /.buildenv || . /.buildenv test ! -f /.buildenv || . /.buildenv
@ -335,15 +339,15 @@ mv tack-* tack
touch --reference=README config.sub config.guess touch --reference=README config.sub config.guess
%{?suse_update_config:%{suse_update_config}} %{?suse_update_config:%{suse_update_config}}
./configure --build ${RPM_ARCH}-suse-linux \ ./configure --build ${RPM_ARCH}-suse-linux \
--without-ada \
--without-debug \ --without-debug \
--without-profile \ --without-profile \
--without-manpage-tbl \
--with-shared \ --with-shared \
--with-normal \ --with-normal \
--with-manpage-format=gzip \ --with-manpage-format=gzip \
--with-manpage-renames=${PWD}/man/man_db.renames \ --with-manpage-renames=${PWD}/man/man_db.renames \
--with-manpage-aliases \ --with-manpage-aliases \
--with-manpage-tbl \
--with-fallbacks=${FALLBK} \
--with-ospeed=speed_t \ --with-ospeed=speed_t \
--with-gpm \ --with-gpm \
--with-dlsym \ --with-dlsym \
@ -377,6 +381,7 @@ mv tack-* tack
%endif %endif
--enable-weak-symbols \ --enable-weak-symbols \
--enable-wgetch-events \ --enable-wgetch-events \
--enable-pthreads-eintr \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--exec-prefix=%{_prefix}\ --exec-prefix=%{_prefix}\
--libdir=%{_libdir} \ --libdir=%{_libdir} \
@ -388,6 +393,10 @@ mv tack-* tack
--disable-tic-depends \ --disable-tic-depends \
--with-ticlib=tic --with-ticlib=tic
# #
# The configure line
#
c=$(grep '^ *$ *\./configure' config.log)
#
# This is a hack to be able to boot strap # This is a hack to be able to boot strap
# a libncurses with correct fallback.c. # a libncurses with correct fallback.c.
# #
@ -396,17 +405,21 @@ mv tack-* tack
make %{?_smp_mflags} -C progs termsort.c transform.h infocmp tic make %{?_smp_mflags} -C progs termsort.c transform.h infocmp tic
rm -f ncurses/fallback.c rm -f ncurses/fallback.c
PATH=$PWD/progs:$OPATH PATH=$PWD/progs:$OPATH
LD_LIBRARY_PATH=$PWD/lib
export LD_LIBRARY_PATH PATH
pushd ncurses/ pushd ncurses/
TERMINFO=$PWD/tmp TERMINFO=$PWD/tmp
export TERMINFO export TERMINFO
mkdir -p $TERMINFO mkdir -p $TERMINFO
sh run_cmd.sh tic -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src $PWD/../progs/tic -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src
sh run_cmd.sh tic -o $TERMINFO -s terminfo.src $PWD/../progs/tic -o $TERMINFO -s terminfo.src
make %{?_smp_mflags} fallback.c sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $PWD/../progs/tic ${FALLBK//,/ } > fallback.c
rm -rf $TERMINFO rm -rf $TERMINFO
unset TERMINFO unset TERMINFO
cp -p fallback.c ../fallback.c.backup
popd popd
PATH=$OPATH PATH=$OPATH
unset LD_LIBRARY_PATH
# #
# Refresh second install path # Refresh second install path
# #
@ -415,6 +428,8 @@ mv tack-* tack
# #
# Now rebuild libncurses and do the rest of this job # Now rebuild libncurses and do the rest of this job
# #
find -name fallback.o | xargs -r rm -vf
cp fallback.c.backup ncurses/fallback.c
make %{?_smp_mflags} make %{?_smp_mflags}
lib=%{_libdir} lib=%{_libdir}
inc=%{_incdir}/ncurses inc=%{_incdir}/ncurses
@ -429,15 +444,13 @@ mv tack-* tack
ldd ./tack ldd ./tack
popd popd
test ! -L tack || rm -f tack test ! -L tack || rm -f tack
#
# The configure line
#
c=$(grep '^ *$ *\./configure' config.log)
%if %abi < 6 %if %abi < 6
# #
# Now use --with-pthread for reentrant pthread support (abi > 5). # Now use --with-pthread for reentrant pthread support (abi > 5).
# #
eval ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs eval ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs
find -name fallback.o | xargs -r rm -vf
cp fallback.c.backup ncurses/fallback.c
make %{?_smp_mflags} make %{?_smp_mflags}
lib=%{_libdir}/ncurses6 lib=%{_libdir}/ncurses6
inc=%{_incdir}/ncurses6/ncurses inc=%{_incdir}/ncurses6/ncurses
@ -445,6 +458,9 @@ mv tack-* tack
make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib}
ln -sf ${inc##*/}/{curses,ncurses,term}.h %{root}${inc%%/*}/ ln -sf ${inc##*/}/{curses,ncurses,term}.h %{root}${inc%%/*}/
sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncurses" %{root}%{_bindir}/ncurses6-config sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncurses" %{root}%{_bindir}/ncurses6-config
pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} ../ ncurses6-config.1
popd
%endif %endif
# #
# Now use --enable-widec for UTF8/wide character support. # Now use --enable-widec for UTF8/wide character support.
@ -456,23 +472,33 @@ mv tack-* tack
%else %else
eval ./${c#*./} --disable-ext-mouse --enable-widec --disable-ext-colors --without-progs eval ./${c#*./} --disable-ext-mouse --enable-widec --disable-ext-colors --without-progs
%endif %endif
find -name fallback.o | xargs -r rm -vf
cp fallback.c.backup ncurses/fallback.c
make %{?_smp_mflags} make %{?_smp_mflags}
lib=%{_libdir} lib=%{_libdir}
inc=%{_incdir}/ncursesw inc=%{_incdir}/ncursesw
# must not use %jobs here (would lead to: ln: ncurses.h already exists) # must not use %jobs here (would lead to: ln: ncurses.h already exists)
make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib}
sh %{S:6} --cflags "-I${inc}" --libs "-lncursesw" %{root}%{_bindir}/ncursesw5-config sh %{S:6} --cflags "-I${inc}" --libs "-lncursesw" %{root}%{_bindir}/ncursesw5-config
pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} ../ ncursesw5-config.1
popd
%if %abi < 6 %if %abi < 6
# #
# Do both --enable-widec and --with-pthread (abi > 5). # Do both --enable-widec and --with-pthread (abi > 5).
# #
eval ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs eval ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs
find -name fallback.o | xargs -r rm -vf
cp fallback.c.backup ncurses/fallback.c
make %{?_smp_mflags} make %{?_smp_mflags}
lib=%{_libdir}/ncurses6 lib=%{_libdir}/ncurses6
inc=%{_incdir}/ncurses6/ncursesw inc=%{_incdir}/ncurses6/ncursesw
# must not use %jobs here (would lead to: ln: ncurses.h already exists) # must not use %jobs here (would lead to: ln: ncurses.h already exists)
make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib}
sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncursesw" %{root}%{_bindir}/ncursesw6-config sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncursesw" %{root}%{_bindir}/ncursesw6-config
pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} ../ ncursesw6-config.1
popd
%endif %endif
%install %install
@ -532,7 +558,7 @@ mv tack-* tack
mkdir -p %{buildroot}%{_miscdir} mkdir -p %{buildroot}%{_miscdir}
cd ncurses/ cd ncurses/
{ echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2" { echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2"
sh ./run_cmd.sh tic -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap $PWD/../progs/tic -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap
# Gererate new termcap entries for various linux consoles # Gererate new termcap entries for various linux consoles
TERMCAP=termcap \ TERMCAP=termcap \
TERMINFO=%{buildroot}%{_datadir}/terminfo \ TERMINFO=%{buildroot}%{_datadir}/terminfo \
@ -662,6 +688,7 @@ mv tack-* tack
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/ncurses6/lib*.a %{_libdir}/ncurses6/lib*.a
%{_libdir}/ncurses6/lib*.so %{_libdir}/ncurses6/lib*.so
%doc %{_mandir}/man1/*-config.1.gz
%doc %{_mandir}/man1/captoinfo.1.gz %doc %{_mandir}/man1/captoinfo.1.gz
%doc %{_mandir}/man1/infocmp.1.gz %doc %{_mandir}/man1/infocmp.1.gz
%doc %{_mandir}/man1/infotocap.1.gz %doc %{_mandir}/man1/infotocap.1.gz