commit ncurses

21 May 2006

Hello community,

here is the log from the commit of package ncurses
checked in at Sun May 21 19:03:45 CEST 2006.

--------

--- ncurses/ncurses.changes	2006-04-09 17:45:28.000000000 +0200
+++ ncurses/ncurses.changes	2006-05-18 17:44:15.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May 18 17:43:19 CEST 2006 - werner@suse.de
+
+- Update to 5.5-20060513
+- Add rxvt-unicode terminfo entry
+
+-------------------------------------------------------------------

Old:
----
  ncurses-5.4-pthread.dif

New:
----
  ncurses-5.5-20060513-patch.tar.bz2
  ncurses-5.5-pthread.dif

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.K3GM7b/_old	2006-05-21 19:03:39.000000000 +0200
+++ /var/tmp/diff_new_pack.K3GM7b/_new	2006-05-21 19:03:39.000000000 +0200
@@ -19,16 +19,16 @@
 Group:          System/Libraries
 Autoreqprov:    on
 Version:        5.5
-Release:        14
+Release:        18
 Summary:        New curses Libraries
 Source0:        ncurses-%{version}.tar.bz2
 Url:            http://invisible-island.net/ncurses/ncurses.html
-#Source1:       ncurses-%{version}-20050716-patch.tar.bz2
+Source1:        ncurses-%{version}-20060513-patch.tar.bz2
 Source2:        handle.linux
 Patch0:         ncurses-%{version}.dif
 Patch1:         ncurses-5.3-printw.dif
 Patch2:         ncurses-5.4-wide.dif
-Patch3:         ncurses-5.4-pthread.dif
+Patch3:         ncurses-5.5-pthread.dif
 Patch4:         ncurses-5.5-valist.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -90,7 +90,7 @@
 
 %prep
 %setup -q -n ncurses-%{version} -b0
-#bzcat %{SOURCE1} | patch -p1 -s
+tar Oxfj %{SOURCE1} | patch -p1 -s
 %patch -P 1 -p0 -b .va
 %patch -P 2 -p0 -b .wd
 %patch -P 3 -p0 -b .pt
@@ -332,6 +332,9 @@
 %defattr(-,root,root)
 
 %changelog -n ncurses
+* Thu May 18 2006 - werner@suse.de
+- Update to 5.5-20060513
+- Add rxvt-unicode terminfo entry
 * Sun Apr 09 2006 - werner@suse.de
 - Removed enacs from xterm terminfo entry, the reason is that it
   would break non latin encodings and the xterm does not need it

++++++ handle.linux ++++++
--- ncurses/handle.linux	2006-04-08 20:26:08.000000000 +0200
+++ ncurses/handle.linux	2006-05-18 18:22:31.000000000 +0200
@@ -15,10 +15,10 @@
 declare -i line=0
 
 if test -r run_cmd.sh ; then
-    function tc { sh run_cmd.sh tic -C -r ${1+"$@"}; }
+    function tc { sh run_cmd.sh tic -U -C -r ${1+"$@"}; }
     function ic { sh run_cmd.sh infocmp -A $TERMINFO ${1+"$@"}; }
 else
-    function tc { tic -C -r ${1+"$@"}; }
+    function tc { tic -U -C -r ${1+"$@"}; }
     function ic { infocmp -A $TERMINFO ${1+"$@"}; }
 fi
 
@@ -43,11 +43,11 @@
 
     entry="$(tc $tmp2 | grep -v '^#')"
 
