rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2007-02-02 00:32:54 +00:00 committed by Git OBS Bridge
parent df503e6886
commit fbf2352047
11 changed files with 687 additions and 698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ncurses-5.4-wide.dif
View File

@ -1,24 +0,0 @@
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2005-07-22 12:52:22.000000000 +0200
@@ -693,8 +693,11 @@
(ch).chars[PUTC_i], &PUT_st); \
if (PUTC_ch == L'\0') \
--PUTC_n; \
- if (PUTC_n <= 0) \
+ if (PUTC_n <= 0) { \
+ if (PUTC_ch && is8bits(PUTC_ch)) \
+ putc(PUTC_ch,b); \
break; \
+ } \
fwrite(PUTC_buf, (unsigned) PUTC_n, 1, b); \
++PUTC_i; \
} while (PUTC_ch != L'\0'); \
@@ -741,7 +744,7 @@
#define ARG_CH_T NCURSES_CH_T
#define CARG_CH_T NCURSES_CH_T
#define PUTC_DATA int data = 0
-#define PUTC(a,b) do { data = CharOf(ch); putc(data,b); } while (0)
+#define PUTC(ch,b) do { data = CharOf(ch); putc(data,b); } while (0)
#define BLANK (' '|A_NORMAL)
#define ZEROS ('\0'|A_NORMAL)

3
ncurses-5.5-20060513-patch.tar.bz2
View File

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

205
ncurses-5.5-pthread.dif
View File

