Hello community,
here is the log from the commit of package yast2-ncurses-pkg for
openSUSE:Factory checked in at 2012-06-19 21:38:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ncurses-pkg (Old)
and /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ncurses-pkg", Maintainer is "g...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ncurses-pkg/yast2-ncurses-pkg.changes
2012-05-10 14:35:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new/yast2-ncurses-pkg.changes
2012-06-19 21:38:23.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 19 10:05:44 CEST 2012 - g...@suse.de
+
+- Fixed crash while starting the package selector (bnc #767619)
+- 2.22.7
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-pkg-2.22.6.tar.bz2
New:
----
yast2-ncurses-pkg-2.22.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.VVipXr/_old 2012-06-19 21:38:25.000000000 +0200
+++ /var/tmp/diff_new_pack.VVipXr/_new 2012-06-19 21:38:25.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-ncurses-pkg
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -16,36 +16,31 @@
#
+
Name: yast2-ncurses-pkg
-Version: 2.22.6
+Version: 2.22.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-ncurses-pkg-%{version}.tar.bz2
-BuildRequires: blocxx-devel
-BuildRequires: dejagnu
-BuildRequires: doxygen
-BuildRequires: gcc-c++
-BuildRequires: libtool
-BuildRequires: ncurses-devel
-BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools
-BuildRequires: yast2-ncurses-devel
-Summary: YaST2 - Character Based Package Manager Frontend
-License: GPL-2.0
Group: System/YaST
+License: GPL-2.0
+BuildRequires: doxygen dejagnu gcc-c++ yast2-core-devel yast2-devtools libtool
+BuildRequires: blocxx-devel ncurses-devel yast2-ncurses-devel
+
+Summary: YaST2 - Character Based Package Manager Frontend
Provides: yast2-ncurses:%{_libdir}/YaST2/plugin/libpy2ncurses.so
Provides: yast2_ui_pkg
Requires: glibc-locale
-BuildRequires: libzypp-devel >= 7.4.0
BuildRequires: yast2-core-devel >= 2.16.33
BuildRequires: yast2-libyui-devel >= 2.21.1
+BuildRequires: libzypp-devel >= 7.4.0
Requires: yast2-core >= 2.16.33
#ncurses6 library
-Requires: libzypp >= 7.4.0
Requires: yast2-ncurses >= 2.21.2
+Requires: libzypp >= 7.4.0
%description
This package contains character based (ncurses) frontend of YaST2
++++++ yast2-ncurses-pkg-2.22.6.tar.bz2 -> yast2-ncurses-pkg-2.22.7.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.6/VERSION
new/yast2-ncurses-pkg-2.22.7/VERSION
--- old/yast2-ncurses-pkg-2.22.6/VERSION 2012-05-08 14:39:02.000000000
+0200
+++ new/yast2-ncurses-pkg-2.22.7/VERSION 2012-06-19 10:36:07.000000000
+0200
@@ -1 +1 @@
-2.22.6
+2.22.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.6/src/NCPackageSelector.cc
new/yast2-ncurses-pkg-2.22.7/src/NCPackageSelector.cc
--- old/yast2-ncurses-pkg-2.22.6/src/NCPackageSelector.cc 2012-04-25
13:38:47.000000000 +0200
+++ new/yast2-ncurses-pkg-2.22.7/src/NCPackageSelector.cc 2012-06-19
09:54:36.000000000 +0200
@@ -331,13 +331,18 @@
if ( event == NCursesEvent::handled )
return false;
+ yuiMilestone() << "widget event: " << event << endl;
// Call the appropriate handler
if ( event == NCursesEvent::button )
{
if ( event.widget == okButton )
+ {
retVal = OkButtonHandler( event );
+ }
else if ( event.widget == cancelButton )
+ {
retVal = CancelHandler( event );
+ }
else if ( event.widget == filterPopup )
{
retVal = filterPopup->handleEvent();
@@ -348,7 +353,14 @@
}
else if ( event.widget == searchField )
{
- retVal = searchPopup->showSearchResultPackages();
+ if ( event.reason == YEvent::Activated )
+ {
+ retVal = searchPopup->showSearchResultPackages();
+ }
+ else // no action, reason was YEvent::SelectionChanged
+ {
+ retVal = true;
+ }
}
}
else if ( event == NCursesEvent::menu )
@@ -967,9 +979,16 @@
case Search:
{
searchPopup = new NCPkgFilterSearch( replPoint, YD_VERT, this );
+ searchPopup->createLayout( replPoint );
searchPopup->setSize( oldSize.Sze.W, oldSize.Sze.H );
searchPopup->Redraw();
- searchField->setKeyboardFocus();
+
+ searchField = searchPopup->getSearchField();
+ if ( searchField )
+ {
+ searchField->setKeyboardFocus();
+ searchField->setNotify(true);
+ }
break;
}
case Summary:
@@ -1542,7 +1561,12 @@
// set the pointer to the packager object
pkgList->setPackager( this );
- // HBox for Filter and Disk Space (both in additional HBoxes )
+ // set sort strategy
+ vector<string> pkgHeader;
+ pkgList->getHeader( pkgHeader );
+ pkgList->setSortStrategy( new NCPkgTableSort( pkgHeader ) );
+
+ // HBox for Filter and Disk Space (both in additional HBoxes )
YLayoutBox * hSplit2 = YUI::widgetFactory()->createHBox( split );
YLayoutBox * hSplit3 = YUI::widgetFactory()->createHBox( hSplit2 );
@@ -1620,6 +1644,14 @@
replPoint = YUI::widgetFactory()->createReplacePoint( vv );
//Search view is now default (#404694)
searchPopup = new NCPkgFilterSearch( replPoint, YD_VERT, this );
+ searchPopup->createLayout( replPoint );
+
+ searchField = searchPopup->getSearchField();
+ if ( searchField )
+ {
+ searchField->setKeyboardFocus();
+ searchField->setNotify( true );
+ }
YAlignment *l1 = YUI::widgetFactory()->createLeft( vbox_left );
patternLabel = new NCLabel( l1, " " );
@@ -1648,7 +1680,13 @@
}
// set the pointer to the packager object
pkgList->setPackager( this );
+ pkgList->fillHeader();
+ // set sort strategy
+ vector<string> pkgHeader;
+ pkgList->getHeader( pkgHeader );
+ pkgList->setSortStrategy( new NCPkgTableSort( pkgHeader ) );
+
// label text + actions menu
YLayoutBox * hSplit2 = YUI::widgetFactory()->createHBox( v );
new NCLabel( hSplit2, NCPkgStrings::PackageName() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.6/src/NCPackageSelector.h
new/yast2-ncurses-pkg-2.22.7/src/NCPackageSelector.h
--- old/yast2-ncurses-pkg-2.22.6/src/NCPackageSelector.h 2012-04-25
13:35:35.000000000 +0200
+++ new/yast2-ncurses-pkg-2.22.7/src/NCPackageSelector.h 2012-06-19
09:59:45.000000000 +0200
@@ -263,7 +263,6 @@
YReplacePoint *ReplacePoint() { return replacePoint; }
NCRichText *FilterDescription() { return filter_desc; }
NCPkgSearchSettings *SearchSettings() { return searchSet; }
- void setSearchField( NCInputField *expr ) { searchField = expr; }
bool checkNow( bool *ok );
bool verifySystem( bool *ok );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.6/src/NCPkgFilterSearch.cc
new/yast2-ncurses-pkg-2.22.7/src/NCPkgFilterSearch.cc
--- old/yast2-ncurses-pkg-2.22.6/src/NCPkgFilterSearch.cc 2012-04-18
09:50:20.000000000 +0200
+++ new/yast2-ncurses-pkg-2.22.7/src/NCPkgFilterSearch.cc 2012-06-19
10:01:53.000000000 +0200
@@ -80,7 +80,7 @@
, ignoreCase( 0 )
, packager( pkger )
{
- createLayout( parent );
+ // the layout is created in NCPackageSelector
}
///////////////////////////////////////////////////////////////////
@@ -114,8 +114,6 @@
searchExpr = new NCInputField( vSplit, NCPkgStrings::SearchPhrase() );
searchExpr->setStretchable( YD_HORIZ, true );
- searchExpr->setReturnOnReturn( true );
- packager->setSearchField( searchExpr );
//new NCSpacing( vSplit, YD_VERT, false, 0.5 );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.6/src/NCPkgFilterSearch.h
new/yast2-ncurses-pkg-2.22.7/src/NCPkgFilterSearch.h
--- old/yast2-ncurses-pkg-2.22.6/src/NCPkgFilterSearch.h 2012-03-21
13:37:44.000000000 +0100
+++ new/yast2-ncurses-pkg-2.22.7/src/NCPkgFilterSearch.h 2012-06-14
11:53:04.000000000 +0200
@@ -112,6 +112,7 @@
bool checkProvides,
bool checkRequires );
+ NCInputField * getSearchField() { return searchExpr; }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.6/src/NCPkgTable.cc
new/yast2-ncurses-pkg-2.22.7/src/NCPkgTable.cc
--- old/yast2-ncurses-pkg-2.22.6/src/NCPkgTable.cc 2012-03-28
09:46:39.000000000 +0200
+++ new/yast2-ncurses-pkg-2.22.7/src/NCPkgTable.cc 2012-06-13
13:59:16.000000000 +0200
@@ -120,13 +120,9 @@
, statusStrategy( new PackageStatStrategy ) // default strategy:
packages
, tableType ( T_Packages ) // default type:
packages
, haveInstalledVersion ( false )
+ , visibleInfo( I_Technical )
{
- fillHeader();
- vector<string> pkgHeader;
- getHeader( pkgHeader );
- setSortStrategy( new NCPkgTableSort( pkgHeader ) );
- setVisibleInfo( I_Technical ); // set default
- yuiDebug() << endl;
+ yuiDebug() << "NCPkgTable created" << endl;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
