Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at Thu Oct 28 13:44:57 CEST 2010. -------- --- KDE/k3b/k3b.changes 2010-08-31 12:05:15.000000000 +0200 +++ k3b/k3b.changes 2010-10-22 16:28:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 22 14:21:19 UTC 2010 - abrouwers@gmail.com + +- Fix crash entering settings dialog with qt47 (upstream + http://websvn.kde.org/?revision=1186323&view=revision) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- k3b-2.0.1-qt47_settings_crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.cehiPL/_old 2010-10-28 13:43:32.000000000 +0200 +++ /var/tmp/diff_new_pack.cehiPL/_new 2010-10-28 13:43:32.000000000 +0200 @@ -43,11 +43,13 @@ Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools Requires: hal Version: 2.0.1 -Release: 2 +Release: 3 %define rversion %version # svn.kde.org/home/kde/trunk/extragear/multimedia/k3b Source0: k3b-%{version}.tar.bz2 Patch1: initial-preference.diff +# fixed in 2.0.2 / 2.1: https://bugs.kde.org/show_bug.cgi?id=238819 +Patch2: k3b-2.0.1-qt47_settings_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Provides: kde4-k3b = 4.2.1.svn942189 @@ -87,6 +89,7 @@ %prep %setup -q -n k3b-%{version} %patch1 +%patch2 %build %cmake_kde4 -d build ++++++ k3b-2.0.1-qt47_settings_crash.patch ++++++ Index: src/option/k3bpluginoptiontab.cpp =================================================================== --- src/option/k3bpluginoptiontab.cpp (revision 1168967) +++ src/option/k3bpluginoptiontab.cpp (working copy) @@ -43,12 +43,28 @@ layout->addWidget( label ); layout->addWidget( pluginSelector ); + // find all categories + QHash<QString, QString> categoryNames; + foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { - kDebug() << "Adding plugin" << plugin->pluginInfo().name(); - pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(), + categoryNames[ plugin->category() ] = plugin->categoryName(); + } + + // add all plugins in each category + foreach( const QString &category, categoryNames.keys() ) { + QList<KPluginInfo> plugins; + + foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { + if ( plugin->category() == category ) { + plugins << plugin->pluginInfo(); + kDebug() << "Adding plugin" << plugin->pluginInfo().name(); + } + } + pluginSelector->addPlugins( plugins, KPluginSelector::ReadConfigFile, - plugin->categoryName(), - plugin->category() ); + categoryNames[ category ], + category + ); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org