[arch-commits] Commit in plasma-framework/trunk (PKGBUILD applet-config.patch)

[Antonio Rojas]

    Date: Wednesday, June 17, 2015 @ 21:44:51
  Author: arojas
Revision: 240995

Fix occasional empty applet config pages (FS#45350)

Added:
  plasma-framework/trunk/applet-config.patch
Modified:
  plasma-framework/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   11 ++++++++---
 applet-config.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-17 19:39:14 UTC (rev 240994)
+++ PKGBUILD	2015-06-17 19:44:51 UTC (rev 240995)
@@ -4,7 +4,7 @@
 
 pkgname=plasma-framework
 pkgver=5.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Plasma library and runtime components based upon KF5 and Qt5'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/plasma-framework'
@@ -12,11 +12,16 @@
 depends=('qt5-quickcontrols' 'kactivities-frameworks')
 makedepends=('extra-cmake-modules' 'qt5-tools' 'kdoctools')
 groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('de179500e7536dadd33a4b4b3a5f9ed1')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" 'applet-config.patch')
+md5sums=('de179500e7536dadd33a4b4b3a5f9ed1'
+         'e9ed934d2f52a6919611d650c3c60671')
 
 prepare() {
   mkdir -p build
+
+# Fix occasional empty applet config pages
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir"/applet-config.patch
 }
 
 build() {

Added: applet-config.patch
===================================================================
--- applet-config.patch	                        (rev 0)
+++ applet-config.patch	2015-06-17 19:44:51 UTC (rev 240995)
@@ -0,0 +1,29 @@
+From: Kai Uwe Broulik <kde at privat.broulik.de>
+Date: Wed, 17 Jun 2015 16:28:12 +0000
+Subject: Ignore invalid X-Plasma-ConfigPlugins
+X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=ac04b5570a4072dcb0365387bc739c870a68fe65
+---
+Ignore invalid X-Plasma-ConfigPlugins
+
+CHANGELOG: Fix occasional empty applet config pages
+
+CCBUG: 349250
+REVIEW: 124113
+---
+
+
+--- a/src/plasmaquick/configview.cpp
++++ b/src/plasmaquick/configview.cpp
+@@ -145,6 +145,11 @@
+             KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + kcm));
+             KPluginMetaData md(loader.fileName());
+ 
++            if (!md.isValid()) {
++                qWarning() << "Could not find" << kcm << "specified in X-Plasma-ConfigPlugins";
++                continue;
++            }
++
+             configModel->appendCategory(md.iconName(), md.name(), QString(), loader.fileName());
+         }
+     }
+