[arch-commits] Commit in plasma-framework/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Wed Jun 17 19:47:00 UTC 2015
Date: Wednesday, June 17, 2015 @ 21:47:00
Author: arojas
Revision: 240998
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
plasma-framework/repos/extra-i686/PKGBUILD
(from rev 240997, plasma-framework/trunk/PKGBUILD)
plasma-framework/repos/extra-i686/applet-config.patch
(from rev 240997, plasma-framework/trunk/applet-config.patch)
plasma-framework/repos/extra-x86_64/PKGBUILD
(from rev 240997, plasma-framework/trunk/PKGBUILD)
plasma-framework/repos/extra-x86_64/applet-config.patch
(from rev 240997, plasma-framework/trunk/applet-config.patch)
Deleted:
plasma-framework/repos/extra-i686/PKGBUILD
plasma-framework/repos/extra-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 84 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 37 ----------------
extra-i686/applet-config.patch | 29 ++++++++++++
extra-x86_64/PKGBUILD | 37 ----------------
extra-x86_64/applet-config.patch | 29 ++++++++++++
5 files changed, 142 insertions(+), 74 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-06-17 19:45:53 UTC (rev 240997)
+++ extra-i686/PKGBUILD 2015-06-17 19:47:00 UTC (rev 240998)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=plasma-framework
-pkgver=5.11.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'
-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")
-md5sums=('de179500e7536dadd33a4b4b3a5f9ed1')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DQML_INSTALL_DIR=lib/qt/qml \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: plasma-framework/repos/extra-i686/PKGBUILD (from rev 240997, plasma-framework/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-06-17 19:47:00 UTC (rev 240998)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=plasma-framework
+pkgver=5.11.0
+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'
+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')
+
+prepare() {
+ mkdir -p build
+
+# Fix occasional empty applet config pages
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/applet-config.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DQML_INSTALL_DIR=lib/qt/qml \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: plasma-framework/repos/extra-i686/applet-config.patch (from rev 240997, plasma-framework/trunk/applet-config.patch)
===================================================================
--- extra-i686/applet-config.patch (rev 0)
+++ extra-i686/applet-config.patch 2015-06-17 19:47:00 UTC (rev 240998)
@@ -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());
+ }
+ }
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-06-17 19:45:53 UTC (rev 240997)
+++ extra-x86_64/PKGBUILD 2015-06-17 19:47:00 UTC (rev 240998)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=plasma-framework
-pkgver=5.11.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'
-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")
-md5sums=('de179500e7536dadd33a4b4b3a5f9ed1')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DQML_INSTALL_DIR=lib/qt/qml \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: plasma-framework/repos/extra-x86_64/PKGBUILD (from rev 240997, plasma-framework/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-06-17 19:47:00 UTC (rev 240998)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=plasma-framework
+pkgver=5.11.0
+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'
+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')
+
+prepare() {
+ mkdir -p build
+
+# Fix occasional empty applet config pages
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/applet-config.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DQML_INSTALL_DIR=lib/qt/qml \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: plasma-framework/repos/extra-x86_64/applet-config.patch (from rev 240997, plasma-framework/trunk/applet-config.patch)
===================================================================
--- extra-x86_64/applet-config.patch (rev 0)
+++ extra-x86_64/applet-config.patch 2015-06-17 19:47:00 UTC (rev 240998)
@@ -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());
+ }
+ }
+
More information about the arch-commits
mailing list