git » plasma-framework.git » commit c7f27b7

KDE Frameworks 5.12

author Antonio Rojas
2015-07-10 10:10:51 UTC
committer Antonio Rojas
2015-07-10 10:10:51 UTC
parent fccb58c1763031e03335acedea556ed180e5d835

KDE Frameworks 5.12

PKGBUILD +4 -9
applet-config.patch +0 -29

diff --git a/PKGBUILD b/PKGBUILD
index ebd7504..f8afb08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=plasma-framework
-pkgver=5.11.0
-pkgrel=2
+pkgver=5.12.0
+pkgrel=1
 pkgdesc='Plasma library and runtime components based upon KF5 and Qt5'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/plasma-framework'
@@ -11,16 +11,11 @@ license=('LGPL')
 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" 'applet-config.patch')
-md5sums=('de179500e7536dadd33a4b4b3a5f9ed1'
-         'e9ed934d2f52a6919611d650c3c60671')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('5d995245c69498886e7e2a546cc095eb')
 
 prepare() {
   mkdir -p build
-
-# Fix occasional empty applet config pages
-  cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir"/applet-config.patch
 }
 
 build() {
diff --git a/applet-config.patch b/applet-config.patch
deleted file mode 100644
index 35fcb46..0000000
--- a/applet-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Kai Uwe Broulik <kde@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());
-         }
-     }
-