@ -1,205 +0,0 @@
--- ncurses/SigAction.h
+++ ncurses/SigAction.h 2006-05-18 14:31:29.000000000 +0200
@@ -55,6 +55,36 @@
typedef struct sigaction sigaction_t;
#endif
+#if defined _REENTRANT || defined _THREAD_SAFE
+# include <pthread.h>
+extern int pthread_sigmask(int, const sigset_t*, sigset_t*) __attribute__((weak));
+extern int pthread_kill(pthread_t, int) __attribute__((weak));
+extern pthread_t pthread_self(void) __attribute__((weak));
+extern int pthread_equal(pthread_t, pthread_t) __attribute__((weak));
+
+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);
+}
+#define sigprocmask _nc__sigprocmask
+
+static inline void _nc_kill(SCREEN *scan, int signal)
+{
+ if (!scan || !scan->_read_thread)
+ goto out;
+ if (!&pthread_kill || !&pthread_equal || !&pthread_self)
+ goto out;
+ if (pthread_equal(scan->_read_thread, pthread_self()))
+ goto out;
+ pthread_kill(scan->_read_thread, signal);
+out:
+ return;
+}
+#endif
+
#else /* !HAVE_SIGACTION */
#if HAVE_SIGVEC
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2006-05-18 14:31:29.000000000 +0200
@@ -48,6 +48,10 @@
#include <ncurses_dll.h>
+#if defined _REENTRANT || defined _THREAD_SAFE
+# include <pthread.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -538,6 +542,12 @@
#define _nc_windows SP->_nc_sp_windows
bool _sig_winch;
+#if USE_SIGWINCH
+ bool _unblock_sigwinch;
+#if defined _REENTRANT || defined _THREAD_SAFE
+ pthread_t _read_thread;
+#endif
+#endif
SCREEN *_next_screen;
/* hashes for old and new lines */
@@ -1143,6 +1153,9 @@
extern NCURSES_EXPORT(void) _nc_scroll_optimize (void);
extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, bool);
extern NCURSES_EXPORT(void) _nc_signal_handler (bool);
+#if USE_SIGWINCH
+extern NCURSES_EXPORT(void) _nc_unblock (SCREEN *, int);
+#endif
extern NCURSES_EXPORT(void) _nc_synchook (WINDOW *);
extern NCURSES_EXPORT(void) _nc_trace_tries (struct tries *);
--- ncurses/base/lib_getch.c
+++ ncurses/base/lib_getch.c 2006-05-18 14:31:29.000000000 +0200
@@ -237,6 +237,10 @@
if (win == 0 || SP == 0)
returnCode(ERR);
+#if USE_SIGWINCH
+ _nc_unblock(SP, SIGWINCH);
+#endif
+
if (cooked_key_in_fifo()) {
if (wgetch_should_refresh(win))
wrefresh(win);
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2006-05-18 15:24:54.000000000 +0200
@@ -42,6 +42,7 @@
#include <curses.priv.h>
#include <tic.h> /* for MAX_NAME_SIZE */
#include <term_entry.h>
+#include <SigAction.h>
#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
#define _POSIX_SOURCE
@@ -119,6 +120,13 @@
default:
/* record a SIGWINCH */
have_sigwinch = 1;
+# if defined _REENTRANT || defined _THREAD_SAFE
+ scan = _nc_screen_chain;
+ while (scan) {
+ _nc_kill(scan, SIGWINCH);
+ scan = scan->_next_screen;
+ }
+# endif
break;
case 0:
/* temporarily disable the next block */
--- ncurses/tty/lib_tstp.c
+++ ncurses/tty/lib_tstp.c 2006-05-18 15:53:04.000000000 +0200
@@ -142,6 +142,9 @@
#ifdef SIGTTOU
int sigttou_blocked;
#endif
+#if defined _REENTRANT || defined _THREAD_SAFE
+ pthread_t reader = (pthread_t)0;
+#endif
T(("tstp() called"));
@@ -169,6 +172,10 @@
(void) sigaddset(&mask, SIGALRM);
#if USE_SIGWINCH
(void) sigaddset(&mask, SIGWINCH);
+#if defined _REENTRANT || defined _THREAD_SAFE
+ reader = SP->_read_thread;
+ SP->_read_thread = (pthread_t)0;
+#endif
#endif
(void) sigprocmask(SIG_BLOCK, &mask, &omask);
@@ -214,6 +221,10 @@
sigaction(SIGTSTP, &oact, NULL);
flushinp();
+#if defined _REENTRANT || defined _THREAD_SAFE
+ SP->_read_thread = reader;
+#endif
+
/*
* If the user modified the tty state while suspended, he wants
* those changes to stick. So save the new "default" terminal state.
@@ -332,6 +343,17 @@
result = FALSE;
}
#endif
+
+#if USE_SIGWINCH
+ if (result && sig == SIGWINCH) {
+ sigset_t sigset;
+
+ sigemptyset(&sigset);
+ sigaddset(&sigset, SIGWINCH);
+ sigprocmask(SIG_BLOCK, &sigset, NULL);
+ }
+#endif
+
T(("CatchIfDefault - will %scatch %s",
result ? "" : "not ", signal_name(sig)));
return result;
@@ -386,6 +408,10 @@
CatchIfDefault(SIGINT, cleanup);
CatchIfDefault(SIGTERM, cleanup);
#if USE_SIGWINCH
+ SP->_unblock_sigwinch = false;
+# if defined _REENTRANT || defined _THREAD_SAFE
+ SP->_read_thread = (pthread_t)0;
+# endif
CatchIfDefault(SIGWINCH, sigwinch);
#endif
initialized = TRUE;
@@ -393,3 +419,29 @@
}
returnVoid;
}
+
+#if USE_SIGWINCH
+/*
+ * This is invoked once at the beginning of reading, to remember
+ * which thread should be interrupted if the SIGWINCH handler is
+ * called.
+ */
+
+NCURSES_EXPORT(void)
+_nc_unblock(SCREEN *scan, int signal)
+{
+ sigset_t sigset;
+
+ if (scan->_unblock_sigwinch)
+ return;
+ sigemptyset(&sigset);
+ sigaddset(&sigset, signal);
+ sigprocmask(SIG_UNBLOCK, &sigset, NULL);
+# if defined _REENTRANT || defined _THREAD_SAFE
+ /* Remember the terminal reading thread */
+ if (&pthread_self)
+ scan->_read_thread = pthread_self();
+# endif
+ scan->_unblock_sigwinch = true;
+}
+#endif

19
ncurses-5.5-valist.dif
View File

@ -1,19 +0,0 @@
--- ncurses/base/lib_freeall.c
+++ ncurses/base/lib_freeall.c
@@ -51,6 +51,7 @@
{
WINDOWLIST *p, *q;
char *s;
+ va_list empty_va;
T((T_CALLED("_nc_freeall()")));
#if NO_LEAKS
@@ -99,7 +100,7 @@
if ((s = _nc_home_terminfo()) != 0)
free(s);
- (void) _nc_printf_string(0, 0);
+ (void) _nc_printf_string(0, empty_va);
#ifdef TRACE
(void) _nc_trace_buf(-1, 0);
#endif

3
ncurses-5.5.tar.bz2
View File

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

3
ncurses-5.6-20070128-patch.tar.bz2 Normal file
View File

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

237
ncurses-5.6-pthread.dif Normal file
View File

@ -0,0 +1,237 @@
--- ncurses/SigAction.h
+++ ncurses/SigAction.h 2007-01-31 12:39:37.000000000 +0100
@@ -55,6 +55,53 @@
typedef struct sigaction sigaction_t;
#endif
+#if defined(__GNUC__) && defined(linux)
+# 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))
+#else
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+# error The ncurses library has to be NPTL thread safe (requires the GCC)
+# endif
+#endif
+
+#if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+# 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
+
+static inline void _nc_kill(SCREEN *scan, int signal)
+{
+ if (!scan || !scan->_read_thread)
+ goto out;
+ if (!&pthread_kill || !&pthread_equal || !&pthread_self)
+ goto out;
+ if (pthread_equal(scan->_read_thread, pthread_self()))
+ goto out;
+ pthread_kill(scan->_read_thread, signal);
+out:
+ return;
+}
+#endif
+
#else /* !HAVE_SIGACTION */
#if HAVE_SIGVEC
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2007-01-31 12:40:37.000000000 +0100
@@ -48,6 +48,10 @@
#include <ncurses_dll.h>
+#if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+# include <pthread.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -594,6 +598,11 @@ struct screen {
#define _nc_windows SP->_nc_sp_windows
bool _sig_winch;
+#if USE_SIGWINCH
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ pthread_t _read_thread;
+# endif
+#endif
SCREEN *_next_screen;
/* hashes for old and new lines */
@@ -1214,6 +1223,9 @@ extern NCURSES_EXPORT(void) _nc_scroll_o
extern NCURSES_EXPORT(void) _nc_scroll_optimize (void);
extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, bool);
extern NCURSES_EXPORT(void) _nc_signal_handler (bool);
+#if USE_SIGWINCH
+extern NCURSES_EXPORT(void) _nc_thread(SCREEN *);
+#endif
extern NCURSES_EXPORT(void) _nc_synchook (WINDOW *);
extern NCURSES_EXPORT(void) _nc_trace_tries (TRIES *);
--- ncurses/base/lib_getch.c
+++ ncurses/base/lib_getch.c 2007-01-31 12:41:27.000000000 +0100
@@ -237,6 +237,10 @@ _nc_wgetch(WINDOW *win,
if (win == 0 || SP == 0)
returnCode(ERR);
+#if USE_SIGWINCH
+ _nc_thread(SP);
+#endif
+
if (cooked_key_in_fifo()) {
if (wgetch_should_refresh(win))
wrefresh(win);
--- ncurses/base/lib_set_term.c
+++ ncurses/base/lib_set_term.c 2007-01-31 13:08:37.000000000 +0100
@@ -144,6 +144,12 @@ delscreen(SCREEN *sp)
free(sp->_setbuf);
}
+#if USE_SIGWINCH
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ sp->_read_thread = (pthread_t)0;
+# endif
+#endif
+
free(sp);
/*
@@ -559,6 +565,15 @@ _nc_setupscreen(int slines,
returnCode(ERR);
SP->_stdscr = stdscr;
+#if USE_SIGWINCH
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ if (&pthread_self)
+ SP->_read_thread = pthread_self();
+ else
+ SP->_read_thread = (pthread_t)0;
+# endif
+#endif
+
returnCode(OK);
}
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2007-01-31 11:46:17.000000000 +0100
@@ -42,6 +42,7 @@
#include <curses.priv.h>
#include <tic.h> /* for MAX_NAME_SIZE */
#include <term_entry.h>
+#include <SigAction.h>
#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
#define _POSIX_SOURCE
@@ -119,6 +120,13 @@ _nc_handle_sigwinch(int enable)
default:
/* record a SIGWINCH */
have_sigwinch = 1;
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ scan = _nc_screen_chain;
+ while (scan) {
+ _nc_kill(scan, SIGWINCH);
+ scan = scan->_next_screen;
+ }
+# endif
break;
case 0:
/* temporarily disable the next block */
--- ncurses/tty/lib_tstp.c
+++ ncurses/tty/lib_tstp.c 2007-01-31 13:14:40.000000000 +0100
@@ -142,6 +142,11 @@ tstp(int dummy GCC_UNUSED)
#ifdef SIGTTOU
int sigttou_blocked;
#endif
+#if USE_SIGWINCH
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ pthread_t reader = (pthread_t)0;
+# endif
+#endif
T(("tstp() called"));
@@ -169,6 +174,10 @@ tstp(int dummy GCC_UNUSED)
(void) sigaddset(&mask, SIGALRM);
#if USE_SIGWINCH
(void) sigaddset(&mask, SIGWINCH);
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ reader = SP->_read_thread;
+ SP->_read_thread = (pthread_t)0;
+# endif
#endif
(void) sigprocmask(SIG_BLOCK, &mask, &omask);
@@ -214,6 +223,12 @@ tstp(int dummy GCC_UNUSED)
sigaction(SIGTSTP, &oact, NULL);
flushinp();
+#if USE_SIGWINCH
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ SP->_read_thread = reader;
+# endif
+#endif
+
/*
* If the user modified the tty state while suspended, he wants
* those changes to stick. So save the new "default" terminal state.
@@ -386,6 +401,13 @@ _nc_signal_handler(bool enable)
CatchIfDefault(SIGINT, cleanup);
CatchIfDefault(SIGTERM, cleanup);
#if USE_SIGWINCH
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ if (&pthread_self && &pthread_equal) {
+ pthread_t current = pthread_self();
+ if (!pthread_equal(SP->_read_thread, current))
+ SP->_read_thread = current;
+ }
+# endif
CatchIfDefault(SIGWINCH, sigwinch);
#endif
initialized = TRUE;
@@ -393,3 +415,25 @@ _nc_signal_handler(bool enable)
}
returnVoid;
}
+
+#if USE_SIGWINCH
+/*
+ * This is invoked once at the beginning of reading, to remember
+ * which thread should be interrupted if the SIGWINCH handler is
+ * called.
+ */
+
+NCURSES_EXPORT(void)
+_nc_thread(SCREEN *scan)
+{
+# if defined(linux) && (defined(_REENTRANT) || defined(_THREAD_SAFE))
+ if (&pthread_self && &pthread_equal) {
+ pthread_t current = pthread_self();
+ if (pthread_equal(SP->_read_thread, current))
+ return;
+ /* Remember the terminal reading thread */
+ scan->_read_thread = current;
+ }
+# endif
+}
+#endif

425
ncurses-5.5.dif → ncurses-5.6.dif
View File

@ -1,14 +1,12 @@
--- .pkgextract --- .pkgextract
+++ .pkgextract 2006-05-18 16:07:14.000000000 +0200 +++ .pkgextract 2006-05-18 16:07:14.000000000 +0200
@@ -0,0 +1,5 @@ @@ -0,0 +1,3 @@
+tar Oxfj ../ncurses-5.5-20060513-patch.tar.bz2 | patch -p1 -s +tar Oxfj ../ncurses-5.6-20070128-patch.tar.bz2 | patch -p1 -s
+patch -p0 -s --suffix=.va < ../ncurses-5.3-printw.dif +patch -p0 -s --suffix=.va < ../ncurses-5.3-printw.dif
+patch -p0 -s --suffix=.wd < ../ncurses-5.4-wide.dif +patch -p0 -s --suffix=.pt < ../ncurses-5.6-pthread.dif
+patch -p0 -s --suffix=.pt < ../ncurses-5.5-pthread.dif
+patch -p0 -s --suffix=.val < ../ncurses-5.5-valist.dif
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2006-05-18 16:07:14.000000000 +0200 +++ aclocal.m4 2007-01-31 13:28:46.000000000 +0100
@@ -294,7 +294,7 @@ @@ -298,7 +298,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([
@ -17,17 +15,25 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -2734,7 +2734,8 @@ @@ -2942,12 +2942,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$source echo '? missing rename for '\$cf_source
target="\$source" cf_target="\$cf_source"
fi fi
- target="\$cf_subdir\${section}/\${target}" - cf_target="\$cf_subdir\${section}/\${cf_target}"
+for t in \$target; do -
+ t="\$cf_subdir\${section}/\${t}"
CF_EOF CF_EOF
fi fi
@@ -2772,7 +2773,7 @@ cat >>$cf_edit_man <<CF_EOF
+for t in \$cf_target; do
+ t="\$cf_subdir\${section}/\${t}"
+CF_EOF
+
+cat >>$cf_edit_man <<CF_EOF
sed -f $cf_man_alias \\
CF_EOF
@@ -2957,7 +2960,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
@ -36,20 +42,20 @@
CF_EOF CF_EOF
fi fi
@@ -2805,7 +2806,7 @@ @@ -2990,7 +2993,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
- target="\$target.$cf_so_strip" - cf_target="\$cf_target.$cf_so_strip"
+ t="\$t.$cf_so_strip" + t="\$t.$cf_so_strip"
CF_EOF CF_EOF
fi fi
@@ -2814,22 +2815,22 @@ @@ -2999,22 +3002,22 @@ 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
- target="\`echo \$target|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`" - cf_target="\`echo \$cf_target|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`"
+ t="\`echo \$t|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`" + t="\`echo \$t|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`"
fi fi
CF_EOF CF_EOF
@ -57,28 +63,28 @@
esac esac
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
- suffix=\`basename \$target | sed -e 's%^[[^.]]*%%'\` - suffix=\`basename \$cf_target | sed -e 's%^[[^.]]*%%'\`
+ suffix=\`basename \$t | sed -e 's%^[[^.]]*%%'\` + suffix=\`basename \$t | sed -e 's%^[[^.]]*%%'\`
if test \$verb = installing ; then if test \$verb = installing ; then
- echo \$verb \$target - echo \$verb \$cf_target
- \$INSTALL_DATA \$TMP \$target - \$INSTALL_DATA \$TMP \$cf_target
+ echo \$verb \$t + echo \$verb \$t
+ \$INSTALL_DATA \$TMP \$t + \$INSTALL_DATA \$TMP \$t
test -n "\$aliases" && ( test -n "\$aliases" && (
cd \$cf_subdir\${section} && ( cd \$cf_subdir\${section} && (
- source=\`echo \$target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\` - cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
+ source=\`echo \$t |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\` + cf_source=\`echo \$t |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
test -n "$cf_so_strip" && source=\`echo \$source |sed -e 's%\.$cf_so_strip\$%%'\` test -n "$cf_so_strip" && cf_source=\`echo \$cf_source |sed -e 's%\.$cf_so_strip\$%%'\`
- target=\`basename \$target\` - cf_target=\`basename \$cf_target\`
+ t=\`basename \$t\` + t=\`basename \$t\`
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -2838,15 +2839,15 @@ @@ -3023,15 +3026,15 @@ 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
- if ( cmp -s \$target \$cf_alias\${suffix} ) - if ( cmp -s \$cf_target \$cf_alias\${suffix} )
+ if ( cmp -s \$t \$cf_alias\${suffix} ) + if ( cmp -s \$t \$cf_alias\${suffix} )
then then
continue continue
@ -86,25 +92,25 @@
fi fi
echo .. \$verb alias \$cf_alias\${suffix} echo .. \$verb alias \$cf_alias\${suffix}
rm -f \$cf_alias\${suffix} rm -f \$cf_alias\${suffix}
- $LN_S \$target \$cf_alias\${suffix} - $LN_S \$cf_target \$cf_alias\${suffix}
- elif test "\$target" != "\$cf_alias\${suffix}" ; then - elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+ $LN_S \$t \$cf_alias\${suffix} + $LN_S \$t \$cf_alias\${suffix}
+ elif test "\$t" != "\$cf_alias\${suffix}" ; then + elif test "\$t" != "\$cf_alias\${suffix}" ; then
echo ".so \$source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -2866,8 +2867,8 @@ @@ -3051,8 +3054,8 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
- echo \$verb \$target - echo \$verb \$cf_target
- rm -f \$target - rm -f \$cf_target
+ echo \$verb \$t + echo \$verb \$t
+ rm -f \$t + rm -f \$t
test -n "\$aliases" && ( test -n "\$aliases" && (
cd \$cf_subdir\${section} && ( cd \$cf_subdir\${section} && (
for cf_alias in \$aliases for cf_alias in \$aliases
@@ -2885,6 +2886,7 @@ @@ -3070,6 +3073,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -112,37 +118,36 @@
;; ;;
esac esac
done done
@@ -3529,7 +3531,7 @@
;;
linux*|gnu*|k*bsd*-gnu)
if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+ LOCAL_LDFLAGS="-Wl,-rpath-link,`pwd`/lib"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_ld_rpath" = yes ; then
--- configure --- configure
+++ configure 2006-05-18 16:07:15.000000000 +0200 +++ configure 2007-01-31 15:37:50.000000000 +0100
@@ -5126,7 +5126,7 @@ @@ -5020,7 +5020,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat
;; ;;
linux*|gnu*|k*bsd*-gnu) linux*|gnu*|k*bsd*-gnu)
if test "$DFT_LWR_MODEL" = "shared" ; then if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib" - LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS="-Wl,-rpath-link,`pwd`/lib" + LOCAL_LDFLAGS="-Wl,-rpath-link,\$(LOCAL_LIBDIR)"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi fi
if test "$cf_cv_ld_rpath" = yes ; then if test "$cf_cv_ld_rpath" = yes ; then
@@ -8193,7 +8193,8 @@ @@ -8185,12 +8185,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$source echo '? missing rename for '\$cf_source
target="\$source" cf_target="\$cf_source"
fi fi
- target="\$cf_subdir\${section}/\${target}" - cf_target="\$cf_subdir\${section}/\${cf_target}"
+for t in \$target; do -
+ t="\$cf_subdir\${section}/\${t}"
CF_EOF CF_EOF
fi fi
@@ -8229,7 +8230,7 @@ cat >>$cf_edit_man <<CF_EOF
+for t in \$cf_target; do
+ t="\$cf_subdir\${section}/\${t}"
+CF_EOF
+
+cat >>$cf_edit_man <<CF_EOF
sed -f $cf_man_alias \\
CF_EOF
@@ -8200,7 +8203,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
@ -151,20 +156,20 @@
CF_EOF CF_EOF
fi fi
@@ -8262,7 +8263,7 @@ @@ -8233,7 +8236,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
- target="\$target.$cf_so_strip" - cf_target="\$cf_target.$cf_so_strip"
+ t="\$t.$cf_so_strip" + t="\$t.$cf_so_strip"
CF_EOF CF_EOF
fi fi
@@ -8271,22 +8272,22 @@ @@ -8242,22 +8245,22 @@ 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
- target="\`echo \$target|sed -e 's/\.[1-9]\+[a-z]*/.0/'\`" - cf_target="\`echo \$cf_target|sed -e 's/\.[1-9]\+[a-z]*/.0/'\`"
+ t="\`echo \$t|sed -e 's/\.[1-9]\+[a-z]*/.0/'\`" + t="\`echo \$t|sed -e 's/\.[1-9]\+[a-z]*/.0/'\`"
fi fi
CF_EOF CF_EOF
@ -172,28 +177,28 @@
esac esac
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
- suffix=\`basename \$target | sed -e 's%^[^.]*%%'\` - suffix=\`basename \$cf_target | sed -e 's%^[^.]*%%'\`
+ suffix=\`basename \$t | sed -e 's%^[^.]*%%'\` + suffix=\`basename \$t | sed -e 's%^[^.]*%%'\`
if test \$verb = installing ; then if test \$verb = installing ; then
- echo \$verb \$target - echo \$verb \$cf_target
- \$INSTALL_DATA \$TMP \$target - \$INSTALL_DATA \$TMP \$cf_target
+ echo \$verb \$t + echo \$verb \$t
+ \$INSTALL_DATA \$TMP \$t + \$INSTALL_DATA \$TMP \$t
test -n "\$aliases" && ( test -n "\$aliases" && (
cd \$cf_subdir\${section} && ( cd \$cf_subdir\${section} && (
- source=\`echo \$target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\` - cf_source=\`echo \$cf_target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
+ source=\`echo \$t |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\` + cf_source=\`echo \$t |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
test -n "$cf_so_strip" && source=\`echo \$source |sed -e 's%\.$cf_so_strip\$%%'\` test -n "$cf_so_strip" && cf_source=\`echo \$cf_source |sed -e 's%\.$cf_so_strip\$%%'\`
- target=\`basename \$target\` - cf_target=\`basename \$cf_target\`
+ t=\`basename \$t\` + t=\`basename \$t\`
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -8295,15 +8296,15 @@ @@ -8266,15 +8269,15 @@ 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
- if ( cmp -s \$target \$cf_alias\${suffix} ) - if ( cmp -s \$cf_target \$cf_alias\${suffix} )
+ if ( cmp -s \$t \$cf_alias\${suffix} ) + if ( cmp -s \$t \$cf_alias\${suffix} )
then then
continue continue
@ -201,25 +206,25 @@
fi fi
echo .. \$verb alias \$cf_alias\${suffix} echo .. \$verb alias \$cf_alias\${suffix}
rm -f \$cf_alias\${suffix} rm -f \$cf_alias\${suffix}
- $LN_S \$target \$cf_alias\${suffix} - $LN_S \$cf_target \$cf_alias\${suffix}
- elif test "\$target" != "\$cf_alias\${suffix}" ; then - elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+ $LN_S \$t \$cf_alias\${suffix} + $LN_S \$t \$cf_alias\${suffix}
+ elif test "\$t" != "\$cf_alias\${suffix}" ; then + elif test "\$t" != "\$cf_alias\${suffix}" ; then
echo ".so \$source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -8323,8 +8324,8 @@ @@ -8294,8 +8297,8 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
- echo \$verb \$target - echo \$verb \$cf_target
- rm -f \$target - rm -f \$cf_target
+ echo \$verb \$t + echo \$verb \$t
+ rm -f \$t + rm -f \$t
test -n "\$aliases" && ( test -n "\$aliases" && (
cd \$cf_subdir\${section} && ( cd \$cf_subdir\${section} && (
for cf_alias in \$aliases for cf_alias in \$aliases
@@ -8342,6 +8343,7 @@ @@ -8313,6 +8316,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -227,8 +232,8 @@
;; ;;
esac esac
done done
@@ -12890,7 +12892,7 @@ @@ -14081,7 +14085,7 @@ else
#line 12890 "configure" #line 14081 "configure"
#include "confdefs.h" #include "confdefs.h"
-#include <stdlib.h> -#include <stdlib.h>
@ -236,9 +241,27 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -15216,6 +15220,7 @@ if test "$with_termlib" != no ; then
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
+ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
else
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
--- configure.in
+++ configure.in 2007-01-31 15:37:34.000000000 +0100
@@ -1510,6 +1510,7 @@ if test "$with_termlib" != no ; then
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
+ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
else
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
--- form/Makefile.in --- form/Makefile.in
+++ form/Makefile.in 2006-05-18 16:07:15.000000000 +0200 +++ form/Makefile.in 2006-05-18 16:07:15.000000000 +0200
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@ CFLAGS = @CFLAGS@
CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@ CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
@ -249,7 +272,7 @@
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
--- include/Makefile.in --- include/Makefile.in
+++ include/Makefile.in 2006-05-18 16:07:15.000000000 +0200 +++ include/Makefile.in 2006-05-18 16:07:15.000000000 +0200
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@ curses.h : $(TERMINFO_CAPS) \
$(srcdir)/MKkey_defs.sh $(srcdir)/MKkey_defs.sh
cat curses.head >$@ cat curses.head >$@
AWK=$(AWK) sh $(srcdir)/MKkey_defs.sh $(TERMINFO_CAPS) >>$@ AWK=$(AWK) sh $(srcdir)/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
@ -260,7 +283,7 @@
term.h: $(TERMINFO_CAPS) MKterm.h.awk term.h: $(TERMINFO_CAPS) MKterm.h.awk
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2006-05-18 16:07:15.000000000 +0200 +++ include/curses.h.in 2006-05-18 16:07:15.000000000 +0200
@@ -113,7 +113,11 @@ @@ -120,7 +120,11 @@
* of the header incompatible. * of the header incompatible.
*/ */
#undef NCURSES_CH_T #undef NCURSES_CH_T
@ -273,7 +296,7 @@
#if @cf_cv_enable_lp64@ && defined(_LP64) #if @cf_cv_enable_lp64@ && defined(_LP64)
typedef unsigned chtype; typedef unsigned chtype;
@@ -123,6 +127,8 @@ @@ -130,6 +134,8 @@ 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
@ -282,7 +305,7 @@
#include <stdio.h> #include <stdio.h>
#include <unctrl.h> #include <unctrl.h>
#include <stdarg.h> /* we need va_list */ #include <stdarg.h> /* we need va_list */
@@ -321,16 +327,16 @@ @@ -328,16 +334,16 @@ typedef chtype attr_t; /* ...must be at
#include <libutf8.h> #include <libutf8.h>
#endif #endif
@ -304,7 +327,7 @@
#define CCHARW_MAX 5 #define CCHARW_MAX 5
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2006-05-18 16:07:15.000000000 +0200 +++ include/termcap.h.in 2006-05-18 16:07:15.000000000 +0200
@@ -46,6 +46,8 @@ @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -315,7 +338,7 @@
#undef NCURSES_CONST #undef NCURSES_CONST
--- include/tic.h --- include/tic.h
+++ include/tic.h 2006-05-18 16:07:15.000000000 +0200 +++ include/tic.h 2006-05-18 16:07:15.000000000 +0200
@@ -217,12 +217,12 @@ @@ -226,12 +226,12 @@ extern NCURSES_EXPORT(const struct name_
#define NOTFOUND ((struct name_table_entry *) 0) #define NOTFOUND ((struct name_table_entry *) 0)
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */
@ -332,18 +355,18 @@
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2006-05-18 16:07:15.000000000 +0200 +++ man/man_db.renames 2006-05-18 16:07:15.000000000 +0200
@@ -158,6 +158,8 @@ @@ -158,6 +158,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
+curs_terminfo.\\\*n terminfo.5 +curs_terminfo.\\\*n terminfo.5
+tack.1 tack.1 +tack.1 tack.1
# #
# Other cross-references: # Other:
addch.3x addch.3ncurses tack.1m tack.1
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2006-05-18 16:07:15.000000000 +0200 +++ man/ncurses.3x 2006-05-18 16:07:15.000000000 +0200
@@ -88,6 +88,10 @@ @@ -88,6 +88,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
@ -356,7 +379,7 @@
arrays of characters representing all or part of a CRT screen. A arrays of characters representing all or part of a CRT screen. A
--- menu/Makefile.in --- menu/Makefile.in
+++ menu/Makefile.in 2006-05-18 16:07:15.000000000 +0200 +++ menu/Makefile.in 2006-05-18 16:07:15.000000000 +0200
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@ CFLAGS = @CFLAGS@
CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@ CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
@ -366,8 +389,8 @@
CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2006-11-17 15:52:14.000000000 +0000 +++ misc/terminfo.src 2007-01-31 14:27:30.000000000 +0100
@@ -280,7 +280,9 @@ @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
bel=^G, cr=^M, cud1=^J, ind=^J, bel=^G, cr=^M, cud1=^J, ind=^J,
@ -378,16 +401,7 @@
gn, use=dumb, gn, use=dumb,
lpr|printer|line printer, lpr|printer|line printer,
OTbs, hc, os, OTbs, hc, os,
@@ -711,7 +713,7 @@ @@ -747,9 +749,15 @@ linux-c|linux console 1.3.6+ for older n
kspd=^Z, nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l,
rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sc=\E7,
sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
- smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g,
+ sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g,
u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\E[c,
vpa=\E[%i%p1%dd, use=klone+sgr, use=ecma+color,
@@ -737,9 +739,15 @@
# 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>.
@ -404,7 +418,7 @@
# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
linux-nic|linux with ich/ich1 suppressed for non-curses programs, linux-nic|linux with ich/ich1 suppressed for non-curses programs,
@@ -2109,6 +2117,7 @@ @@ -2141,6 +2149,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.
@ -412,7 +426,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,
@@ -2118,7 +2127,7 @@ @@ -2150,7 +2159,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,
@ -421,7 +435,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,
@@ -2266,6 +2275,7 @@ @@ -2298,6 +2307,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)
@ -429,7 +443,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,
@@ -2275,7 +2285,7 @@ @@ -2307,7 +2317,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,
@ -438,7 +452,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,
@@ -2703,13 +2713,14 @@ @@ -2740,13 +2750,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.
@ -454,15 +468,15 @@
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~,
@@ -2885,6 +2896,7 @@ @@ -2920,6 +2931,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, 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.
+# (cvvis added by werner) +# (cvvis added by werner)
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@,
@@ -2894,7 +2906,7 @@ @@ -2929,7 +2941,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,
@ -471,25 +485,9 @@
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,
@@ -3025,6 +3037,7 @@ @@ -3285,8 +3297,26 @@ xterm-noapp|xterm with cursor keys in no
kUP5=\E[1;5A, kUP6=\E[1;6A,
#
# This chunk is used for building the VT220/Sun/PC keyboard variants.
+# (cvvis added by werner)
xterm-basic|xterm terminal emulator - common (XFree86),
OTbs, am, bce, km, mc5i, mir, msgr, xenl, AX,
colors#8, cols#80, it#8, lines#24, pairs#64,
@@ -3093,6 +3106,7 @@
# SS3 \E O \217
# CSI \E [ \233
#
+# (cvvis added by werner)
xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
OTbs, am, bce, km, mc5i, mir, msgr, npc, xenl, AX,
colors#8, cols#80, it#8, lines#24, pairs#64,
@@ -3183,8 +3197,26 @@
xterm-24|vs100|xterms|xterm terminal emulator (X Window System), xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-r6, lines#24, use=xterm,
+# For SuSE Linux: Werner Fink <werner@suse.de> +# For SuSE Linux: Werner Fink <werner@suse.de>
+# Note that the modern xterm does not use escape sequences +# Note that the modern xterm does not use escape sequences
@ -514,16 +512,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.
@@ -3213,7 +3245,7 @@ @@ -3379,7 +3409,7 @@ xterm-color|nxterm|generic color xterm,
# -- MATSUMOTO Shoji)
kterm|kterm kanji terminal emulator (X window system),
eslok, hs,
- acsc=++\,\,--..00ii``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ acsc=++\,\,--..ii``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
csr=\E[%i%p1%d;%p2%dr, dsl=\E[?H, enacs=, fsl=\E[?F,
kmous=\E[M, rc=\E8, rmacs=\E(B, rmam=\E[?7l, sc=\E7,
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
@@ -3275,7 +3307,7 @@
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
@ -532,7 +521,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,
@@ -3341,10 +3373,14 @@ @@ -3468,10 +3498,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).
@ -548,7 +537,7 @@
# Konsole 1.0.1 # Konsole 1.0.1
# (formerly known as kvt) # (formerly known as kvt)
# #
@@ -3427,17 +3463,18 @@ @@ -3559,17 +3593,18 @@ konsole|KDE console window,
# #
# There are some problems with vttest: # There are some problems with vttest:
# test of character sets leaves it in line-drawing mode. # test of character sets leaves it in line-drawing mode.
@ -570,15 +559,15 @@
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>,
@@ -3477,6 +3514,7 @@ @@ -3608,6 +3643,7 @@ mlterm|multi lingual terminal emulator,
# 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" (monochrome) and "rxvt-color". # "rxvt" (monochrome) and "rxvt-color".
+# (cvvis added by werner) +# (cvvis added by werner)
# #
# removed dch/dch1 because they are inconsistent with bce/ech -TD # removed dch/dch1 because they are inconsistent with bce/ech -TD
rxvt-basic|rxvt terminal base (X Window System), # remove km as per tack test -TD
@@ -3487,13 +3525,14 @@ @@ -3619,13 +3655,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,
@ -596,27 +585,27 @@
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,
@@ -3502,7 +3541,7 @@ @@ -3634,7 +3671,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, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
- use=rxvt+pcfkeys, use=vt220+keypad, - use=rxvt+pcfkeys, use=vt220+keypad,
+ use=vt220+keypad, use=rxvt+pcfkeys, + use=vt220+keypad, use=rxvt+pcfkeys,
# Key Codes from rxvt reference: # Key Codes from rxvt reference:
# #
# Note: Shift + F1-F10 generates F11-F20 # Note: Shift + F1-F10 generates F11-F20
@@ -3573,8 +3612,8 @@ @@ -3708,8 +3745,8 @@ rxvt-basic|rxvt terminal base (X Window
# XK_KP_9 9 ESC O y # 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$, kLFT=\E[d, kNXT=\E[6$, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E2$, kLFT=\E[d,
- kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
- kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^, kend=\E[8~, - kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^,
+ kPRV=\E[5$, kRIT=\E[c, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\EOD, kcud1=\EOB,
+ kcuu1=\EOA, kdch1=\E[3~, kel=\E[8\^, kend=\E[8~, + kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kel=\E[8\^,
kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
@@ -3606,6 +3645,29 @@ @@ -3742,6 +3779,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=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,
use=rxvt-cygwin, use=rxvt-cygwin,
@ -646,45 +635,41 @@
# 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,
@@ -3613,7 +3675,7 @@ @@ -3752,7 +3812,7 @@ rxvt-16color|xterm with 16 colors like a
# Eterm 0.9.3
# From: Michael Jennings <mej@valinux.com> #
# removed kf0 which conflicts with kf10 -TD # removed kf0 which conflicts with kf10 -TD
-# remove cvvis which conflicts with cnorm -TD -# remove cvvis which conflicts with cnorm -TD
+# remove cvvis which conflicts with cnorm -TD (and re-added by werner) +# remove cvvis which conflicts with cnorm -TD (and re-added by werner)
Eterm|Eterm-color|Eterm with xterm-style color support (X Window System), # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT
am, bce, bw, eo, km, mc5i, mir, msgr, xenl, xon, # but does otherwise follow the rxvt+pcfkeys model -TD
btns#5, cols#80, it#8, lines#24, lm#0, ncv@, # remove nonworking flash -TD
@@ -3623,7 +3685,7 @@ @@ -3766,13 +3826,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,
- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, + cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
flash=\E[?5h\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J,
@@ -3631,7 +3693,7 @@ is1=\E[?47l\E>\E[?1l,
is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$, - kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
kPRV=\E[5$, kRIT=\E[c, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, + kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=\177,
- kbeg=\EOu, kbs=^H, kc1=\E[8~, kc3=\E[6~, kcbt=\E[Z, kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
+ kbeg=\EOu, kbs=\177, kc1=\E[8~, kc3=\E[6~, kcbt=\E[Z, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
kdch1=\E[3~, kel=\E[8\^, kend=\E[8~, kent=\EOM, kf1=\E[11~, @@ -4108,7 +4168,7 @@ pty|4bsd pseudo teletype,
kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
@@ -3963,7 +4025,9 @@
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
-eterm|gnu emacs term.el terminal emulation, -eterm|gnu emacs term.el terminal emulation,
+# Emacs 19.30 is different from 20, e.g. color, <werner@suse.de>
+#
+eterm-19|gnu emacs term.el terminal emulation, +eterm-19|gnu emacs term.el terminal emulation,
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,
@@ -3976,6 +4040,13 @@ @@ -4121,6 +4181,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,
@ -698,7 +683,7 @@
# Entries for use by the `screen' program by Juergen Weigert, # Entries for use by the `screen' program by Juergen Weigert,
# Michael Schroeder, Oliver Laumann. The screen and # Michael Schroeder, Oliver Laumann. The screen and
@@ -4004,7 +4075,7 @@ @@ -4149,7 +4216,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@,
@ -707,18 +692,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,
@@ -4023,6 +4094,10 @@ @@ -4265,7 +4332,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
bce, use=screen,
screen-s|VT 100/ANSI X3.64 virtual terminal with hardstatus line,
dsl=\E_\E\\, fsl=\E\\, tsl=\E_, use=screen,
+# Screen entry for support of 256 colors
+screen-256color|VT 100/ANSI X3.64 virtual terminal with 256 colors,
+ colors#256, pairs#32767, setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
+ use=screen,
# Read the fine manpage:
# When screen tries to figure out a terminal name for
@@ -4079,7 +4154,7 @@
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,
@ -727,7 +701,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,
@@ -5814,7 +5889,7 @@ @@ -5998,7 +6065,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,
@ -736,7 +710,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,
@@ -8945,6 +9020,7 @@ @@ -9129,6 +9196,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)
@ -744,7 +718,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,
@@ -8954,7 +9030,7 @@ @@ -9138,7 +9206,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,
@ -753,7 +727,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,
@@ -13229,7 +13305,7 @@ @@ -13413,7 +13481,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,
@ -762,7 +736,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,
@@ -13457,7 +13533,7 @@ @@ -13641,7 +13709,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,
@ -772,8 +746,8 @@
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 2006-05-18 16:07:15.000000000 +0200 +++ ncurses/Makefile.in 2007-01-31 13:34:38.000000000 +0100
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@ CFLAGS = @CFLAGS@
INCDIR = $(srcdir)/../include INCDIR = $(srcdir)/../include
CPPFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) @CPPFLAGS@ CPPFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) @CPPFLAGS@
@ -782,18 +756,18 @@
BUILD_CPPFLAGS = -I../include @BUILD_CPPFLAGS@ BUILD_CPPFLAGS = -I../include @BUILD_CPPFLAGS@
BUILD_CC = @BUILD_CC@ BUILD_CC = @BUILD_CC@
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
fallback.c : $(tinfo)/MKfallback.sh ./fallback.c : $(tinfo)/MKfallback.sh
- sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ - sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@
+ sh $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ + sh $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@
lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
sh $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ sh $(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 16:07:15.000000000 +0200 +++ ncurses/curses.priv.h 2006-05-18 16:07:15.000000000 +0200
@@ -1133,6 +1133,8 @@ @@ -1202,6 +1202,8 @@ extern NCURSES_EXPORT(WINDOW *) _nc_make
extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t); extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t);
extern NCURSES_EXPORT(char *) _nc_trace_bufcat (int, const char *); extern NCURSES_EXPORT(char *) _nc_trace_bufcat (int, const char *);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -818,7 +792,7 @@
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2006-05-18 16:07:15.000000000 +0200 +++ ncurses/tinfo/MKfallback.sh 2006-05-18 16:07:15.000000000 +0200
@@ -57,6 +57,12 @@ @@ -57,6 +57,12 @@ else
tmp_info= tmp_info=
fi fi
@ -831,7 +805,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.
@@ -77,7 +83,7 @@ @@ -77,7 +83,7 @@ EOF
for x in $* for x in $*
do do
echo "/* $x */" echo "/* $x */"
@ -840,7 +814,7 @@
done done
cat <<EOF cat <<EOF
@@ -88,7 +94,7 @@ @@ -88,7 +94,7 @@ EOF
for x in $* for x in $*
do do
echo "$comma /* $x */" echo "$comma /* $x */"
@ -851,17 +825,17 @@
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2006-05-18 16:07:15.000000000 +0200 +++ ncurses/tinfo/access.c 2006-05-18 16:07:15.000000000 +0200
@@ -33,6 +33,9 @@ @@ -36,6 +36,9 @@
#include <curses.priv.h>
#include <tic.h> #include <tic.h>
#include <nc_alloc.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.10 2003/07/05 19:31:28 tom Exp $") MODULE_ID("$Id: access.c,v 1.12 2006/08/05 17:18:14 tom Exp $")
@@ -88,6 +91,30 @@ @@ -106,6 +109,30 @@ _nc_basename(char *path)
return path + _nc_pathlast(path); return path + _nc_pathlast(path);
} }
@ -894,7 +868,7 @@
{ {
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2006-05-18 17:52:22.000000000 +0200 +++ ncurses/tinfo/lib_setup.c 2006-05-18 17:52:22.000000000 +0200
@@ -458,6 +458,9 @@ @@ -432,6 +432,9 @@ _nc_locale_breaks_acs(void)
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) {
@ -906,15 +880,15 @@
if (strstr(env, "screen") != 0 if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c --- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2006-05-18 16:07:15.000000000 +0200 +++ ncurses/tinfo/read_entry.c 2006-05-18 16:07:15.000000000 +0200
@@ -388,6 +388,7 @@ @@ -366,6 +366,7 @@ _nc_read_file_entry(const char *const fi
{ int limit;
int code, fd = -1; char buffer[MAX_ENTRY_SIZE + 1];
+ _nc_fsid(); + _nc_fsid();
if (_nc_access(filename, R_OK) < 0 if (_nc_access(filename, R_OK) < 0
|| (fd = open(filename, O_RDONLY | O_BINARY)) < 0) { || (fd = open(filename, O_RDONLY | O_BINARY)) < 0) {
T(("cannot open terminfo %s (errno=%d)", filename, errno)); T(("cannot open terminfo %s (errno=%d)", filename, errno));
@@ -399,6 +400,7 @@ @@ -382,6 +383,7 @@ _nc_read_file_entry(const char *const fi
} }
close(fd); close(fd);
} }
@ -924,7 +898,7 @@
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2006-05-18 16:07:15.000000000 +0200 +++ ncurses/tinfo/read_termcap.c 2006-05-18 16:07:15.000000000 +0200
@@ -326,14 +326,18 @@ @@ -319,14 +319,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);
@ -950,7 +924,7 @@
myfd = TRUE; myfd = TRUE;
} }
lineno = 0; lineno = 0;
@@ -1091,8 +1095,10 @@ @@ -1097,8 +1101,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]));
@ -961,7 +935,7 @@
_nc_set_source(termpaths[i]); _nc_set_source(termpaths[i]);
/* /*
@@ -1104,6 +1110,7 @@ @@ -1110,6 +1116,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp); (void) fclose(fp);
} }
@ -971,7 +945,7 @@
if (copied != 0) if (copied != 0)
--- panel/Makefile.in --- panel/Makefile.in
+++ panel/Makefile.in 2006-05-18 16:07:15.000000000 +0200 +++ panel/Makefile.in 2006-05-18 16:07:15.000000000 +0200
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@ CFLAGS = @CFLAGS@
CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@ CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
@ -980,26 +954,9 @@
CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
--- progs/tic.c
+++ progs/tic.c 2006-05-18 16:07:19.000000000 +0200
@@ -794,7 +794,14 @@
* precisely what's needed (see comp_parse.c).
*/
+#if 0
TERMINAL *cur_term; /* tweak to avoid linking lib_cur_term.c */
+/*
+ * Commented out because I do not see what this is for:
+ * at linking time libncurses(lib_cur_term.o) overrides this commen symbol.
+ * Werner <werner@suse.de>
+ */
+#endif
#undef CUR
#define CUR tp->
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2006-05-18 16:07:19.000000000 +0200 +++ test/test.priv.h 2006-05-18 16:07:19.000000000 +0200
@@ -436,12 +436,12 @@ @@ -429,12 +429,12 @@ extern int optind;
#endif #endif
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */

