Hello community, here is the log from the commit of package libqdialogsolver1 for openSUSE:Factory checked in at Tue Oct 18 14:45:29 CEST 2011.
-------- --- openSUSE:Factory/libqdialogsolver1/libqdialogsolver1.changes 2011-09-23 02:09:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqdialogsolver1/libqdialogsolver1.changes 2011-10-11 12:11:54.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 11 12:03:50 CEST 2011 - [email protected] + +- Use gcc-c++ >= 4.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqdialogsolver1.spec ++++++ --- /var/tmp/diff_new_pack.TJOujs/_old 2011-10-18 14:45:25.000000000 +0200 +++ /var/tmp/diff_new_pack.TJOujs/_new 2011-10-18 14:45:25.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libqdialogsolver1 (Version 1.3.0) +# spec file for package libqdialogsolver # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007-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 @@ -17,17 +17,18 @@ # norootforbuild - Name: libqdialogsolver1 Version: 1.3.0 -Release: 1 +Release: 0 License: GPL v2 or later Group: System/Packages Summary: QDialog class for showing solver results Requires: libzypp >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' libzypp`) graphviz -AutoReqProv: on +AutoreqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake gcc-c++ gettext-devel libqt4-devel yast2-libyui-devel +BuildRequires: libqt4-devel gettext-devel cmake yast2-libyui-devel +BuildRequires: gcc-c++ >= 4.5 + # API Changes in zypp 2.1 BuildRequires: libzypp-devel >= 2.8.7 Source: libqdialogsolver1-%{version}.tar.bz2 @@ -35,13 +36,6 @@ %description This package provides a QDialog class for showing solver results - - -Authors: --------- - Rajko Albrecht <[email protected]> - Stefan Schubert <[email protected]> - %package devel License: GPL v2 or later Requires: libqdialogsolver1 == %{version} @@ -52,8 +46,6 @@ This package provides a QDialog class for showing solver results. Included needed header files - - Authors: -------- Rajko Albrecht <[email protected]> @@ -103,4 +95,5 @@ /usr/include/zypp/* %{_libdir}/libqdialogsolver.so %{_libdir}/YaST2/plugin/libpy2qt_zypp_solver_dialog.so + %changelog ++++++ libqdialogsolver1-1.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqdialogsolver1-1.3.0/package/libqdialogsolver1.changes new/libqdialogsolver1-1.3.0/package/libqdialogsolver1.changes --- old/libqdialogsolver1-1.3.0/package/libqdialogsolver1.changes 2009-06-03 07:36:28.000000000 +0200 +++ new/libqdialogsolver1-1.3.0/package/libqdialogsolver1.changes 2011-10-17 15:21:47.000000000 +0200 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 11 12:03:50 CEST 2011 - [email protected] + +- Use gcc-c++ >= 4.5 + +------------------------------------------------------------------- Wed Jun 3 15:02:10 CEST 2009 - [email protected] - bump up factory version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqdialogsolver1-1.3.0/package/libqdialogsolver1.spec.in new/libqdialogsolver1-1.3.0/package/libqdialogsolver1.spec.in --- old/libqdialogsolver1-1.3.0/package/libqdialogsolver1.spec.in 2009-06-03 07:36:28.000000000 +0200 +++ new/libqdialogsolver1-1.3.0/package/libqdialogsolver1.spec.in 2011-10-17 15:21:47.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package libqdialogsolver (Version 1.0.0) +# spec file for package libqdialogsolver # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2007-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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,31 +20,31 @@ Name: @PACKAGE@ Version: @VERSION@ Release: 0 -License: GPL -Group: System/Management +License: GPL v2 or later +Group: System/Packages Summary: QDialog class for showing solver results Requires: libzypp >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' libzypp`) graphviz -Autoreqprov: on +AutoreqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ libqt4-devel gettext-devel cmake yast2-libyui-devel - +BuildRequires: libqt4-devel gettext-devel cmake yast2-libyui-devel +BuildRequires: gcc-c++ >= 4.5 # API Changes in zypp 2.1 BuildRequires: libzypp-devel >= 2.8.7 - Source: libqdialogsolver1-%{version}.tar.bz2 %description This package provides a QDialog class for showing solver results %package devel +License: GPL v2 or later Requires: libqdialogsolver1 == %{version} -Summary: Libqdialogsolver - developers files -Group: Development/Library/Others +Summary: QDialog class for showing solver results +Group: Development/Libraries/Others %description -n libqdialogsolver1-devel -This package provides a QDialog class for showing solver results. - developers files - +This package provides a QDialog class for showing solver results. +Included needed header files Authors: -------- @@ -89,4 +96,4 @@ %{_libdir}/libqdialogsolver.so %{_libdir}/YaST2/plugin/libpy2qt_zypp_solver_dialog.so - +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqdialogsolver1-1.3.0/src/restreewidget.cpp new/libqdialogsolver1-1.3.0/src/restreewidget.cpp --- old/libqdialogsolver1-1.3.0/src/restreewidget.cpp 2009-06-03 07:36:28.000000000 +0200 +++ new/libqdialogsolver1-1.3.0/src/restreewidget.cpp 2011-10-17 15:21:47.000000000 +0200 @@ -47,12 +47,12 @@ */ ResTreeWidget::ResTreeWidget(QWidget* parent, zypp::solver::detail::Resolver_Ptr r, const zypp::PoolItem item, - const char* name, Qt::WFlags fl) + const char* name, Qt::WFlags fl) : QWidget( parent, name, fl ) ,resolver(r) ,root_item(item) { - _lastSelectedItem = ""; + _lastSelectedItem = ""; if ( !name ) setName( "ResTreeWidget" ); ResTreeWidgetLayout = new QVBoxLayout( this, 11, 6, "ResTreeWidgetLayout"); @@ -74,11 +74,11 @@ showInstalled = new QCheckBox(i18n("show installed packages"), checkBox); showRecommend = new QCheckBox(i18n("show recommended packages"), checkBox);; showInstalled->setChecked(true); - if (resolver->onlyRequires()) + if (resolver->onlyRequires()) showRecommend->setChecked(false); else - showRecommend->setChecked(true); - + showRecommend->setChecked(true); + searchBox = new Q3HBox( descriptionBox, "searchBox"); searchBox->setSpacing (5); searchLabel = new QLabel (i18n("Search: "), searchBox); @@ -95,7 +95,7 @@ installListView->addColumn( i18n("Version") ); installListView->addColumn( i18n("Dependency") ); installListView->addColumn( i18n("Kind") ); - installListView->setAllColumnsShowFocus( TRUE ); + installListView->setAllColumnsShowFocus( TRUE ); tabWidget->addTab( installListView, i18n("Needs") ); installedListView = new Q3ListView( tabWidget, "installListView" ); @@ -111,9 +111,9 @@ connect( resolvableList, SIGNAL( activated( const QString & ) ), this, SLOT( slotComboActivated( const QString & ) ) ); connect( showRecommend, SIGNAL( stateChanged ( int ) ), this, SLOT( showRecommendChanged ( int ) ) ); connect( showInstalled, SIGNAL( stateChanged ( int ) ), this, SLOT( showInstalledChanged ( int ) ) ); - + ResTreeWidgetLayout->addWidget(m_Splitter); - + } /* @@ -163,12 +163,11 @@ edition += "."; edition += iter->item->arch().asString().c_str(); - Q3ListViewItem *element = new Q3ListViewItem( installedListView, - QString(iter->item->name().c_str()), - edition, - QString(iter->cap.asString().c_str()), - QString(iter->capKind.asString().c_str())); - element = NULL; + new Q3ListViewItem( installedListView, + QString(iter->item->name().c_str()), + edition, + QString(iter->cap.asString().c_str()), + QString(iter->capKind.asString().c_str())); } if (item.status().staysInstalled()) { @@ -180,29 +179,27 @@ edition += "."; edition += iter->item->arch().asString().c_str(); - Q3ListViewItem *element = new Q3ListViewItem( installedListView, - QString(iter->item->name().c_str()), - edition, - QString(iter->cap.asString().c_str()), - QString(iter->capKind.asString().c_str())); - element = NULL; + new Q3ListViewItem( installedListView, + QString(iter->item->name().c_str()), + edition, + QString(iter->cap.asString().c_str()), + QString(iter->capKind.asString().c_str())); } } - + for (zypp::solver::detail::ItemCapKindList::const_iterator iter = installList.begin(); iter != installList.end(); ++iter) { QString edition = iter->item->edition().asString().c_str(); edition += "."; edition += iter->item->arch().asString().c_str(); - Q3ListViewItem *element = new Q3ListViewItem( installListView, - QString(iter->item->name().c_str()), - edition, - QString(iter->cap.asString().c_str()), - QString(iter->capKind.asString().c_str())); - element = NULL; + new Q3ListViewItem( installListView, + QString(iter->item->name().c_str()), + edition, + QString(iter->cap.asString().c_str()), + QString(iter->capKind.asString().c_str())); } } - + m_Detailstext->setText(_s); Q3ValueList<int> list = m_Splitter->sizes(); if (list.count()!=2) return; @@ -263,7 +260,7 @@ setCursor (Qt::WaitCursor); pool.proxy().saveState(); // Save old pool bool saveRec = resolver->onlyRequires(); - + if (root_item != PoolItem()) { // Make a solver run with the selected item // resetting all selections @@ -271,17 +268,17 @@ invokeOnEach ( pool.begin(), pool.end(), resfilter::ByTransact( ), // Resetting all transcations functor::functorRef<bool,PoolItem>(resetting) ); - + // set the selected item for installation only root_item.status().setToBeInstalled( ResStatus::USER); } - // and resolve + // and resolve resolver = new zypp::solver::detail::Resolver( pool ); if (!showRecommend->isChecked()) { resolver->setOnlyRequires(true); } else { - resolver->setOnlyRequires(false); + resolver->setOnlyRequires(false); } resolver->resolvePool(); if (resolver == NULL @@ -297,7 +294,7 @@ pool.proxy().restoreState(); // Restore old state resolver->setOnlyRequires(saveRec); - setCursor (oldCursor); + setCursor (oldCursor); } @@ -322,12 +319,12 @@ for (zypp::ResPool::const_iterator it = resolver->pool().begin(); it != resolver->pool().end(); ++it) - { // find all root items and generate + { // find all root items and generate if (it->status().isToBeInstalled()) { - - zypp::ResObject::constPtr r = it->resolvable(); + + zypp::ResObject::constPtr r = it->resolvable(); bool rootfound = false; - zypp::solver::detail::ItemCapKindList isInstalledList = resolver->isInstalledBy (*it); + zypp::solver::detail::ItemCapKindList isInstalledList = resolver->isInstalledBy (*it); if (isInstalledList.empty()) { rootfound = true; } else { @@ -341,17 +338,17 @@ } if (rootfound) { - QString idStr = QString( "%1" ).arg( id++ ); + QString idStr = QString( "%1" ).arg( id++ ); m_RevGraphView->m_Tree[idStr].item = *it; // we have found a root; collect all trees buildTreeBranch ( m_RevGraphView->m_Tree[idStr].targets, *it, id); } - } + } } } else { // take the selected root item for "root" - QString idStr = QString( "%1" ).arg( id++ ); + QString idStr = QString( "%1" ).arg( id++ ); m_RevGraphView->m_Tree[idStr].item = root_item; // collect all trees @@ -360,8 +357,8 @@ } dumpRevtree(); selectItem(_lastSelectedItem); -} - +} + void ResTreeWidget::buildTreeBranch ( ResGraphView::tlist &childList, const zypp::PoolItem item, int &id) { // generate the branches for items which will really be installed zypp::solver::detail::ItemCapKindList installList = resolver->installs (item); @@ -371,7 +368,7 @@ // This item will REALLY triggered by the given root item (not only due required dependencies) QString idStr = QString( "%1" ).arg( id++ ); - childList.append(ResGraphView::targetData(idStr)); + childList.append(ResGraphView::targetData(idStr)); m_RevGraphView->m_Tree[idStr].item=it->item; m_RevGraphView->m_Tree[idStr].dueto = *it; @@ -379,7 +376,7 @@ // we have found a root; collect all trees if (alreadyHitItems.find(it->item) == alreadyHitItems.end()) - buildTreeBranch ( m_RevGraphView->m_Tree[idStr].targets, it->item, id); + buildTreeBranch ( m_RevGraphView->m_Tree[idStr].targets, it->item, id); } } @@ -388,10 +385,10 @@ zypp::solver::detail::ItemCapKindList satisfiedList = resolver->satifiedByInstalled (item); for (zypp::solver::detail::ItemCapKindList::const_iterator it = satisfiedList.begin(); it != satisfiedList.end(); it++) { - if (alreadyHitItems.find(it->item) == alreadyHitItems.end()) { + if (alreadyHitItems.find(it->item) == alreadyHitItems.end()) { QString idStr = QString( "%1" ).arg( id++ ); - childList.append(ResGraphView::targetData(idStr)); + childList.append(ResGraphView::targetData(idStr)); m_RevGraphView->m_Tree[idStr].item=it->item; m_RevGraphView->m_Tree[idStr].dueto = *it; continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
