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 <gustavo@ossystems.com.br>
This commit is contained in:
Luis Gustavo S. Barreto
2016-04-15 20:26:32 +00:00
committed by Otavio Salvador
parent c19178c58a
commit 8c228d60e9
2 changed files with 34 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
From c1e36f4aeec194f26b6347dfa5be1246fa21da05 Mon Sep 17 00:00:00 2001
From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
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 <gustavo@ossystems.com.br>
---
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

View File

@@ -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}"