3
ncurses-5.6.tar.bz2 Normal file
View File

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

7
ncurses.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 31 19:27:11 CET 2007 - werner@suse.de
- Update to 5.6-20070128
- Split of tack a its own sub package to be able to specify the
different licenses of ncurses and tack (bug #231835)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 17 16:34:56 CET 2006 - werner@suse.de Fri Nov 17 16:34:56 CET 2006 - werner@suse.de

84
ncurses.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ncurses (Version 5.5) # spec file for package ncurses (Version 5.6)
# #
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -15,21 +15,19 @@ Name: ncurses
BuildRequires: ed gcc-c++ BuildRequires: ed gcc-c++
%define terminfo() %{_datadir}/%{0}/%{1} %define terminfo() %{_datadir}/%{0}/%{1}
%define tabset() %{_datadir}/%{0}/%{1} %define tabset() %{_datadir}/%{0}/%{1}
License: GNU General Public License (GPL), Other License(s), see package License: X11/MIT
Group: System/Libraries Group: System/Libraries
Autoreqprov: on Autoreqprov: on
Version: 5.5 Version: 5.6
Release: 40 Release: 1
Summary: New curses Libraries Summary: New curses Libraries
Source0: ncurses-%{version}.tar.bz2 Source0: ncurses-%{version}.tar.bz2
Url: http://invisible-island.net/ncurses/ncurses.html Url: http://invisible-island.net/ncurses/ncurses.html
Source1: ncurses-%{version}-20060513-patch.tar.bz2 Source1: ncurses-%{version}-20070128-patch.tar.bz2
Source2: handle.linux Source2: handle.linux
Patch0: ncurses-%{version}.dif Patch0: ncurses-%{version}.dif
Patch1: ncurses-5.3-printw.dif Patch1: ncurses-5.3-printw.dif
Patch2: ncurses-5.4-wide.dif Patch2: ncurses-5.6-pthread.dif
Patch3: ncurses-5.5-pthread.dif
Patch4: ncurses-5.5-valist.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -45,34 +43,38 @@ Authors:
-------- --------
Zeyd M. Ben-Halim <zmbenhal@netcom.com> Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Eric S. Raymond <esr@thyrsus.com> Eric S. Raymond <esr@thyrsus.com>
Thomas Dickey <dickey@clark.net> Thomas E. Dickey <dickey@invisible-island.net>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de> Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Pavel Curtis
%package -n terminfo %package -n terminfo
Summary: A terminal descriptions database Summary: A terminal descriptions database
License: Public Domain, Freeware
Group: System/Base Group: System/Base
Autoreqprov: on Autoreqprov: on
%description -n terminfo %description -n terminfo
This is the terminfo reference database, maintained by Eric Raymond. This is the terminfo reference database, maintained in the ncurses
This database is the official successor to the 4.4BSD termcap file and package. This database is the official successor to the 4.4BSD termcap
contains information about any known terminal. The ncurses library file and contains information about any known terminal. The ncurses
makes use of this database to use terminals correctly. If you just use library makes use of this database to use terminals correctly. If you
the Linux console, xterm, and VT100, you probably will not need this just use the Linux console, xterm, and VT100, you probably will not
database -- a minimal /usr/share/terminfo tree for these terminals is need this database -- a minimal /usr/share/terminfo tree for these
already included in the ncurses package. terminals is already included in the ncurses package.
Authors: Authors:
-------- --------
Eric S. Raymond <esr@thyrsus.com> Eric S. Raymond <esr@thyrsus.com>
Thomas E. Dickey <dickey@invisible-island.net>
%package -n ncurses-devel %package -n ncurses-devel
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
License: X11/MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: ncurses:/usr/include/ncurses.h Provides: ncurses:/usr/include/ncurses.h
Requires: ncurses = %{version}-%{release} Requires: ncurses = %{version}-%{release}, /usr/bin/tack
Autoreqprov: on Autoreqprov: on
%description -n ncurses-devel %description -n ncurses-devel
@ -85,16 +87,37 @@ Authors:
-------- --------
Zeyd M. Ben-Halim <zmbenhal@netcom.com> Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Eric S. Raymond <esr@thyrsus.com> Eric S. Raymond <esr@thyrsus.com>
Thomas Dickey <dickey@clark.net> Thomas E. Dickey <dickey@invisible-island.net>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de> Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Pavel Curtis
%package -n tack
Summary: Terminfo action checker
License: GNU General Public License (GPL)
Group: Development/Tools/Building
Provides: ncurses-devel:/usr/bin/tack
Requires: ncurses = %{version}-%{release}
Autoreqprov: on
%description -n tack
This package contains the tack utility to help to build a new terminfo
entry describing an unknown terminal. It can also be used to test the
correctness of an existing entry, and to develop the correct pad
timings needed to ensure that screen updates do not fall behind the
incoming data stream.
Authors:
--------
Daniel Weaver <danw@znyx.com>
Eric S. Raymond <esr@thyrsus.com>
%prep %prep
%setup -q -n ncurses-%{version} -b0 %setup -q -n ncurses-%{version} -b0
tar Oxfj %{SOURCE1} | patch -p1 -s tar Oxfj %{SOURCE1} | patch -p1 -s
%patch -P 1 -p0 -b .va %patch -P 1 -p0 -b .va
%patch -P 2 -p0 -b .wd %patch -P 2 -p0 -b .pt
%patch -P 3 -p0 -b .pt
%patch -P 4 -p0 -b .val
%patch -P 0 -p0 %patch -P 0 -p0
%build %build
@ -138,6 +161,10 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
# No --enable-xmc-glitch because this seems to break yast2 # No --enable-xmc-glitch because this seems to break yast2
# on console/konsole (no magic cookie support on those?) # on console/konsole (no magic cookie support on those?)
# #
# No --with-termlib=tinfo because libncurses depend on
# libtinfo (is linked with) and therefore there is no
# advantage about splitting of a libtinfo (IMHO).
#
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 \
@ -170,6 +197,7 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
--mandir=${MANDIR} \ --mandir=${MANDIR} \
--includedir=${INCDIR} \ --includedir=${INCDIR} \
"${WITHCHTYPE}" \ "${WITHCHTYPE}" \
--with-ticlib=tic \
--with-install-prefix=${RPM_BUILD_ROOT} --with-install-prefix=${RPM_BUILD_ROOT}
# #
# This is a hack to be able to boot strap # This is a hack to be able to boot strap
@ -317,10 +345,10 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
%files -n ncurses-devel %files -n ncurses-devel
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/ncurses*-config
/usr/bin/captoinfo /usr/bin/captoinfo
/usr/bin/infocmp /usr/bin/infocmp
/usr/bin/infotocap /usr/bin/infotocap
/usr/bin/tack
/usr/bin/tic /usr/bin/tic
/usr/include/*.h /usr/include/*.h
/usr/%{_lib}/lib*.a /usr/%{_lib}/lib*.a
@ -328,15 +356,23 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
%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
%doc %{_mandir}/man1/tack.1.gz
%doc %{_mandir}/man1/tic.1.gz %doc %{_mandir}/man1/tic.1.gz
%doc %{_mandir}/man3/*.gz %doc %{_mandir}/man3/*.gz
%doc %{_mandir}/man7/*.gz %doc %{_mandir}/man7/*.gz
%files -n tack
%defattr(-,root,root)
/usr/bin/tack
%doc %{_mandir}/man1/tack.1.gz
%files -f extension.list -n terminfo %files -f extension.list -n terminfo
%defattr(-,root,root) %defattr(-,root,root)
%changelog -n ncurses %changelog -n ncurses
* Wed Jan 31 2007 - werner@suse.de
- Update to 5.6-20070128
- Split of tack a its own sub package to be able to specify the
different licenses of ncurses and tack (bug #231835)
* Fri Nov 17 2006 - werner@suse.de * Fri Nov 17 2006 - werner@suse.de
- Revert broken change for rxvt from patchlevel 20051015 (#221259) - Revert broken change for rxvt from patchlevel 20051015 (#221259)
* Wed Nov 15 2006 - werner@suse.de * Wed Nov 15 2006 - werner@suse.de