Date: Saturday, December 12, 2015 @ 17:53:59 Author: fyan Revision: 255950
upgpkg: plasma-framework 5.17.0-1 KF 5.17.0 Modified: plasma-framework/trunk/PKGBUILD Deleted: plasma-framework/trunk/bug355577.patch -----------------+ PKGBUILD | 14 +++---------- bug355577.patch | 55 ------------------------------------------------------ 2 files changed, 4 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-12 16:53:50 UTC (rev 255949) +++ PKGBUILD 2015-12-12 16:53:59 UTC (rev 255950) @@ -3,8 +3,8 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=plasma-framework -pkgver=5.16.0 -pkgrel=3 +pkgver=5.17.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' @@ -12,17 +12,11 @@ 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') +source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz";) +md5sums=('5b0f2f31497c81870f3ccc68e3e7a5fa') 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() { Deleted: bug355577.patch =================================================================== --- bug355577.patch 2015-12-12 16:53:50 UTC (rev 255949) +++ bug355577.patch 2015-12-12 16:53:59 UTC (rev 255950) @@ -1,55 +0,0 @@ -From: Kai Uwe Broulik <[email protected]> -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()) { -