-    new=$(echo "$entry" | sed -e '/\t:a[el]=.*/a\
+    new=$(echo "$entry" | sed -e '/:a[el]=.*/a\
 	:ac=' | sed -e "s/\t:ac=/${acsc//\\/\\\\}\\\\/")
-    new=$(echo "$new" | sed -e '/\t:a[el]=.*/i\
+    new=$(echo "$new" | sed -e '/:a[el]=.*/i\
 	:S2=' | sed -e "s/\t:S2=/${mpch//\\/\\\\}\\\\/")
-    new=$(echo "$new" | sed -e '/\t:s.=.*/i\
+    new=$(echo "$new" | sed -e '/:s.=.*/i\
 	:\.\.sa=' | sed -e "s/\t:\.\.sa=/${sgr//\\/\\\\}\\\\/")
 
     if test "${#new}" -gt 1024 ; then

++++++ ncurses-5.4-pthread.dif -> ncurses-5.5-pthread.dif ++++++
--- ncurses/ncurses-5.4-pthread.dif	2005-07-22 12:58:13.000000000 +0200
+++ ncurses/ncurses-5.5-pthread.dif	2006-05-18 17:51:22.000000000 +0200
@@ -1,5 +1,5 @@
 --- ncurses/SigAction.h
-+++ ncurses/SigAction.h	2005-07-22 12:57:13.000000000 +0200
++++ ncurses/SigAction.h	2006-05-18 14:31:29.000000000 +0200
 @@ -55,6 +55,36 @@
  typedef struct sigaction sigaction_t;
  #endif
@@ -38,7 +38,7 @@
  
  #if HAVE_SIGVEC
 --- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h	2005-07-22 12:57:13.000000000 +0200
++++ ncurses/curses.priv.h	2006-05-18 14:31:29.000000000 +0200
 @@ -48,6 +48,10 @@
  
  #include <ncurses_dll.h>
@@ -50,7 +50,7 @@
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -531,6 +535,12 @@
+@@ -538,6 +542,12 @@
  #define _nc_windows SP->_nc_sp_windows
  
  	bool            _sig_winch;
@@ -63,7 +63,7 @@
  	SCREEN          *_next_screen;
  
  	/* hashes for old and new lines */
-@@ -1121,6 +1131,9 @@
+@@ -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);
@@ -74,7 +74,7 @@
  extern NCURSES_EXPORT(void) _nc_trace_tries (struct tries *);
  
 --- ncurses/base/lib_getch.c
-+++ ncurses/base/lib_getch.c	2005-07-22 12:57:13.000000000 +0200
++++ ncurses/base/lib_getch.c	2006-05-18 14:31:29.000000000 +0200
 @@ -237,6 +237,10 @@
      if (win == 0 || SP == 0)
  	returnCode(ERR);
@@ -86,24 +86,32 @@
      if (cooked_key_in_fifo()) {
  	if (wgetch_should_refresh(win))
  	    wrefresh(win);
---- ncurses/base/lib_newterm.c
-+++ ncurses/base/lib_newterm.c	2005-07-22 12:57:13.000000000 +0200
-@@ -197,6 +197,13 @@
-     /* Initialize the terminal line settings. */
-     _nc_initscr();
- 
-+#if USE_SIGWINCH
-+    SP->_unblock_sigwinch = false;
-+#if defined _REENTRANT || defined _THREAD_SAFE
-+    SP->_read_thread = (pthread_t)0;
-+#endif
-+#endif
-+
-     _nc_signal_handler(TRUE);
- 
- #if USE_SIZECHANGE
+--- 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	2005-07-22 12:57:13.000000000 +0200
++++ ncurses/tty/lib_tstp.c	2006-05-18 15:53:04.000000000 +0200
 @@ -142,6 +142,9 @@
  #ifdef SIGTTOU
      int sigttou_blocked;
@@ -136,17 +144,7 @@
      /*
       * If the user modified the tty state while suspended, he wants
       * those changes to stick.  So save the new "default" terminal state.
-@@ -280,6 +291,9 @@
-     SCREEN *scan = _nc_screen_chain;
-     while (scan) {
- 	scan->_sig_winch = TRUE;
-+#if defined _REENTRANT || defined _THREAD_SAFE
-+	_nc_kill(scan, SIGWINCH);
-+#endif
- 	scan = scan->_next_screen;
-     }
- }
-@@ -336,6 +350,17 @@
+@@ -332,6 +343,17 @@
  	result = FALSE;
      }
  #endif
@@ -164,18 +162,29 @@
      T(("CatchIfDefault - will %scatch %s",
         result ? "" : "not ", signal_name(sig)));
      return result;
-@@ -397,3 +422,29 @@
+@@ -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.
++ * This is invoked once at the beginning of reading, to remember
++ * which thread should be interrupted if the SIGWINCH handler is
++ * called.
 + */
 +
-+#if USE_SIGWINCH
 +NCURSES_EXPORT(void)
 +_nc_unblock(SCREEN *scan, int signal)
 +{
@@ -186,11 +195,11 @@
 +    sigemptyset(&sigset);
 +    sigaddset(&sigset, signal);
 +    sigprocmask(SIG_UNBLOCK, &sigset, NULL);
-+#if defined _REENTRANT || defined _THREAD_SAFE
++# if defined _REENTRANT || defined _THREAD_SAFE
 +    /* Remember the terminal reading thread */
 +    if (&pthread_self)
 +	scan->_read_thread = pthread_self();
-+#endif
++# endif
 +    scan->_unblock_sigwinch = true;
 +}
 +#endif

++++++ ncurses-5.5.dif ++++++
++++     724 lines (skipped)
++++ between ncurses/ncurses-5.5.dif
++++ and ncurses/ncurses-5.5.dif


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)