Hello community,
here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory
checked in at Fri Jan 9 02:13:26 CET 2009.
--------
--- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-12-04 17:46:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2009-01-06 13:00:39.817631000 +0100
@@ -1,0 +2,9 @@
+Tue Jan 6 12:53:04 CET 2009 - kmachalkova@suse.cz
+
+- Fixed crash after pressing some keys (left, right, backspace)
+ handled by parent class of NCPkgTable (bnc#462961)
+- Make matching exact string in package search really exact
+ (bnc#459719)
+- 2.17.12
+
+-------------------------------------------------------------------
@@ -6 +15 @@
-- Enabled sorting of pkg tables (partially bnc#437217)
+- Enables sorting of pkg tables (partially bnc#437217)
calling whatdependson for head-i586
Old:
----
yast2-ncurses-pkg-2.17.11.tar.bz2
New:
----
yast2-ncurses-pkg-2.17.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.GI2984/_old 2009-01-09 02:13:10.000000000 +0100
+++ /var/tmp/diff_new_pack.GI2984/_new 2009-01-09 02:13:10.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-ncurses-pkg (Version 2.17.11)
+# spec file for package yast2-ncurses-pkg (Version 2.17.12)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -19,12 +19,12 @@
Name: yast2-ncurses-pkg
-Version: 2.17.11
+Version: 2.17.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-pkg-2.17.11.tar.bz2
+Source0: yast2-ncurses-pkg-2.17.12.tar.bz2
Prefix: /usr
BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel
@@ -45,7 +45,7 @@
%prep
-%setup -n yast2-ncurses-pkg-2.17.11
+%setup -n yast2-ncurses-pkg-2.17.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,10 +75,16 @@
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so
%doc %{prefix}/share/doc/packages/yast2-ncurses-pkg
%changelog
+* Tue Jan 06 2009 kmachalkova@suse.cz
+- Fixed crash after pressing some keys (left, right, backspace)
+ handled by parent class of NCPkgTable (bnc#462961)
+- Make matching exact string in package search really exact
+ (bnc#459719)
+- 2.17.12
* Thu Dec 04 2008 kmachalkova@suse.cz
- Installed patterns/patches are marked as 'i' (bnc#442484)
- Adjusted switching between pattern states (bnc#445415 for ncurses)
-- Enabled sorting of pkg tables (partially bnc#437217)
+- Enables sorting of pkg tables (partially bnc#437217)
- 2.17.11
* Fri Nov 07 2008 kmachalkova@suse.cz
- Sort patterns according to order AND category (bnc#439088)
++++++ yast2-ncurses-pkg-2.17.11.tar.bz2 -> yast2-ncurses-pkg-2.17.12.tar.bz2 ++++++
++++ 58340 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.11/config.h.in new/yast2-ncurses-pkg-2.17.12/config.h.in
--- old/yast2-ncurses-pkg-2.17.11/config.h.in 2008-12-04 11:23:10.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.12/config.h.in 2009-01-06 12:59:01.000000000 +0100
@@ -45,10 +45,6 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.11/configure.in new/yast2-ncurses-pkg-2.17.12/configure.in
--- old/yast2-ncurses-pkg-2.17.11/configure.in 2008-12-04 11:22:54.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.12/configure.in 2009-01-06 12:58:40.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses-pkg
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses-pkg, 2.17.10, http://bugs.opensuse.org/, yast2-ncurses-pkg)
+AC_INIT(yast2-ncurses-pkg, 2.17.12, http://bugs.opensuse.org/, yast2-ncurses-pkg)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.10"
+VERSION="2.17.12"
RPMNAME="yast2-ncurses-pkg"
MAINTAINER="Katarina Machalkova "
@@ -144,14 +144,8 @@
AC_PROG_CC
AC_PROG_CPP
-# If we have core, get its Y2CORE_CFLAGS.
-# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
-PKG_CHECK_EXISTS([yast2-core],[
- PKG_CHECK_MODULES(Y2CORE, yast2-core)
-])
-
-CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.11/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.17.12/src/NCPkgFilterSearch.cc
--- old/yast2-ncurses-pkg-2.17.11/src/NCPkgFilterSearch.cc 2008-12-04 11:16:58.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.12/src/NCPkgFilterSearch.cc 2009-01-06 12:46:57.000000000 +0100
@@ -189,6 +189,7 @@
q.setMatchRegex();
break;
case ExactMatch:
+ q.setMatchExact();
break;
case UseWildcard:
q.setMatchGlob();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.11/src/NCPkgTable.cc new/yast2-ncurses-pkg-2.17.12/src/NCPkgTable.cc
--- old/yast2-ncurses-pkg-2.17.11/src/NCPkgTable.cc 2008-12-04 17:00:51.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.12/src/NCPkgTable.cc 2009-01-06 12:35:27.000000000 +0100
@@ -43,38 +43,15 @@
//
NCPkgTableTag::NCPkgTableTag( ZyppObj objPtr, ZyppSel selPtr,
ZyppStatus stat )
- : NCTableCol( NCstring( " " ), SEPARATOR )
+ : YTableCell( " " )
, status ( stat )
, dataPointer( objPtr )
, selPointer( selPtr )
{
-
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-// METHOD NAME : NCPkgTableTag::DrawAt
-// METHOD TYPE : virtual DrawAt
-//
-// DESCRIPTION :
-//
-void NCPkgTableTag::DrawAt( NCursesWindow & w, const wrect at,
- NCTableStyle & tableStyle,
- NCTableLine::STATE linestate,
- unsigned colidx ) const
-{
- NCTableCol::DrawAt( w, at, tableStyle, linestate, colidx );
-
- string statusStr = statusToStr( status );
- w.addch( at.Pos.L, at.Pos.C, statusStr.c_str()[0] );
- w.addch( at.Pos.L, at.Pos.C +1, statusStr.c_str()[1] );
- w.addch( at.Pos.L, at.Pos.C +2, statusStr.c_str()[2] );
- w.addch( at.Pos.L, at.Pos.C +3, statusStr.c_str()[3] );
+ setLabel( statusToString(stat) );
}
-
-string NCPkgTableTag::statusToStr( ZyppStatus stat ) const
+string NCPkgTableTag::statusToString( ZyppStatus stat ) const
{
// convert ZyppStatus to string
switch ( stat )
@@ -156,16 +133,18 @@
ZyppObj objPtr,
ZyppSel slbPtr )
{
- vector Items( elements.size()+1, 0 );
+ YTableItem *tabItem = new YTableItem();
// fill first column (containing the status information and the package pointers)
- Items[0] = new NCPkgTableTag( objPtr, slbPtr, stat );
+ tabItem->addCell( new NCPkgTableTag( objPtr, slbPtr, stat ));
+
for ( unsigned i = 1; i < elements.size()+1; ++i ) {
- // NCTableCol has NCstring argument to enforce 'utf8' encoding
- Items[i] = new NCTableCol( elements[i-1] );
+ tabItem->addCell( elements[i-1] );
}
- myPad()->Append( Items );
+
+ addItem(tabItem);
+ yuiMilestone() << "adding line" << endl;
// don't call DrawPad(); for every line - is called once after the loop
@@ -392,7 +371,9 @@
}
// get first column (the column containing the status info)
- NCPkgTableTag * cc = static_cast( cl->GetCol( 0 ) );
+ YTableItem *it = dynamic_cast (cl->origItem() );
+ YTableCell *tcell = it->cell(0);
+ NCPkgTableTag * cc = static_cast( tcell );
// get the object pointer
ZyppSel slbPtr = getSelPointer( index );
ZyppObj objPtr = getDataPointer( index );
@@ -422,7 +403,9 @@
// set new status (if status has changed)
if ( getStatus(index) != newstatus )
{
+ int index = getCurrentItem();
cc->setStatus( newstatus );
+ cellChanged( index, 0, cc->statusToString (newstatus) );
}
}
}
@@ -875,7 +858,9 @@
return 0;
// get first column (the column containing the status info)
- NCPkgTableTag * cc = static_cast( cl->GetCol( 0 ) );
+ YTableItem *it = dynamic_cast (cl->origItem() );
+ YTableCell *tcell = it->cell(0);
+ NCPkgTableTag * cc = static_cast( tcell );
return cc;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.11/src/NCPkgTable.h new/yast2-ncurses-pkg-2.17.12/src/NCPkgTable.h
--- old/yast2-ncurses-pkg-2.17.11/src/NCPkgTable.h 2008-12-04 11:16:58.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.12/src/NCPkgTable.h 2009-01-06 12:35:28.000000000 +0100
@@ -41,7 +41,7 @@
* not installed, to be deleted and so on).
*
**/
-class NCPkgTableTag : public NCTableCol {
+class NCPkgTableTag : public YTableCell {
private:
@@ -49,9 +49,6 @@
ZyppObj dataPointer;
// cannot get at it from dataPointer
ZyppSel selPointer;
-
- // returns the corresponding string value to given package status
- string statusToStr( ZyppStatus stat ) const;
public:
@@ -59,15 +56,13 @@
ZyppSel selPtr,
ZyppStatus stat = S_NoInst );
- virtual ~NCPkgTableTag() {}
-
- virtual void DrawAt( NCursesWindow & w, const wrect at,
- NCTableStyle & tableStyle,
- NCTableLine::STATE linestate,
- unsigned colidx ) const;
+ ~NCPkgTableTag() {}
- void setStatus( ZyppStatus stat ) { status = stat; }
+ void setStatus( ZyppStatus stat ) { status = stat; }
ZyppStatus getStatus() const { return status; }
+ // returns the corresponding string value to given package status
+ string statusToString( ZyppStatus stat ) const;
+
ZyppObj getDataPointer() const { return dataPointer; }
ZyppSel getSelPointer() const { return selPointer; }
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.11/VERSION new/yast2-ncurses-pkg-2.17.12/VERSION
--- old/yast2-ncurses-pkg-2.17.11/VERSION 2008-12-04 17:40:24.000000000 +0100
+++ new/yast2-ncurses-pkg-2.17.12/VERSION 2009-01-06 12:53:42.000000000 +0100
@@ -1 +1 @@
-2.17.11
+2.17.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org