Author: gs Date: Wed May 12 15:05:40 2010 New Revision: 62002 URL: http://svn.opensuse.org/viewcvs/yast?rev=62002&view=rev Log: Use ncurses6 library (package libncurses6), V 2.19.5 Modified: trunk/ncurses/VERSION trunk/ncurses/configure.in.in trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/Makefile.am trunk/ncurses/src/ncursesw.cc trunk/ncurses/src/ncursesw.h Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=62002&r1=62001&r2=62002&view=diff ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Wed May 12 15:05:40 2010 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/ncurses/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/configure.in.in?rev=62002&r1=62001&r2=62002&view=diff ============================================================================== --- trunk/ncurses/configure.in.in (original) +++ trunk/ncurses/configure.in.in Wed May 12 15:05:40 2010 @@ -8,10 +8,19 @@ @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-PROGRAM@ +AC_PATH_PROGS(NCURSES_CONFIG,ncursesw6-config ncursesw5-config,none) + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="`$NCURSES_CONFIG --cflags` $CPPFLAGS" +LIBS="`$NCURSES_CONFIG --libs` $LIBS" + +fi + ## SUSE ncurses do not need the wide include ## but other distros do, #201705 -AC_CHECK_HEADER([ncursesw/curses.h], - [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"]) +AC_CHECK_HEADER([ncursesw/curses.h]) + ## check for libyui includes AC_LANG_PUSH([C++]) Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.changes?rev=62002&r1=62001&r2=62002&view=diff ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed May 12 15:05:40 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 12 14:55:56 CEST 2010 - gs@suse.de + +- Use ncurses6 library (package libncurses6) +- V 2.19.5 + +------------------------------------------------------------------- Tue Apr 27 15:12:45 CEST 2010 - gs@suse.de - NCTextPad: do not append \n after the very last line Modified: trunk/ncurses/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/Makefile.am?rev=62002&r1=62001&r2=62002&view=diff ============================================================================== --- trunk/ncurses/src/Makefile.am (original) +++ trunk/ncurses/src/Makefile.am Wed May 12 15:05:40 2010 @@ -2,7 +2,7 @@ # Makefile.am for ncurses/src # -AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\" +AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\" -DNCURSES_INTERNALS=1 # plugin, libtool forces 'lib' prefix plugin_LTLIBRARIES = libpy2ncurses.la @@ -11,7 +11,8 @@ libpy2ncurses_la_LDFLAGS = -version-info 2:0 libpy2ncurses_la_LIBADD = \ - -lncursesw -lpanelw -lyui + $(LIBS) -lpanelw -lyui + #libpy2ncurses_la_LIBADD = \ # -L$(libdir) \ Modified: trunk/ncurses/src/ncursesw.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/ncursesw.cc?rev=62002&r1=62001&r2=62002&view=diff ============================================================================== --- trunk/ncurses/src/ncursesw.cc (original) +++ trunk/ncurses/src/ncursesw.cc Wed May 12 15:05:40 2010 @@ -284,7 +284,7 @@ count++; } -NCursesWindow::NCursesWindow( WINDOW* &window ) +NCursesWindow::NCursesWindow( WINDOW* window ) : w(0), alloced(FALSE), par(0), subwins(0), sib(0) { if ( !b_initialized ) Modified: trunk/ncurses/src/ncursesw.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/ncursesw.h?rev=62002&r1=62001&r2=62002&view=diff ============================================================================== --- trunk/ncurses/src/ncursesw.h (original) +++ trunk/ncurses/src/ncursesw.h Wed May 12 15:05:40 2010 @@ -973,7 +973,7 @@ /** * Constructor. Useful only for stdscr **/ - NCursesWindow( WINDOW* &window ); + NCursesWindow( WINDOW* window ); /** * Constructor. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org