Accepting request 51560 from KDE:Distro:Factory

Accepted submit request 51560 from user coolo

OBS-URL: https://build.opensuse.org/request/show/51560
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=22

k3b-2.0.1-qt47_settings_crash.patch

@@ -0,0 +1,37 @@
+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
++                                  );
+     }
+ }
+ 

k3b.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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)
+
 -------------------------------------------------------------------
 Tue Aug 31 10:05:14 UTC 2010 - aj@suse.de
 

k3b.spec

@@ -48,6 +48,8 @@ Release:        2
 # 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 @@ Authors:
 %prep
 %setup -q -n k3b-%{version}
 %patch1
+%patch2
 
 %build
   %cmake_kde4 -d build