[arch-commits] Commit in plasma-framework/repos (6 files)
Felix Yan
fyan at archlinux.org
Tue Dec 8 12:47:37 UTC 2015
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 <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+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.patch 2015-12-08 12:47:37 UTC (rev 253779)
@@ -0,0 +1,55 @@
+From: Kai Uwe Broulik <kde at privat.broulik.de>
+Date: Wed, 25 Nov 2015 17:17:57 +0000
+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() + ".svgz", qMin(width(), height()), KIconLoader::MatchBest);
++ const auto *iconTheme = KIconLoader::global()->theme();
++ QString iconPath;
++ if (iconTheme) {
++ QString iconPath = 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";
+ }
+
+ if (!iconPath.isEmpty()) {
+
Copied: plasma-framework/repos/staging-x86_64/PKGBUILD (from rev 253778, plasma-framework/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-08 12:47:37 UTC (rev 253779)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+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-x86_64/bug355577.patch (from rev 253778, plasma-framework/trunk/bug355577.patch)
===================================================================
--- staging-x86_64/bug355577.patch (rev 0)
+++ staging-x86_64/bug355577.patch 2015-12-08 12:47:37 UTC (rev 253779)
@@ -0,0 +1,55 @@
+From: Kai Uwe Broulik <kde at privat.broulik.de>
+Date: Wed, 25 Nov 2015 17:17:57 +0000
+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() + ".svgz", qMin(width(), height()), KIconLoader::MatchBest);
++ const auto *iconTheme = KIconLoader::global()->theme();
++ QString iconPath;
++ if (iconTheme) {
++ QString iconPath = 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";
+ }
+
+ if (!iconPath.isEmpty()) {
+
More information about the arch-commits
mailing list