Accepting request 807843 from home:wolfi323:test

- Add Fix-crash-when-loading-external-app.patch to fix loading the Yast entry in systemsettings (boo#1171916, kde#421566) OBS-URL: https://build.opensuse.org/request/show/807843 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=212
2020-05-20 21:35:54 +00:00 · 2020-05-20 21:35:54 +00:00 · dbd367f778
commit dbd367f778
parent 701f15a89a
3 changed files with 250 additions and 0 deletions
--- a/Fix-crash-when-loading-external-app.patch
+++ b/Fix-crash-when-loading-external-app.patch
@ -0,0 +1,241 @@
+From 0f442313d3357ef5d3cf1d3419944660d49d146d Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Wed, 20 May 2020 22:50:35 +0200
+Subject: [PATCH] Fix crash when loading an external app KCM like yast
+
+This re-instates the use of KService as a first-class citizen
+in KCModuleInfo, apparently needed for non-plugins.
+
+A unittest ensures that the very basic use of service() on such
+a desktop file doesn't crash.
+
+BUG: 421566
+---
+ CMakeLists.txt                        |  3 +-
+ autotests/CMakeLists.txt              |  7 +++
+ autotests/YaST-systemsettings.desktop |  8 +++
+ autotests/kplugininfotest.cpp         | 42 ++++++++++++++++
+ src/kcmoduleinfo.cpp                  | 71 ++++++++++++++++++++-------
+ 5 files changed, 112 insertions(+), 19 deletions(-)
+ create mode 100644 autotests/CMakeLists.txt
+ create mode 100644 autotests/YaST-systemsettings.desktop
+ create mode 100644 autotests/kplugininfotest.cpp
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e3a3d5c..d2ca3cf 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ 
+ set(REQUIRED_QT_VERSION 5.12.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus Qml Quick QuickWidgets)
+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus Qml Quick QuickWidgets Test)
+ 
+ include(ECMGenerateExportHeader)
+ include(ECMSetupVersion)
+@@ -58,6 +58,7 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+ endif()
+ add_definitions(-DQT_NO_FOREACH)
+ add_subdirectory(src)
+add_subdirectory(autotests)
+ 
+ 
+ # create a Config.cmake and a ConfigVersion.cmake file and install them
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+new file mode 100644
+index 0000000..d494215
+--- /dev/null
+++ b/autotests/CMakeLists.txt
+@@ -0,0 +1,7 @@
+include(ECMAddTests)
+
+ecm_add_tests(
+ kplugininfotest.cpp
+
+ LINK_LIBRARIES KF5KCMUtils Qt5::Test
+)
+diff --git a/autotests/YaST-systemsettings.desktop b/autotests/YaST-systemsettings.desktop
+new file mode 100644
+index 0000000..c33c091
+--- /dev/null
+++ b/autotests/YaST-systemsettings.desktop
+@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Service
+Name=YaST
+Icon=yast-control-center
+GenericName=Administrator Settings
+Exec=kdesu -c /sbin/yast2
+X-KDE-System-Settings-Parent-Category=system-administration 
+X-KDE-ServiceTypes=SystemSettingsExternalApp
+diff --git a/autotests/kplugininfotest.cpp b/autotests/kplugininfotest.cpp
+new file mode 100644
+index 0000000..6541eb4
+--- /dev/null
+++ b/autotests/kplugininfotest.cpp
+@@ -0,0 +1,42 @@
+/* This file is part of the KDE Frameworks
+    Copyright (c) 2020 David Faure <faure@kde.org>
+
+    This library is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2 of the License or ( at
+    your option ) version 3 or, at the discretion of KDE e.V. ( which shall
+    act as a proxy as in section 14 of the GPLv3 ), any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <QTest>
+#include <QObject>
+#include <KCModuleInfo>
+
+class KPluginInfoTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void testExternalApp();
+};
+
+void KPluginInfoTest::testExternalApp()
+{
+    const QString yast = QFINDTESTDATA("YaST-systemsettings.desktop");
+    QVERIFY(!yast.isEmpty());
+    KCModuleInfo info(yast);
+    QVERIFY(info.service());
+}
+
+QTEST_MAIN(KPluginInfoTest)
+#include "kplugininfotest.moc"
+diff --git a/src/kcmoduleinfo.cpp b/src/kcmoduleinfo.cpp
+index 11d6643..efe9adb 100644
+--- a/src/kcmoduleinfo.cpp
+++ b/src/kcmoduleinfo.cpp
+@@ -43,8 +43,12 @@ public:
+     bool        allLoaded = false;
+     int         weight = 100;
+ 
+    // For real C++ plugins
+     KPluginInfo pluginInfo;
+ 
+    // Can be a C++ plugin, or just a desktop file launching an executable (see autotest)
+    KService::Ptr service;
+
+     /**
+      * Reads the service entries specific for KCModule from the desktop file.
+      * The usual desktop entries are read in the Private ctor.
+@@ -73,19 +77,35 @@ KCModuleInfo::Private::Private(const KPluginInfo &pluginInfo)
+     keywords = pluginInfo.property(QStringLiteral("Keywords")).toStringList();
+ }
+ 
+KCModuleInfo::Private::Private(const KService::Ptr &service)
+    : allLoaded(false),
+      pluginInfo(),
+      service(service)
+{
+    if (!service) {
+        return;
+    }
+
+    name = service->name();
+    comment = service->comment();
+    icon = service->icon();
+    fileName = service->entryPath();
+    lib = service->library();
+    keywords = service->keywords();
+}
+
+ KCModuleInfo::KCModuleInfo()
+     : d(new Private)
+ {
+ }
+ 
+ KCModuleInfo::KCModuleInfo(const QString &desktopFile)
+-// TODO KF6: turn this into KPluginMetaData(file) so that most callers still work, after adding the JSON to the .so files
+-    : d(new Private(KPluginInfo(KService::serviceByStorageId(desktopFile))))
+    : d(new Private(KService::serviceByStorageId(desktopFile)))
+ {
+ }
+ 
+ KCModuleInfo::KCModuleInfo(KService::Ptr service)
+-    : d(new Private(KPluginInfo(service)))
+    : d(new Private(service))
+ {
+ }
+ 
+@@ -125,24 +145,39 @@ void KCModuleInfo::Private::loadAll()
+ {
+     allLoaded = true;
+ 
+-    if (!pluginInfo.isValid()) { /* We have a bogus service. All get functions will return empty/zero values */
+    if (!pluginInfo.isValid() && !service) { /* We have a bogus service. All get functions will return empty/zero values */
+         return;
+     }
+ 
+-    // get the documentation path
+-    doc = pluginInfo.property(QStringLiteral("X-DocPath")).toString();
+-    if (doc.isEmpty()) {
+-        doc = pluginInfo.property(QStringLiteral("DocPath")).toString();
+    if (service) {
+        // get the documentation path
+        doc = service->property(QStringLiteral("X-DocPath"), QVariant::String).toString();
+        if (doc.isEmpty()) {
+            doc = service->property(QStringLiteral("DocPath"), QVariant::String).toString();
+        }
+
+        // read weight
+        QVariant tmp = service->property(QStringLiteral("X-KDE-Weight"), QVariant::Int);
+        weight = tmp.isValid() ? tmp.toInt() : 100;
+
+        // factory handle
+        tmp = service->property(QStringLiteral("X-KDE-FactoryName"), QVariant::String);
+        handle = tmp.isValid() ? tmp.toString() : lib;
+    } else {
+        // get the documentation path
+        doc = pluginInfo.property(QStringLiteral("X-DocPath")).toString();
+        if (doc.isEmpty()) {
+            doc = pluginInfo.property(QStringLiteral("DocPath")).toString();
+        }
+
+        // read weight
+        QVariant tmp = pluginInfo.property(QStringLiteral("X-KDE-Weight")).toInt();
+        weight = tmp.isValid() ? tmp.toInt() : 100;
+
+        // factory handle
+        tmp = pluginInfo.property(QStringLiteral("X-KDE-FactoryName"));
+        handle = tmp.isValid() ? tmp.toString() : lib;
+     }
+-
+-    // read weight
+-    QVariant tmp = pluginInfo.property(QStringLiteral("X-KDE-Weight")).toInt();
+-    weight = tmp.isValid() ? tmp.toInt() : 100;
+-
+-    // factory handle
+-    tmp = pluginInfo.property(QStringLiteral("X-KDE-FactoryName"));
+-    handle = tmp.isValid() ? tmp.toString() : lib;
+-
+ }
+ 
+ QString KCModuleInfo::fileName() const
+@@ -162,7 +197,7 @@ QString KCModuleInfo::moduleName() const
+ 
+ KService::Ptr KCModuleInfo::service() const
+ {
+-    return d->pluginInfo.service();
+    return d->service ? d->service : d->pluginInfo.service();
+ }
+ 
+ KPluginInfo KCModuleInfo::pluginInfo() const
+-- 
+2.26.2
+
--- a/kcmutils.changes
+++ b/kcmutils.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 20 21:07:16 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
+
+- Add Fix-crash-when-loading-external-app.patch to fix loading the
+  Yast entry in systemsettings (boo#1171916, kde#421566)
+
 -------------------------------------------------------------------
 Sun May  3 09:39:45 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

--- a/kcmutils.spec
+++ b/kcmutils.spec
@ -36,6 +36,8 @@ Source1:        https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-
 Source2:        frameworks.keyring
 %endif
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM
+Patch:          Fix-crash-when-loading-external-app.patch
 BuildRequires:  cmake >= 3.5
 BuildRequires:  extra-cmake-modules >= %{_kf5_bugfix_version}
 BuildRequires:  fdupes
@ -87,6 +89,7 @@ created with the KConfigWidgets framework. Development files.

 %prep
 %setup -q
+%autopatch -p1

 %build
  %cmake_kf5 -d build