[kde-runtime] Unable to logout after KDE upgrade (kde#310486)

[Rex Dieter]

commit 9d3138f08afefe96fd89120076516267e389c1df
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jan 25 15:04:12 2013 -0600

    Unable to logout after KDE upgrade (kde#310486)

 kde-runtime-4.9.98-kde310486.patch |   88 ++++++++++++++++++++++++++++++++++++
 kde-runtime.spec                   |   11 ++++-
 2 files changed, 98 insertions(+), 1 deletions(-)
---
diff --git a/kde-runtime-4.9.98-kde310486.patch b/kde-runtime-4.9.98-kde310486.patch
new file mode 100644
index 0000000..a273748
--- /dev/null
+++ b/kde-runtime-4.9.98-kde310486.patch
@@ -0,0 +1,88 @@
+diff -up kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/CMakeLists.txt.kde310486 kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/CMakeLists.txt
+--- kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/CMakeLists.txt.kde310486	2012-12-17 08:24:58.000000000 -0600
++++ kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/CMakeLists.txt	2013-01-25 14:53:07.210509320 -0600
+@@ -21,7 +21,7 @@ qt4_automoc(${plasmacomponents_SRCS})
+ 
+ 
+ add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS})
+-target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDECLARATIVE_LIBRARIES} ${KDE4_PLASMA_LIBS})
++target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_PLASMA_LIBS})
+ 
+ install(TARGETS plasmacomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/components)
+ 
+diff -up kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp.kde310486 kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp
+--- kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp.kde310486	2012-12-17 08:24:58.000000000 -0600
++++ kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp	2013-01-25 14:53:07.210509320 -0600
+@@ -36,8 +36,6 @@
+ #include <KWindowSystem>
+ #include <KStandardDirs>
+ 
+-#include <kdeclarative.h>
+-
+ #include <Plasma/Corona>
+ #include <Plasma/WindowEffects>
+ 
+@@ -124,22 +122,31 @@ void FullScreenWindow::init(const QStrin
+     }
+ 
+     //Try to figure out the path of the dialog component
+-    const QString target = KDeclarative::componentsTarget();
+-    QString filePath;
+-    if (target != KDeclarative::defaultComponentsTarget()) {
+-        const QString file = "platformimports/" % target % "/org/kde/plasma/components/" % componentName % ".qml";
+-        filePath = KStandardDirs::locate("module", file);
++    QString componentsPlatform = getenv("KDE_PLASMA_COMPONENTS_PLATFORM");
++    if (componentsPlatform.isEmpty()) {
++        KConfigGroup cg(KSharedConfig::openConfig("kdeclarativerc"), "Components-platform");
++        componentsPlatform = cg.readEntry("name", "desktop");
+     }
+ 
+-    if (filePath.isEmpty()) {
+-        const QString file = "imports/org/kde/plasma/components/" % componentName % ".qml";
+-        filePath = KStandardDirs::locate("module", file);
++    QString filePath;
++    if (componentsPlatform == "desktop") {
++        foreach(const QString &importPath, KGlobal::dirs()->findDirs("module", "imports/")) {
++            filePath = importPath % "org/kde/plasma/components/" % componentName % ".qml";
++            QFile f(filePath);
++            if (f.exists()) {
++                break;
++            }
++        }
++    } else {
++        foreach(const QString &importPath, KGlobal::dirs()->findDirs("module", "platformimports/" % componentsPlatform)) {
++            filePath = importPath % "org/kde/plasma/components/" % componentName % ".qml";
++            QFile f(filePath);
++            if (f.exists()) {
++                break;
++            }
++        }
+     }
+ 
+-    if (filePath.isEmpty()) {
+-        kWarning() << "Component not found:" << componentName;
+-        return;
+-    }
+ 
+     QDeclarativeEngine *engine = EngineBookKeeping::self()->engine();
+     if (!engine) {
+diff -up kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp.kde310486 kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
+--- kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp.kde310486	2012-12-17 08:24:58.000000000 -0600
++++ kde-runtime-4.9.98/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp	2013-01-25 14:59:53.300432498 -0600
+@@ -90,9 +90,14 @@ void PlasmaComponentsPlugin::registerTyp
+ {
+     Q_ASSERT(uri == QLatin1String("org.kde.plasma.components"));
+ 
++    QString componentsPlatform = getenv("KDE_PLASMA_COMPONENTS_PLATFORM");
++    if (componentsPlatform.isEmpty()) {
++        KConfigGroup cg(KSharedConfig::openConfig("kdeclarativerc"), "Components-platform");
++        componentsPlatform = cg.readEntry("name", "desktop");
++    }
++    
+     //platform specific c++ components
+-    const QString target = KDeclarative::componentsTarget();
+-    if (target == KDeclarative::defaultComponentsTarget()) {
++    if (componentsPlatform == "desktop") {
+         qmlRegisterType<QMenuProxy>(uri, 0, 1, "Menu");
+         qmlRegisterType<QMenuItem>(uri, 0, 1, "MenuItem");
+     } else {
diff --git a/kde-runtime.spec b/kde-runtime.spec
index 6e550b2..2c71e1d 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -5,7 +5,7 @@
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 4.9.98
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -42,8 +42,13 @@ Patch50: kde-runtime-4.7.90-nepomuk_onlyshowin_kde.patch
 # increase some timeouts in an effort to see (some) errors before close
 Patch51: kde-runtime-4.9.0-installdbgsymbols.patch
 
+# https://bugs.kde.org/show_bug.cgi?id=310486
+# revert https://projects.kde.org/projects/kde/kde-runtime/repository/revisions/deee161a42efda74965ca4aab7d79fb7fb375352
+Patch52:  kde-runtime-4.9.98-kde310486.patch
+
 ## upstream patches
 
+
 # rhel patches
 Patch300: kde-runtime-4.9.2-webkit.patch
 
@@ -170,6 +175,7 @@ Requires: %{name} = %{version}-%{release}
 %patch9 -p1 -b .man-overrides
 %patch50 -p1 -b .nepomuk_onlyshowin_kde
 %patch51 -p1 -b .installdgbsymbols
+%patch52 -p1 -b .kde310486
 
 %if 0%{?rhel}
 %patch300 -p1 -b .webkit
@@ -375,6 +381,9 @@ fi
 
 
 %changelog
+* Fri Jan 25 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.98-2
+- Unable to logout after KDE upgrade (kde#310486)
+
 * Sun Jan 20 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.98-1
 - 4.9.98