From a76d3e453bb5c28edb9edf8d0f4d96c21008aea5c71caed8b10d16d1e0c12847 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 14 Jan 2010 14:17:59 +0000 Subject: [PATCH] Accepting request 29358 from Base:System Copy from Base:System/ncurses based on submit request 29358 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/29358 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=26 --- ncurses-5.6-20080804-patch.tar.bz2 | 3 - ncurses-5.6-fallback.dif | 8 +- ncurses-5.6-gpm.dif | 39 --- ncurses-5.6-overwrite.dif | 14 - ncurses-5.6-pthread.dif | 316 ------------------ ncurses-5.6.tar.bz2 | 3 - ncurses-5.7-20100109-patch.tar.bz2 | 3 + ncurses-5.7-gpm.dif | 26 ++ ncurses-5.7-overwrite.dif | 12 + ...s-5.3-printw.dif => ncurses-5.7-printw.dif | 14 +- ncurses-5.6-tack.dif => ncurses-5.7-tack.dif | 6 +- ncurses-5.6.dif => ncurses-5.7.dif | 300 +++++++---------- ncurses-5.7.tar.bz2 | 3 + ncurses.changes | 147 ++++++++ ncurses.spec | 71 ++-- tack-1.06.tar.bz2 | 3 - tack-1.07.tar.bz2 | 3 + 17 files changed, 370 insertions(+), 601 deletions(-) delete mode 100644 ncurses-5.6-20080804-patch.tar.bz2 delete mode 100644 ncurses-5.6-gpm.dif delete mode 100644 ncurses-5.6-overwrite.dif delete mode 100644 ncurses-5.6-pthread.dif delete mode 100644 ncurses-5.6.tar.bz2 create mode 100644 ncurses-5.7-20100109-patch.tar.bz2 create mode 100644 ncurses-5.7-gpm.dif create mode 100644 ncurses-5.7-overwrite.dif rename ncurses-5.3-printw.dif => ncurses-5.7-printw.dif (78%) rename ncurses-5.6-tack.dif => ncurses-5.7-tack.dif (62%) rename ncurses-5.6.dif => ncurses-5.7.dif (78%) create mode 100644 ncurses-5.7.tar.bz2 delete mode 100644 tack-1.06.tar.bz2 create mode 100644 tack-1.07.tar.bz2 diff --git a/ncurses-5.6-20080804-patch.tar.bz2 b/ncurses-5.6-20080804-patch.tar.bz2 deleted file mode 100644 index 64a026a..0000000 --- a/ncurses-5.6-20080804-patch.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf49c5db276114b8158ac969b51ae2d6e80c9e2bddc4bf6a4d28db929ac3a46c -size 507144 diff --git a/ncurses-5.6-fallback.dif b/ncurses-5.6-fallback.dif index 2cbc731..5e10118 100644 --- a/ncurses-5.6-fallback.dif +++ b/ncurses-5.6-fallback.dif @@ -1,8 +1,6 @@ -Index: ncurses/tinfo/lib_setup.c -=================================================================== ---- ncurses/tinfo/lib_setup.c.orig -+++ ncurses/tinfo/lib_setup.c -@@ -563,7 +563,7 @@ _nc_setupterm(NCURSES_CONST char *tname, +--- ncurses/tinfo/lib_setup.c ++++ ncurses/tinfo/lib_setup.c 2008-11-14 18:54:38.539715994 +0100 +@@ -566,7 +566,7 @@ _nc_setupterm(NCURSES_CONST char *tname, const TERMTYPE *fallback = _nc_fallback(tname); if (fallback) { diff --git a/ncurses-5.6-gpm.dif b/ncurses-5.6-gpm.dif deleted file mode 100644 index 132ee31..0000000 --- a/ncurses-5.6-gpm.dif +++ /dev/null @@ -1,39 +0,0 @@ -Index: ncurses/base/lib_mouse.c -=================================================================== ---- ncurses/base/lib_mouse.c.orig -+++ ncurses/base/lib_mouse.c -@@ -359,6 +359,11 @@ enable_xterm_mouse(SCREEN *sp, int enabl - static int - allow_gpm_mouse(void) - { -+#ifdef weak_symbol -+ /* Danger Robinson: do not use dlopen for libgpm if already loaded */ -+ if ((Gpm_Wgetch)) -+ return FALSE; -+#endif - /* GPM does printf's without checking if stdout is a terminal */ - if (isatty(fileno(stdout))) { - char *env = getenv("TERM"); -@@ -366,7 +371,7 @@ allow_gpm_mouse(void) - * it should pass xterm events through. There is no real advantage - * in allowing GPM to do this. - */ -- if (env == 0 || strncmp(env, "xterm", 5)) -+ if (env == 0 || strncmp(env, "linux", 5) == 0) - return TRUE; - } - return FALSE; -Index: ncurses/curses.priv.h -=================================================================== ---- ncurses/curses.priv.h.orig -+++ ncurses/curses.priv.h -@@ -487,6 +487,9 @@ typedef struct { - #if USE_GPM_SUPPORT - #undef buttons /* term.h defines this, and gpm uses it! */ - #include -+#ifdef weak_symbol -+weak_symbol(Gpm_Wgetch); -+#endif - - #ifdef HAVE_LIBDL - /* link dynamically to GPM */ diff --git a/ncurses-5.6-overwrite.dif b/ncurses-5.6-overwrite.dif deleted file mode 100644 index 2bb1183..0000000 --- a/ncurses-5.6-overwrite.dif +++ /dev/null @@ -1,14 +0,0 @@ -Make ncurses-config report the correct directory for ncurses.h. - -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -5336,6 +5336,7 @@ else - fi; - echo "$as_me:5337: result: $with_overwrite" >&5 - echo "${ECHO_T}$with_overwrite" >&6 -+WITH_OVERWRITE="$with_overwrite" - - echo "$as_me:5340: checking if external terminfo-database is used" >&5 - echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.6-pthread.dif b/ncurses-5.6-pthread.dif deleted file mode 100644 index ca7682e..0000000 --- a/ncurses-5.6-pthread.dif +++ /dev/null @@ -1,316 +0,0 @@ -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -9310,6 +9310,7 @@ if test "$with_pthread" = "yes" ; then - EOF - - enable_reentrant=yes -+ PTHREAD=-lpthread - fi - - # Reentrant code has to be opaque; there's little advantage to making ncurses -@@ -9333,7 +9334,8 @@ if test "$with_reentrant" = yes ; then - cf_cv_enable_opaque="NCURSES_INTERNALS" - NCURSES_OPAQUE=1 - NCURSES_SIZE_T=int -- LIB_SUFFIX="t${LIB_SUFFIX}" -+# remove pthread library from $LIBS -+LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ ]//g' -e 's/-lpthread$//'` - cat >>confdefs.h <<\EOF - #define USE_REENTRANT 1 - EOF -@@ -16785,6 +16787,7 @@ s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLO - s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t - s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t - s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t -+s,@PTHREAD@,$PTHREAD,;t t - s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t - s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t - s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -972,9 +972,11 @@ test "$with_colorfgbg" = yes && AC_DEFIN - # This is still experimental (20080329), but should ultimately be moved to - # the script-block --with-normal, etc. - CF_WITH_PTHREAD -+AC_SUBST(PTHREAD) - if test "$with_pthread" = "yes" ; then - AC_DEFINE(USE_PTHREADS) - enable_reentrant=yes -+ PTHREAD=-lpthread - fi - - # Reentrant code has to be opaque; there's little advantage to making ncurses -@@ -992,7 +994,7 @@ if test "$with_reentrant" = yes ; then - cf_cv_enable_opaque="NCURSES_INTERNALS" - NCURSES_OPAQUE=1 - NCURSES_SIZE_T=int -- LIB_SUFFIX="t${LIB_SUFFIX}" -+ CF_REMOVE_LIB(LIBS,$LIBS,pthread) - AC_DEFINE(USE_REENTRANT) - CF_NCURSES_ABI_6 - else -Index: ncurses/curses.priv.h -=================================================================== ---- ncurses/curses.priv.h.orig -+++ ncurses/curses.priv.h -@@ -330,6 +330,7 @@ NCURSES_EXPORT(int *) _nc_ptr_Cols (void - - #if USE_REENTRANT - #include -+extern NCURSES_EXPORT(void) _nc_init_pthreads(void); - extern NCURSES_EXPORT(void) _nc_mutex_init(pthread_mutex_t *); - extern NCURSES_EXPORT(int) _nc_mutex_lock(pthread_mutex_t *); - extern NCURSES_EXPORT(int) _nc_mutex_trylock(pthread_mutex_t *); -@@ -337,11 +338,43 @@ extern NCURSES_EXPORT(int) _nc_mutex_unl - #define _nc_lock_global(name) _nc_mutex_lock(&_nc_globals.mutex_##name) - #define _nc_try_global(name) _nc_mutex_trylock(&_nc_globals.mutex_##name) - #define _nc_unlock_global(name) _nc_mutex_unlock(&_nc_globals.mutex_##name) -+#define FORCE_PTHREADS 0 - - #else - #error POSIX threads requires --enable-reentrant option - #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)) -+# ifdef USE_PTHREADS -+# undef FORCE_PTHREADS -+# define FORCE_PTHREADS 1 -+# endif -+#endif -+ -+#ifdef USE_PTHREADS -+# if FORCE_PTHREADS -+weak_symbol(pthread_sigmask); -+weak_symbol(pthread_self); -+weak_symbol(pthread_equal); -+weak_symbol(pthread_mutex_init); -+weak_symbol(pthread_mutex_lock); -+weak_symbol(pthread_mutex_unlock); -+weak_symbol(pthread_mutex_trylock); -+weak_symbol(pthread_mutexattr_settype); -+extern NCURSES_EXPORT(int) _nc_sigprocmask(int, const sigset_t *, sigset_t *); -+# undef sigprocmask -+# define sigprocmask _nc_sigprocmask -+# endif -+#endif -+ - #if HAVE_NANOSLEEP - #undef HAVE_NANOSLEEP - #define HAVE_NANOSLEEP 0 /* nanosleep suspends all threads */ -@@ -349,6 +382,7 @@ extern NCURSES_EXPORT(int) _nc_mutex_unl - - #else /* !USE_PTHREADS */ - -+#define _nc_init_pthreads() /* nothing */ - #define _nc_mutex_init(obj) /* nothing */ - - #define _nc_lock_global(name) /* nothing */ -@@ -616,10 +650,12 @@ typedef struct { - #endif /* TRACE */ - - #ifdef USE_PTHREADS -- pthread_mutex_t mutex_curses; -- pthread_mutex_t mutex_tst_tracef; -- pthread_mutex_t mutex_tracef; -- int nested_tracef; -+ pthread_mutex_t mutex_curses; -+ pthread_mutex_t mutex_tst_tracef; -+ pthread_mutex_t mutex_tracef; -+ int nested_tracef; -+ int use_pthreads; -+#define _nc_use_pthreads _nc_globals.use_pthreads - #endif - } NCURSES_GLOBALS; - -Index: ncurses/base/lib_getch.c -=================================================================== ---- ncurses/base/lib_getch.c.orig -+++ ncurses/base/lib_getch.c -@@ -260,7 +260,7 @@ recur_wrefresh(WINDOW *win) - { - #ifdef USE_PTHREADS - SCREEN *sp = _nc_screen_of(win); -- if (sp != SP) { -+ if (_nc_use_pthreads && sp != SP) { - SCREEN *save_SP; - - /* temporarily switch to the window's screen to check/refresh */ -@@ -286,7 +286,7 @@ recur_wgetnstr(WINDOW *win, char *buf) - - if (sp != 0) { - #ifdef USE_PTHREADS -- if (sp != SP) { -+ if (_nc_use_pthreads && sp != SP) { - SCREEN *save_SP; - - /* temporarily switch to the window's screen to get cooked input */ -Index: ncurses/base/lib_initscr.c -=================================================================== ---- ncurses/base/lib_initscr.c.orig -+++ ncurses/base/lib_initscr.c -@@ -57,7 +57,9 @@ initscr(void) - START_TRACE(); - T((T_CALLED("initscr()"))); - -+ _nc_init_pthreads(); - _nc_lock_global(curses); -+ - /* Portable applications must not call initscr() more than once */ - if (!_nc_globals.init_screen) { - _nc_globals.init_screen = TRUE; -Index: ncurses/base/lib_newterm.c -=================================================================== ---- ncurses/base/lib_newterm.c.orig -+++ ncurses/base/lib_newterm.c -@@ -130,6 +130,7 @@ newterm(NCURSES_CONST char *name, FILE * - START_TRACE(); - T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp)); - -+ _nc_init_pthreads(); - _nc_lock_global(curses); - - current = SP; -Index: ncurses/tinfo/lib_data.c -=================================================================== ---- ncurses/tinfo/lib_data.c.orig -+++ ncurses/tinfo/lib_data.c -@@ -181,6 +181,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_ - PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */ - PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */ - 0, /* nested_tracef */ -+ 0, /* use_pthreads */ - #endif - }; - -@@ -248,6 +249,27 @@ init_global_mutexes(void) - } - } - -+NCURSES_EXPORT(void) -+_nc_init_pthreads(void) -+{ -+ if (_nc_use_pthreads) -+ return; -+# if FORCE_PTHREADS -+ if ((pthread_mutex_init) == 0) -+ return; -+ if ((pthread_mutex_lock) == 0) -+ return; -+ if ((pthread_mutex_unlock) == 0) -+ return; -+ if ((pthread_mutex_trylock) == 0) -+ return; -+ if ((pthread_mutexattr_settype) == 0) -+ return; -+# endif -+ _nc_use_pthreads = 1; -+ init_global_mutexes(); -+} -+ - /* - * Use recursive mutexes if we have them - they're part of Unix98. - * For the cases where we do not, _nc_mutex_trylock() is used to avoid a -@@ -262,6 +284,8 @@ _nc_mutex_init(pthread_mutex_t * obj) - { - pthread_mutexattr_t recattr; - -+ if (_nc_use_pthreads == 0) -+ return; - memset(&recattr, 0, sizeof(recattr)); - pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init(obj, &recattr); -@@ -270,21 +294,39 @@ _nc_mutex_init(pthread_mutex_t * obj) - NCURSES_EXPORT(int) - _nc_mutex_lock(pthread_mutex_t * obj) - { -- init_global_mutexes(); -+ if (_nc_use_pthreads == 0) -+ return 0; - return pthread_mutex_lock(obj); - } - - NCURSES_EXPORT(int) - _nc_mutex_trylock(pthread_mutex_t * obj) - { -- init_global_mutexes(); -+ if (_nc_use_pthreads == 0) -+ return 0; - return pthread_mutex_trylock(obj); - } - - NCURSES_EXPORT(int) - _nc_mutex_unlock(pthread_mutex_t * obj) - { -- init_global_mutexes(); -+ if (_nc_use_pthreads == 0) -+ return 0; - return pthread_mutex_unlock(obj); - } -+ -+#if FORCE_PTHREADS -+/* -+ * NB: sigprocmask(2) is global but pthread_sigmask(3p) -+ * only for the calling thread. -+ */ -+NCURSES_EXPORT(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); -+} -+#endif - #endif /* USE_PTHREADS */ -Index: ncurses/tinfo/lib_options.c -=================================================================== ---- ncurses/tinfo/lib_options.c.orig -+++ ncurses/tinfo/lib_options.c -@@ -245,7 +245,7 @@ _nc_keypad(SCREEN *sp, bool flag) - * has wgetch() reading in more than one thread. putp() and below - * may use SP explicitly. - */ -- if (sp != SP) { -+ if (_nc_use_pthreads && sp != SP) { - SCREEN *save_sp; - - /* cannot use use_screen(), since that is not in tinfo library */ -Index: ncurses/trace/lib_trace.c -=================================================================== ---- ncurses/trace/lib_trace.c.orig -+++ ncurses/trace/lib_trace.c -@@ -180,6 +180,9 @@ _nc_va_tracef(const char *fmt, va_list a - * Rather than add the complication of a per-thread stack, just - * show the thread-id in each line of the trace. - */ -+# if FORCE_PTHREADS -+ if ((pthread_self)) -+# endif - fprintf(TraceFP, "%#lx:", (long) pthread_self()); - #endif - if (before || after) { -Index: test/Makefile.in -=================================================================== ---- test/Makefile.in.orig -+++ test/Makefile.in -@@ -95,7 +95,7 @@ LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TES - LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT) - - # use these for linking with the (n)curses library --LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) -+LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@ - LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES) - - # use these for linking with the tinfo library if we have it, or curses library if not diff --git a/ncurses-5.6.tar.bz2 b/ncurses-5.6.tar.bz2 deleted file mode 100644 index 738c9ae..0000000 --- a/ncurses-5.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b93eddefaddb052dbd43b1e68d690a8f4119f2b8c8aa446e8a4a210bccbf3ef -size 1792977 diff --git a/ncurses-5.7-20100109-patch.tar.bz2 b/ncurses-5.7-20100109-patch.tar.bz2 new file mode 100644 index 0000000..949f250 --- /dev/null +++ b/ncurses-5.7-20100109-patch.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af9d8830e1c8de01b6f67676d9db443c7389507f2dfbb8e9c3d50d0046dd70bb +size 596685 diff --git a/ncurses-5.7-gpm.dif b/ncurses-5.7-gpm.dif new file mode 100644 index 0000000..86499aa --- /dev/null +++ b/ncurses-5.7-gpm.dif @@ -0,0 +1,26 @@ +--- ncurses/base/lib_mouse.c ++++ ncurses/base/lib_mouse.c 2010-01-12 10:24:16.223429669 +0000 +@@ -380,6 +380,11 @@ allow_gpm_mouse(void) + { + bool result = FALSE; + ++#ifdef weak_symbol ++ /* Danger Robinson: do not use dlopen for libgpm if already loaded */ ++ if ((Gpm_Wgetch)) ++ return FALSE; ++#endif + /* GPM does printf's without checking if stdout is a terminal */ + if (isatty(fileno(stdout))) { + char *list = getenv("NCURSES_GPM_TERMS"); +--- ncurses/curses.priv.h ++++ ncurses/curses.priv.h 2008-04-11 15:33:59.000000000 +0000 +@@ -608,6 +608,9 @@ typedef struct { + #if USE_GPM_SUPPORT + #undef buttons /* term.h defines this, and gpm uses it! */ + #include ++#ifdef weak_symbol ++weak_symbol(Gpm_Wgetch); ++#endif + + #ifdef HAVE_LIBDL + /* link dynamically to GPM */ diff --git a/ncurses-5.7-overwrite.dif b/ncurses-5.7-overwrite.dif new file mode 100644 index 0000000..5910375 --- /dev/null +++ b/ncurses-5.7-overwrite.dif @@ -0,0 +1,12 @@ +Make ncurses-config report the correct directory for ncurses.h. + +--- configure 2007/10/29 13:59:32 1.9 ++++ configure 2007/10/29 14:18:12 +@@ -5679,6 +5679,7 @@ + fi; + echo "$as_me:5680: result: $with_overwrite" >&5 + echo "${ECHO_T}$with_overwrite" >&6 ++WITH_OVERWRITE="$with_overwrite" + + echo "$as_me:5683: checking if external terminfo-database is used" >&5 + echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.3-printw.dif b/ncurses-5.7-printw.dif similarity index 78% rename from ncurses-5.3-printw.dif rename to ncurses-5.7-printw.dif index aa7bfe9..9d76762 100644 --- a/ncurses-5.3-printw.dif +++ b/ncurses-5.7-printw.dif @@ -1,7 +1,5 @@ -Index: ncurses/base/lib_printw.c -=================================================================== ---- ncurses/base/lib_printw.c.orig -+++ ncurses/base/lib_printw.c +--- ncurses/base/lib_printw.c ++++ ncurses/base/lib_printw.c 2010-01-12 10:51:29.975429869 +0100 @@ -48,10 +48,12 @@ printw(const char *fmt,...) int code; @@ -27,9 +25,9 @@ Index: ncurses/base/lib_printw.c + va_copy(argq, argp); + va_start(argq, fmt); T((T_CALLED("wprintw(%p,%s%s)"), -- win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); +- (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); - va_end(argp); -+ win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); ++ (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); + va_end(argq); #endif @@ -59,9 +57,9 @@ Index: ncurses/base/lib_printw.c + va_copy(argq, argp); + va_start(argq, fmt); T((T_CALLED("mvwprintw(%d,%d,%p,%s%s)"), -- y, x, win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); +- y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); - va_end(argp); -+ y, x, win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); ++ y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); + va_end(argq); #endif diff --git a/ncurses-5.6-tack.dif b/ncurses-5.7-tack.dif similarity index 62% rename from ncurses-5.6-tack.dif rename to ncurses-5.7-tack.dif index 2e87708..2f89fd0 100644 --- a/ncurses-5.6-tack.dif +++ b/ncurses-5.7-tack.dif @@ -1,7 +1,5 @@ -Index: tack-1.06/Makefile.in -=================================================================== ---- tack-1.06/Makefile.in.orig -+++ tack-1.06/Makefile.in +--- tack/Makefile.in ++++ tack/Makefile.in 2008-08-14 13:57:00.930682483 +0200 @@ -98,7 +98,7 @@ ABI_VERSION = @cf_cv_abi_version@ LOCAL_LIBDIR = @top_builddir@/lib diff --git a/ncurses-5.6.dif b/ncurses-5.7.dif similarity index 78% rename from ncurses-5.6.dif rename to ncurses-5.7.dif index e64f3d7..931fc08 100644 --- a/ncurses-5.6.dif +++ b/ncurses-5.7.dif @@ -1,7 +1,5 @@ -Index: .pkgextract -=================================================================== ---- /dev/null -+++ .pkgextract +--- .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 @@ -14,11 +12,9 @@ Index: .pkgextract +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 -Index: aclocal.m4 -=================================================================== ---- aclocal.m4.orig -+++ aclocal.m4 -@@ -391,7 +391,7 @@ AC_MSG_CHECKING([for size of bool]) +--- aclocal.m4 ++++ aclocal.m4 2008-04-08 15:08:00.000000000 +0000 +@@ -477,7 +477,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out AC_TRY_RUN([ @@ -27,7 +23,7 @@ Index: aclocal.m4 #include #if defined(__cplusplus) -@@ -3124,12 +3124,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -3234,9 +3237,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -8408,9 +8411,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < @@ -261,7 +255,17 @@ Index: configure #include #if defined(__cplusplus) -@@ -15799,12 +15803,13 @@ if test "$with_termlib" != no ; then +@@ -17219,6 +17223,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 + # the next lines are needed for linking libtic over libncurses + TINFO_NAME=${LIB_NAME} +--- configure.in ++++ configure.in 2010-01-12 10:42:14.975430227 +0000 +@@ -1787,6 +1787,7 @@ if test "$with_termlib" != no ; then TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi @@ -269,49 +273,19 @@ Index: configure else # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} - TINFO_SUFFIX=${DFT_LIB_SUFFIX} - TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX} -- TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" -+ TICS_LIST="$SHLIB_LIST" - - TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" - fi -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -1624,12 +1624,13 @@ 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 - # the next lines are needed for linking libtic over libncurses - TINFO_NAME=${LIB_NAME} - TINFO_SUFFIX=${DFT_LIB_SUFFIX} - TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX} -- TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" -+ TICS_LIST="$SHLIB_LIST" - - TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" - fi -Index: include/curses.h.in -=================================================================== ---- include/curses.h.in.orig -+++ include/curses.h.in -@@ -137,6 +137,8 @@ typedef unsigned @cf_cv_typeof_chtype@ c +--- include/curses.h.in ++++ include/curses.h.in 2008-04-09 13:44:07.000000000 +0000 +@@ -144,6 +144,8 @@ typedef unsigned @cf_cv_typeof_chtype@ c typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t; #endif +#include +#include #include - #include #include /* we need va_list */ -Index: include/termcap.h.in -=================================================================== ---- include/termcap.h.in.orig -+++ include/termcap.h.in + #ifdef _XOPEN_SOURCE_EXTENDED +--- include/termcap.h.in ++++ include/termcap.h.in 2006-05-18 14:07:15.000000000 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -321,11 +295,9 @@ Index: include/termcap.h.in #include #undef NCURSES_CONST -Index: include/tic.h -=================================================================== ---- include/tic.h.orig -+++ include/tic.h -@@ -211,12 +211,12 @@ extern NCURSES_EXPORT(const struct alias +--- include/tic.h ++++ include/tic.h 2006-05-18 14:07:15.000000000 +0000 +@@ -225,12 +225,12 @@ extern NCURSES_EXPORT(const struct alias #define NOTFOUND ((struct name_table_entry *) 0) /* out-of-band values for representing absent capabilities */ @@ -340,11 +312,9 @@ Index: include/tic.h #define CANCELLED_NUMERIC (-2) #define CANCELLED_STRING (char *)(-1) -Index: man/man_db.renames -=================================================================== ---- man/man_db.renames.orig -+++ man/man_db.renames -@@ -161,6 +161,8 @@ tput.1 tput.1 +--- man/man_db.renames ++++ man/man_db.renames 2006-05-18 14:07:15.000000000 +0000 +@@ -163,6 +163,8 @@ tput.1 tput.1 tset.1 tset.1 vprintf.3s vprintf.3 wresize.3x wresize.3ncurses @@ -353,11 +323,9 @@ Index: man/man_db.renames # # Other: tack.1m tack.1 -Index: man/ncurses.3x -=================================================================== ---- man/ncurses.3x.orig -+++ man/ncurses.3x -@@ -97,6 +97,10 @@ after the shell environment variable \fB +--- man/ncurses.3x ++++ man/ncurses.3x 2006-05-18 14:07:15.000000000 +0000 +@@ -110,6 +110,10 @@ after the shell environment variable \fB \fBtset(1)\fR is usually responsible for doing this. [See \fBterminfo\fR(\*n) for further details.] .PP @@ -368,23 +336,19 @@ Index: man/ncurses.3x The \fBncurses\fR library permits manipulation of data structures, called \fIwindows\fR, which can be thought of as two-dimensional arrays of characters representing all or part of a CRT screen. -Index: misc/ncurses-config.in -=================================================================== ---- misc/ncurses-config.in.orig -+++ misc/ncurses-config.in -@@ -78,7 +78,7 @@ while test $# -gt 0; do - if test "${prefix}/include" != /usr/include ; then - INCS="-I${prefix}/include" +--- misc/ncurses-config.in ++++ misc/ncurses-config.in 2010-01-12 10:43:30.679929564 +0000 +@@ -75,7 +75,7 @@ while test $# -gt 0; do + if test "${includedir}" != /usr/include ; then + INCS="-I${includedir}" fi -- if test "@WITH_OVERWRITE@" != no ; then +- if test "x@WITH_OVERWRITE@" = xno ; then + if test "${THIS%[0-5]*}" != ncurses ; then - INCS="$INCS -I${prefix}/include/${THIS}" + INCS="$INCS -I${includedir}/${THIS}" fi sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO -Index: misc/terminfo.src -=================================================================== ---- misc/terminfo.src.orig -+++ misc/terminfo.src +--- misc/terminfo.src ++++ misc/terminfo.src 2010-01-12 10:44:35.359430067 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -396,7 +360,7 @@ Index: misc/terminfo.src gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -757,9 +759,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -791,9 +793,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 # get a block cursor for cvvis. # reported by Frank Heckenbach . @@ -411,9 +375,9 @@ Index: misc/terminfo.src - cvvis=\E[?25h\E[?8c, use=linux-c-nc, + cvvis=\E[?25h\E[?0c, use=linux-c-nc, - # 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, -@@ -2151,6 +2159,7 @@ vt132|DEC vt132, + # Subject: linux 2.6.26 vt back_color_erase + # Changes to the Linux console driver broke bce model as reported in +@@ -2229,6 +2237,7 @@ vt132|DEC vt132, # 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. # PF1--PF4 are used as F1--F4. @@ -421,7 +385,7 @@ Index: misc/terminfo.src # vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, OTbs, OTpt, am, mir, xenl, xon, -@@ -2160,7 +2169,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -2238,7 +2247,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, 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, @@ -430,7 +394,7 @@ Index: misc/terminfo.src 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/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, -@@ -2308,6 +2317,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -2386,6 +2395,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -438,7 +402,7 @@ Index: misc/terminfo.src vt320|vt300|dec vt320 7 bit terminal, am, eslok, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -2317,7 +2327,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -2395,7 +2405,7 @@ vt320|vt300|dec vt320 7 bit terminal, 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, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -447,12 +411,12 @@ Index: misc/terminfo.src 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, il1=\E[L, ind=\ED, -@@ -2751,13 +2761,14 @@ putty-vt100|VT100+ keyboard layout, +@@ -2829,13 +2839,14 @@ putty-vt100|VT100+ keyboard layout, # 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 # user resizes the window with the mouse. +# (cvvis added by werner) - teraterm|Tera Term Pro, + teraterm2.3|Tera Term Pro, km, xon@, ncv#43, vt@, acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, @@ -463,7 +427,7 @@ Index: misc/terminfo.src 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, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -2931,6 +2942,7 @@ xterm-r6|xterm-old|xterm X11R6 version, +@@ -3031,6 +3042,7 @@ xterm-r6|xterm-old|xterm X11R6 version, use=vt100+enq, # 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. @@ -471,7 +435,7 @@ Index: misc/terminfo.src xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, cols#80, it#8, lines#24, ncv@, -@@ -2940,7 +2952,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -3040,7 +3052,7 @@ xterm-xf86-v32|xterm terminal emulator ( 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, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -480,7 +444,7 @@ Index: misc/terminfo.src 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, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -3372,8 +3384,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -3480,8 +3492,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -507,7 +471,7 @@ Index: misc/terminfo.src use=xterm-new, # These entries allow access to the X titlebar and icon name as a status line. -@@ -3466,7 +3496,7 @@ xterm-color|nxterm|generic color xterm, +@@ -3574,7 +3604,7 @@ xterm-color|nxterm|generic color xterm, op=\E[m, use=xterm-r6, use=klone+color, # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -516,7 +480,7 @@ Index: misc/terminfo.src bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -3567,10 +3597,14 @@ mgt|Multi GNOME Terminal, +@@ -3710,10 +3740,14 @@ mgt|Multi GNOME Terminal, # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -532,7 +496,7 @@ Index: misc/terminfo.src # Konsole 1.0.1 # (formerly known as kvt) # -@@ -3673,17 +3707,18 @@ konsole-256color|KDE console window with +@@ -3824,17 +3858,18 @@ 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~ # @@ -554,7 +518,7 @@ Index: misc/terminfo.src 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, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, -@@ -3734,6 +3769,7 @@ mlterm+pcfkeys|fragment for PC-style fke +@@ -3885,6 +3920,7 @@ mlterm+pcfkeys|fragment for PC-style fke # 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 # "rxvt" or "rxvt-color". @@ -562,7 +526,7 @@ Index: misc/terminfo.src # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -3745,13 +3781,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -3896,13 +3932,14 @@ rxvt-basic|rxvt terminal base (X Window clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, 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, @@ -580,7 +544,7 @@ Index: misc/terminfo.src rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, -@@ -3760,7 +3797,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -3911,7 +3948,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%;, 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, @@ -589,7 +553,7 @@ Index: misc/terminfo.src # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -3843,8 +3880,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -3994,8 +4031,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -600,7 +564,7 @@ Index: misc/terminfo.src kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, -@@ -3880,6 +3917,29 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -4033,6 +4070,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, use=rxvt-cygwin, @@ -630,7 +594,7 @@ Index: misc/terminfo.src # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|xterm with 16 colors like aixterm, -@@ -3897,7 +3957,7 @@ mrxvt|multitabbed rxvt, +@@ -4050,7 +4110,7 @@ mrxvt|multitabbed rxvt, # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -639,7 +603,7 @@ Index: misc/terminfo.src # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # but does otherwise follow the rxvt+pcfkeys model -TD # remove nonworking flash -TD -@@ -3911,13 +3971,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -4064,13 +4124,13 @@ Eterm|Eterm-color|Eterm with xterm-style 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, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -655,7 +619,7 @@ Index: misc/terminfo.src 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, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -4253,7 +4313,7 @@ pty|4bsd pseudo teletype, +@@ -4440,7 +4500,7 @@ pty|4bsd pseudo teletype, smso=\Ea$, smul=\Ea!, use=cbunix, # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -664,7 +628,7 @@ Index: misc/terminfo.src am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -4266,6 +4326,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -4453,6 +4513,13 @@ eterm|gnu emacs term.el terminal emulati 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, smul=\E[4m, @@ -676,9 +640,9 @@ Index: misc/terminfo.src + setab=\E[%p1%{40}%+%dm, setaf=\E[%p1%{30}%+%dm, + use=eterm-19, - # Entries for use by the `screen' program by Juergen Weigert, - # Michael Schroeder, Oliver Laumann. The screen and -@@ -4294,7 +4361,7 @@ screen|VT 100/ANSI X3.64 virtual termina + # 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, +@@ -4501,7 +4568,7 @@ screen|VT 100/ANSI X3.64 virtual termina 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, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, @@ -687,7 +651,7 @@ Index: misc/terminfo.src kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, -@@ -4424,7 +4491,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -4633,7 +4700,7 @@ screen2|old VT 100/ANSI X3.64 virtual te 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, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -696,7 +660,7 @@ Index: misc/terminfo.src kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, 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, -@@ -6157,7 +6224,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -6352,7 +6419,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -705,7 +669,7 @@ Index: misc/terminfo.src am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -9288,6 +9355,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -9483,6 +9550,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # (vt320-k3: I added / based on the init string -- esr) @@ -713,7 +677,7 @@ Index: misc/terminfo.src vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -9297,7 +9365,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -9492,7 +9560,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio 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, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -722,7 +686,7 @@ Index: misc/terminfo.src 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, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, -@@ -13572,7 +13640,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -13767,7 +13835,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH, @@ -731,7 +695,7 @@ Index: misc/terminfo.src 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%;, sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162, -@@ -13800,7 +13868,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -13995,7 +14063,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%;, sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, @@ -740,24 +704,20 @@ Index: misc/terminfo.src acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, -Index: ncurses/Makefile.in -=================================================================== ---- ncurses/Makefile.in.orig -+++ ncurses/Makefile.in -@@ -183,7 +183,7 @@ $(DESTDIR)$(libdir) : +--- ncurses/Makefile.in ++++ ncurses/Makefile.in 2010-01-12 10:45:12.143429507 +0000 +@@ -185,7 +185,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ ./fallback.c : $(tinfo)/MKfallback.sh -- sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ -+ sh $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ +- sh -e $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ ++ sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ $(FALLBACK_LIST) >$@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h - sh $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ -Index: ncurses/curses.priv.h -=================================================================== ---- ncurses/curses.priv.h.orig -+++ ncurses/curses.priv.h -@@ -1586,6 +1586,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ + sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ +--- ncurses/curses.priv.h ++++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000 +@@ -1791,6 +1791,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(int) _nc_access (const char *, int); @@ -766,10 +726,8 @@ Index: ncurses/curses.priv.h extern NCURSES_EXPORT(int) _nc_baudrate (int); extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); -Index: ncurses/run_cmd.sh -=================================================================== ---- /dev/null -+++ ncurses/run_cmd.sh +--- ncurses/run_cmd.sh ++++ ncurses/run_cmd.sh 2006-05-18 14:07:15.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -782,10 +740,8 @@ Index: ncurses/run_cmd.sh +export PATH LD_LIBRARY_PATH + +exec ${1+"$@"} -Index: ncurses/tinfo/MKfallback.sh -=================================================================== ---- ncurses/tinfo/MKfallback.sh.orig -+++ ncurses/tinfo/MKfallback.sh +--- ncurses/tinfo/MKfallback.sh ++++ ncurses/tinfo/MKfallback.sh 2006-05-18 14:07:15.000000000 +0000 @@ -57,6 +57,12 @@ else tmp_info= fi @@ -799,7 +755,7 @@ Index: ncurses/tinfo/MKfallback.sh cat < @@ -829,7 +783,7 @@ Index: ncurses/tinfo/access.c +# include +#endif - MODULE_ID("$Id: access.c,v 1.14 2007/11/18 00:57:53 tom Exp $") + MODULE_ID("$Id: access.c,v 1.15 2009/04/05 00:03:10 tom Exp $") @@ -106,6 +109,30 @@ _nc_basename(char *path) return path + _nc_pathlast(path); @@ -862,11 +816,9 @@ Index: ncurses/tinfo/access.c NCURSES_EXPORT(int) _nc_access(const char *path, int mode) { -Index: ncurses/tinfo/lib_setup.c -=================================================================== ---- ncurses/tinfo/lib_setup.c.orig -+++ ncurses/tinfo/lib_setup.c -@@ -470,6 +470,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) +--- ncurses/tinfo/lib_setup.c ++++ ncurses/tinfo/lib_setup.c 2006-05-18 15:52:22.000000000 +0000 +@@ -557,6 +557,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) if ((env = getenv("NCURSES_NO_UTF8_ACS")) != 0) { return atoi(env); } else if ((env = getenv("TERM")) != 0) { @@ -876,10 +828,8 @@ Index: ncurses/tinfo/lib_setup.c if (strstr(env, "linux")) return 1; /* always broken */ if (strstr(env, "screen") != 0 -Index: ncurses/tinfo/read_entry.c -=================================================================== ---- ncurses/tinfo/read_entry.c.orig -+++ ncurses/tinfo/read_entry.c +--- ncurses/tinfo/read_entry.c ++++ ncurses/tinfo/read_entry.c 2006-05-18 14:07:15.000000000 +0000 @@ -368,6 +368,7 @@ _nc_read_file_entry(const char *const fi int limit; char buffer[MAX_ENTRY_SIZE + 1]; @@ -896,11 +846,9 @@ Index: ncurses/tinfo/read_entry.c return (code); } -Index: ncurses/tinfo/read_termcap.c -=================================================================== ---- ncurses/tinfo/read_termcap.c.orig -+++ ncurses/tinfo/read_termcap.c -@@ -319,14 +319,18 @@ _nc_getent( +--- ncurses/tinfo/read_termcap.c ++++ ncurses/tinfo/read_termcap.c 2006-05-18 14:07:15.000000000 +0000 +@@ -324,14 +324,18 @@ _nc_getent( */ if (fd >= 0) { (void) lseek(fd, (off_t) 0, SEEK_SET); @@ -926,7 +874,7 @@ Index: ncurses/tinfo/read_termcap.c myfd = TRUE; } lineno = 0; -@@ -1097,8 +1101,10 @@ _nc_read_termcap_entry(const char *const +@@ -1102,8 +1106,10 @@ _nc_read_termcap_entry(const char *const for (i = 0; i < filecount; i++) { T(("Looking for %s in %s", tn, termpaths[i])); @@ -937,7 +885,7 @@ Index: ncurses/tinfo/read_termcap.c _nc_set_source(termpaths[i]); /* -@@ -1110,6 +1116,7 @@ _nc_read_termcap_entry(const char *const +@@ -1115,6 +1121,7 @@ _nc_read_termcap_entry(const char *const (void) fclose(fp); } @@ -945,11 +893,9 @@ Index: ncurses/tinfo/read_termcap.c } } if (copied != 0) -Index: test/test.priv.h -=================================================================== ---- test/test.priv.h.orig -+++ test/test.priv.h -@@ -473,12 +473,12 @@ extern int optind; +--- test/test.priv.h ++++ test/test.priv.h 2006-05-18 14:07:19.000000000 +0000 +@@ -525,12 +525,12 @@ extern char *boolnames[], *boolcodes[], #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses-5.7.tar.bz2 b/ncurses-5.7.tar.bz2 new file mode 100644 index 0000000..b94e94e --- /dev/null +++ b/ncurses-5.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94fa65f2e2eda239e87325fc56511892810166f4a262fc67576d82eb92f70047 +size 1822833 diff --git a/ncurses.changes b/ncurses.changes index 0f7cf89..1092326 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,150 @@ +------------------------------------------------------------------- +Tue Jan 12 14:25:27 CET 2010 - werner@suse.de + +- Update to test version 5.7.20100109 + * add tiparm(), based on review of X/Open Curses Issue 7. + * minor improvement to tic's checking of similar SGR's to allow for the + most common case of SGR 0. + * modify getmouse() to act as its documentation implied, returning on + each call the preceding event until none are left. When no more + events remain, it will return ERR. + * add bterm terminfo entry, based on bogl 0.1.18 -TD + * minor fix to rxvt+pcfkeys terminfo entry -TD + * update minix terminfo entry -TD + * add bw (auto-left-margin) to nsterm* entries (Benjamin Sittler) + * correct transfer of multicolumn characters in multirow + field_buffer(), which stopped at the end of the first row due to + filling of unused entries in a cchar_t array with nulls. + * updated nsterm* entries (Benjamin Sittler, Emanuele Giaquinta) + * modify _nc_viscbuf2() and _tracecchar_t2() to show wide-character nulls. + * fix case where progs/tput is used while sp-funcs is configure; this + requires save/restore of out-character function from _nc_prescreen + rather than the SCREEN structure (report by Charles Wilson). + * limit hashing for termcap-names to 2-characters (Ubuntu #481740). + * fix a regression in _nc_ripoffline which made test/ncurses.c not show + soft-keys, broken in 20090927 merging. + * update nsterm entries (patch by Benjamin C W Sittler, prompted by + discussion with Fabian Groffen in GenToo #206201). + * add test/xterm-256color.dat + * modify _nc_wgetch() to check for a -1 in the fifo, e.g., after a + SIGWINCH, and discard that value, to avoid confusing application + (patch by Eygene Ryabinkin, FreeBSD bin/136223). + * modify handling of $PKG_CONFIG_LIBDIR to use only the first item in + a possibly colon-separated list (Debian #550716). + * fix a sign-extension bug in unget_wch() (report by Mike Gran). + * remove unnecessary kcan assignment to ^C from putty (Sven Joachim) + * add ccc and initc capabilities to xterm-16color -TD + * add linux-16color + * correct initc capability of linux-c-nc end-of-range + * completed integrating "sp-funcs" by Juergen Pfeifer in ncurses + library (some work remains for forms library). + * fix typo s/is_timeout/is_notimeout/ which made "man is_notimeout" not work. + * add null-pointer checks to other opaque-functions. + * add is_pad() and is_subwin() functions for opaque access to WINDOW + (discussion with Mark Dickinson). + * correct merge to lib_newterm.c, which broke when sp-funcs was enabled. + * build-fix for building outside source-tree (report by Sven Joachim). + * fix Debian lintian warning for man/tabs.1 by making section number + agree with file-suffix (report by Sven Joachim). + * workaround for bug in g++ 4.1-4.4 warnings for wattrset() macro on + amd64 (Debian #542031). + * modify wgetch() to ensure it checks SIGWINCH when it gets an error + in non-blocking mode (patch by Clemens Ladisch). + * fix configure script option --with-database, which was coded as an + enable-type switch. + * modify lib_addch.c to compensate for removal of wide-character test + from unctrl() in 20090704 (Debian #539735). + * modify _nc_find_type_entry() to use hashing. + * modify length returned by getcchar() to count the trailing null + which is documented in X/Open (cf: 20020427). + * improve performance of tigetstr, etc., by using hashing code from tic. + * minor fixes for memory-leak checking. + * remove wide-character checks from unctrl() (patch by Clemens Ladisch). + * revise wadd_wch() and wecho_wchar() to eliminate dependency on unctrl(). + * update llib-lncurses[wt] to use sp-funcs. + * move definition for NCURSES_WRAPPED_VAR back to ncurses_dll.h, to + make includes of term.h without curses.h work (report by "Nix"). + * fix a regression in lib_tputs.c, from ongoing merges. + * fix an infinite recursion when adding a legacy-coding 8-bit value + using insch() (report by Clemens Ladisch). + * work around antique BSD game's manipulation of stdscr, etc., versus + SCREEN's copy of the pointer (Debian #528411). + * add a cast to wattrset macro to avoid compiler warning when comparing + its result against ERR (adapted from patch by Matt Kraii, Debian #528374). + * add vwmterm terminfo entry (patch by Bryan Christ). + * build fix for _nc_free_and_exit() change in 20090418 (report by Christian Ebert). + * extend ansi.sys pfkey capability from kf1-kf10 to kf1-kf48, moving + function key definitions from emx-base for consistency -TD + * improve install-rules for pc-files (patch by Miroslav Lichvar). + * make it work with $DESTDIR + * modify init_pair() to allow caller to create extra color pairs beyond + the color_pairs limit, which use default colors (request by Emanuele Giaquinta). + * fix typo "==" where "=" is needed in ncurses-config.in and + gen-pkgconfig.in files (Debian #512161). + * add screen.Eterm terminfo entry (GenToo #124887) -TD + * add case for FreeMINT to configure macro CF_XOPEN_SOURCE (patch from + GenToo #250454). + * add check in mouse-driver to disable connection if GPM returns a + zero, indicating that the connection is closed (Debian #506717, + adapted from patch by Samuel Thibault). + * turn on _XOPEN_CURSES definition in curses.h + * add eterm-color entry (report by Vincent Lefevre) -TD + * add a manpage to discuss memory leaks. + * add teraterm4.59 terminfo entry, use that as primary teraterm entry, rename + original to teraterm2.3 -TD + * update "gnome" terminfo to 2.22.3 -TD + * update "konsole" terminfo to 1.6.6, needs today's fix for tic -TD + * add "aterm" terminfo -TD + * add "linux2.6.26" terminfo -TD + * add logic to tic for cancelling strings in user-defined capabilities, + overlooked til now. + * add configure option --disable-tic-depends to make explicit whether + tic library depends on ncurses/ncursesw library, amends change from + 20080823 (prompted by Debian #501421). + * add environment variable NCURSES_GPM_TERMS to allow override to use + GPM on terminals other than "linux", etc. + * disable GPM mouse support when $TERM does not happen to contain + "linux", since Gpm_Open() no longer limits its assertion to terminals + that it might handle, e.g., within "screen" in xterm. + * fix bug in mouse code for GPM from 20080920 changes (reported in + Debian #500103, also Miroslav Lichvar). + * fix a memory leak when failure to connect to GPM. + * correct check for notimeout() in wgetch() (report on linux.redhat + newsgroup by FurtiveBertie). + * corrected fix for --enable-weak-symbols (report by Frederic L W Meunier). + * add configure check for awk programs unable to handle big-strings, + use that to improve the default for --enable-big-strings option. + * makefile-fixes for --enable-weak-symbols (report by Frederic L W Meunier). + * consistently use NCURSES_BOOL in lib_gen.c + * filter #line's from lib_gen.c + * use pthread_mutexattr_init() for initializing pthread_mutexattr_t, + makes threaded code work on HPUX 11.23 + * fix a bug in demo_menus in freeing menus (cf: 20080804). + * modify configure script for the case where tic library is used (and + possibly renamed) to remove its dependency upon ncurses/ncursew + library (patch by Dr Werner Fink). + * add Eterm-256color, Eterm-88color and rxvt-88color (prompted by + Debian #495815) -TD + * add configure option --enable-weak-symbols to turn on new feature. + * add configure-check for availability of weak symbols. + * modify linkage with pthread library to use weak symbols so that + applications not linked to that library will not use the mutexes, + etc. This relies on gcc, and may be platform-specific (patch by Dr Werner Fink). + * add note to INSTALL to document limitation of renaming of tic library + using the --with-ticlib configure option (report by Dr Werner Fink). + * document (in manpage) why tputs does not detect I/O errors (prompted + by comments by Samuel Thibault). + +------------------------------------------------------------------- +Sat Dec 12 18:35:30 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Sun Dec 6 16:40:20 CET 2009 - jengelh@medozas.de + +- enable parallel building + ------------------------------------------------------------------- Sat Nov 14 10:58:16 CET 2009 - pbaudis@suse.cz diff --git a/ncurses.spec b/ncurses.spec index 9786117..efa03d3 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ # -# spec file for package ncurses (Version 5.6) +# spec file for package ncurses (Version 5.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,23 +31,23 @@ AutoReqProv: on Obsoletes: ncurses-64bit %endif # -Version: 5.6 -Release: 92 +Version: 5.7 +Release: 1 Summary: New curses Libraries Url: http://invisible-island.net/ncurses/ncurses.html -Source0: ncurses-5.6.tar.bz2 -Source1: ncurses-%{version}-20080804-patch.tar.bz2 +Source0: ncurses-%{version}.tar.bz2 +Source1: ncurses-%{version}-20100109-patch.tar.bz2 Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc -Source5: tack-1.06.tar.bz2 +Source5: tack-1.07.tar.bz2 Source6: edit.sed +Source7: baselibs.conf Patch0: ncurses-%{version}.dif -Patch1: ncurses-5.3-printw.dif -Patch2: ncurses-5.6-pthread.dif -Patch3: ncurses-5.6-overwrite.dif -Patch4: ncurses-5.6-tack.dif -Patch5: ncurses-5.6-gpm.dif +Patch1: ncurses-5.7-printw.dif +Patch3: ncurses-5.7-overwrite.dif +Patch4: ncurses-5.7-tack.dif +Patch5: ncurses-5.7-gpm.dif Patch6: ncurses-5.6-fallback.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -238,7 +238,7 @@ Authors: %package -n tack Summary: Terminfo action checker -License: GPL v2 or later +License: GPLv2+ Group: Development/Tools/Building Provides: ncurses-devel:%{_bindir}/tack Requires: ncurses = %{version}-%{release} @@ -259,15 +259,14 @@ Authors: Eric S. Raymond %prep -%setup -q -n ncurses-%{version} -b0 +%setup -q -n ncurses-%{version} rm -fr tack rm -f Ada95/src/terminal_interface-curses.adb rm -f mkinstalldirs tar Oxfj %{S:1} | patch -p1 -s tar xfj %{S:5} -ln -sf tack-* tack +mv tack-* tack %patch -P 1 -p0 -b .va -%patch -P 2 -p0 -b .pt %patch -P 3 -p0 -b .ow %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .gpm @@ -331,6 +330,8 @@ ln -sf tack-* tack --with-normal \ --with-manpage-format=gzip \ --with-manpage-renames=${PWD}/man/man_db.renames \ + --with-manpage-aliases \ + --with-manpage-tbl \ --with-fallbacks=${FALLBK} \ --with-ospeed=speed_t \ --with-gpm \ @@ -349,17 +350,22 @@ ln -sf tack-* tack --enable-symlinks \ --enable-sigwinch \ --enable-colorfgbg \ + --enable-sp-funcs \ + --enable-term-driver \ %if %abi >= 6 --with-pthread \ + --enable-reentrant \ --enable-ext-mouse \ --disable-widec \ --enable-ext-colors \ %else --without-pthread \ + --disable-reentrant \ --disable-ext-mouse \ --disable-widec \ --disable-ext-colors \ %endif + --enable-weak-symbols \ --enable-wgetch-events \ --prefix=%{_prefix} \ --exec-prefix=%{_prefix}\ @@ -369,14 +375,15 @@ ln -sf tack-* tack --includedir=%{_incdir} \ "${WITHCHTYPE}" \ --disable-widec \ + --disable-tic-depends \ --with-ticlib=tic # # This is a hack to be able to boot strap # a libncurses with correct fallback.c. # - make -C include - make -C ncurses fallback.c FALLBACK_LIST="" - make -C progs termsort.c transform.h infocmp tic + make %{?jobs:-j%jobs} -C include + make %{?jobs:-j%jobs} -C ncurses fallback.c FALLBACK_LIST="" + make %{?jobs:-j%jobs} -C progs termsort.c transform.h infocmp tic rm -f ncurses/fallback.c PATH=$PWD/progs:$OPATH pushd ncurses/ @@ -385,7 +392,7 @@ ln -sf tack-* tack mkdir -p $TERMINFO sh run_cmd.sh tic -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src sh run_cmd.sh tic -o $TERMINFO -s terminfo.src - make fallback.c + make %{?jobs:-j%jobs} fallback.c rm -rf $TERMINFO unset TERMINFO popd @@ -398,16 +405,17 @@ ln -sf tack-* tack # # Now rebuild libncurses and do the rest of this job # - make + make %{?jobs:-j%jobs} lib=%{_libdir} inc=%{_incdir}/ncurses + # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install DESTDIR=%{root} includedir=${inc} libdir=${lib} ln -sf ${inc##*/}/{curses,ncurses,term,termcap}.h %{root}${inc%%/*}/ sh %{S:6} --cflags "-I${inc}" --libs "-lncurses" %{root}%{_bindir}/ncurses5-config # # Check for tack program on base of above ncurses # - pushd tack-*/ + pushd tack/ ldd ./tack popd test ! -L tack || rm -f tack @@ -419,10 +427,11 @@ ln -sf tack-* tack # # Now use --with-pthread for reentrant pthread support (abi > 5). # - eval ./${c#*./} --with-pthread --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs - make + eval ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs + make %{?jobs:-j%jobs} lib=%{_libdir}/ncurses6 inc=%{_incdir}/ncurses6/ncurses + # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} 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 @@ -433,23 +442,25 @@ ln -sf tack-* tack # to the normal 8bit wide character libs. # %if %abi >= 6 - eval ./${c#*./} --with-pthread --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 %else eval ./${c#*./} --disable-ext-mouse --enable-widec --disable-ext-colors --without-progs %endif - make + make %{?jobs:-j%jobs} lib=%{_libdir} inc=%{_incdir}/ncursesw + # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib} sh %{S:6} --cflags "-I${inc}" --libs "-lncursesw" %{root}%{_bindir}/ncursesw5-config %if %abi < 6 # # Do both --enable-widec and --with-pthread (abi > 5). # - eval ./${c#*./} --with-pthread --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs - make + eval ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs + make %{?jobs:-j%jobs} lib=%{_libdir}/ncurses6 inc=%{_incdir}/ncurses6/ncursesw + # must not use %jobs here (would lead to: ln: ncurses.h already exists) 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 %endif @@ -510,7 +521,7 @@ ln -sf tack-* tack mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_miscdir} 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 # Gererate new termcap entries for various linux consoles TERMCAP=termcap \ @@ -595,11 +606,13 @@ ln -sf tack-* tack %defattr(-,root,root) %{_bindir}/clear %{_bindir}/reset +%{_bindir}/tabs %{_bindir}/toe %{_bindir}/tput %{_bindir}/tset %doc %{_mandir}/man1/clear.1.gz %doc %{_mandir}/man1/reset.1.gz +%doc %{_mandir}/man1/tabs.1.gz %doc %{_mandir}/man1/toe.1.gz %doc %{_mandir}/man1/tput.1.gz %doc %{_mandir}/man1/tset.1.gz diff --git a/tack-1.06.tar.bz2 b/tack-1.06.tar.bz2 deleted file mode 100644 index c388612..0000000 --- a/tack-1.06.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c16b0244f1808d1edf32ecbeb4be6ad2b8d5b7aca6a5386af3b7eaae796fd27 -size 129237 diff --git a/tack-1.07.tar.bz2 b/tack-1.07.tar.bz2 new file mode 100644 index 0000000..2ad12a3 --- /dev/null +++ b/tack-1.07.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:935265276da3072df1e7f77fd9560d5e7e6d94c45c60585f321bc87d16ec6845 +size 140024