From 8c228d60e990e762f8c852c5cf9f9f629fc87bc7 Mon Sep 17 00:00:00 2001 From: "Luis Gustavo S. Barreto" Date: Fri, 15 Apr 2016 20:26:32 +0000 Subject: [PATCH] plasma-framework: Add patch to revert commit 309c64f Revert "Don't import an nonexistent layout". If importLayout() method are not called the startupCompleted signal never gets emitted causing a slow startup of Plasma Desktop. Signed-off-by: Luis Gustavo S. Barreto --- ...t-Don-t-import-an-nonexistent-layout.patch | 32 +++++++++++++++++++ .../plasma-framework/plasma-framework.bb | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 recipes-kde/kf5/tier3/plasma-framework/files/0001-Revert-Don-t-import-an-nonexistent-layout.patch diff --git a/recipes-kde/kf5/tier3/plasma-framework/files/0001-Revert-Don-t-import-an-nonexistent-layout.patch b/recipes-kde/kf5/tier3/plasma-framework/files/0001-Revert-Don-t-import-an-nonexistent-layout.patch new file mode 100644 index 00000000..6b81c52d --- /dev/null +++ b/recipes-kde/kf5/tier3/plasma-framework/files/0001-Revert-Don-t-import-an-nonexistent-layout.patch @@ -0,0 +1,32 @@ +From c1e36f4aeec194f26b6347dfa5be1246fa21da05 Mon Sep 17 00:00:00 2001 +From: "Luis Gustavo S. Barreto" +Date: Fri, 15 Apr 2016 16:02:52 -0300 +Subject: [PATCH] Revert "Don't import an nonexistent layout" + +This reverts commit 309c64f5e90453c5253baf19e6c01759e8aa6f83. + +Upstream-Status: Submitted [https://git.reviewboard.kde.org/r/127345] + +Signed-off-by: Luis Gustavo S. Barreto +--- + src/plasma/corona.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp +index 1784516..5d17550 100644 +--- a/src/plasma/corona.cpp ++++ b/src/plasma/corona.cpp +@@ -176,9 +176,7 @@ void Corona::loadLayout(const QString &configName) + } + + KConfigGroup conf(config(), QString()); +- if (!config()->groupList().isEmpty()) { +- d->importLayout(conf, false); +- } ++ d->importLayout(conf, false); + + KConfigGroup cg(config(), "General"); + setImmutability((Plasma::Types::ImmutabilityType)cg.readEntry("immutability", (int)Plasma::Types::Mutable)); +-- +2.7.4 + diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb index 4d044f5d..ff5a0449 100644 --- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb +++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb @@ -34,6 +34,8 @@ PV = "${KF5_VERSION}" SRC_URI[md5sum] = "d2ba9565e7f5338bfd96976fcc65c34f" SRC_URI[sha256sum] = "80a5e1812cc9e8eb13d5a37809027a7ba8968db733425c5638232bdb9047d300" +SRC_URI += "file://0001-Revert-Don-t-import-an-nonexistent-layout.patch" + # cross libs / headers CMAKE_ALIGN_SYSROOT[1] = "KF5Plasma, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" CMAKE_ALIGN_SYSROOT[2] = "KF5Plasma, -S${includedir}, -S${STAGING_INCDIR}"