[arch-commits] Commit in plasma-framework/repos (6 files)
Date: Tuesday, December 8, 2015 @ 13:47:37 Author: fyan Revision: 253779 archrelease: copy trunk to staging-i686, staging-x86_64 Added: plasma-framework/repos/staging-i686/ plasma-framework/repos/staging-i686/PKGBUILD (from rev 253778, plasma-framework/trunk/PKGBUILD) plasma-framework/repos/staging-i686/bug355577.patch (from rev 253778, plasma-framework/trunk/bug355577.patch) plasma-framework/repos/staging-x86_64/ plasma-framework/repos/staging-x86_64/PKGBUILD (from rev 253778, plasma-framework/trunk/PKGBUILD) plasma-framework/repos/staging-x86_64/bug355577.patch (from rev 253778, plasma-framework/trunk/bug355577.patch) + staging-i686/PKGBUILD | 43 ++ staging-i686/bug355577.patch | 55 +++ staging-x86_64/PKGBUILD| 43 ++ staging-x86_64/bug355577.patch | 55 +++ 4 files changed, 196 insertions(+) Copied: plasma-framework/repos/staging-i686/PKGBUILD (from rev 253778, plasma-framework/trunk/PKGBUILD) === --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-12-08 12:47:37 UTC (rev 253779) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Felix Yan +# Contributor: Andrea Scarpino + +pkgname=plasma-framework +pkgver=5.16.0 +pkgrel=3 +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"; +'bug355577.patch') +md5sums=('bf64d612d33c73c51841d74540cc119f' + '64e1544f397fcc210bd93a184a181903') + +prepare() { + mkdir -p build + +# Fix crash in SDDM https://bugs.kde.org/show_bug.cgi?id=355577 + cd $pkgname-$pkgver + patch -p1 -i ../bug355577.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/staging-i686/bug355577.patch (from rev 253778, plasma-framework/trunk/bug355577.patch) === --- staging-i686/bug355577.patch(rev 0) +++ staging-i686/bug355577.patch2015-12-08 12:47:37 UTC (rev 253779) @@ -0,0 +1,55 @@ +From: Kai Uwe Broulik +Date: Wed, 25 Nov 2015 17:17:57 + +Subject: [IconItem] Don't crash on null KIconLoader theme +X-Git-Tag: v5.17.0-rc1 +X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=9ccc6293f792bb5a5cae624568c0073a73064b88 +--- +[IconItem] Don't crash on null KIconLoader theme + +REVIEW: 126168 +BUG: 355577 +FIXED-IN: 5.17 +--- + + +--- a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp +@@ -134,9 +134,15 @@ + //ok, svg not available from the plasma theme + } else { + //try to load from iconloader an svg with Plasma::Svg +-QString iconPath = KIconLoader::global()->theme()->iconPath(source.toString() + ".svg", qMin(width(), height()), KIconLoader::MatchBest); +-if (iconPath.isEmpty()) { +-iconPath = KIconLoader::global()->theme()->iconPath(source.toString() + ".svgz", qMin(width(), height()), KIconLoader::MatchBest); ++const auto *iconTheme = KIconLoader::global()->theme(); ++QString iconPath; ++if (iconTheme) { ++iconTheme->iconPath(source.toString() + ".svg", qMin(width(), height()), KIconLoader::MatchBest); ++if (iconPath.isEmpty()) { ++iconPath = iconTheme->iconPath(source.toString() + ".svgz", qMin(width(), height()), KIconLoader::MatchBest); ++} ++} else { ++qWarning() << "KIconLoader has no theme set"; + } + m_svgFromIconLoader = !iconPath.isEmpty(); + +@@ -339,9 +345,15 @@ + if (m_svgIcon->hasElement(m_source.toString())) { + result = m_svgIcon->pixmap(m_source.toString()); + } else if (m_svgFromIconLoader) { +-QString iconPath = KIconLoader::global()->theme()->iconPath(source().toString() + ".svg", qMin(width(), height()), KIconLoader::MatchBest); +-if (iconPath.isEmpty()) { +-iconPath = KIconLoader::global()->theme()->iconPath(source().toString() + ".sv
[arch-commits] Commit in plasma-framework/repos (6 files)
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 -# Contributor: Andrea Scarpino - -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 +# Contributor: Andrea Scarpino + +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 +Date: Wed, 17 Jun 2015 16:28:12 + +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