amd64 stable wrt #354367 and punt the version with hardcoded sys-apps/hal dep

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

1 files changed, 0 insertions, 37 deletions

diff --git a/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch b/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
deleted file mode 100644
index a99b5c639cae..000000000000
--- a/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
-+                                  );
-     }
- }
-