Date: Friday, March 13, 2015 @ 18:08:49 Author: fyan Revision: 233493
upgpkg: kiconthemes 5.8.0-1 KF 5.8 Modified: kiconthemes/trunk/PKGBUILD Deleted: kiconthemes/trunk/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch ------------------------------------------------+ PKGBUILD | 14 ++-------- b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch | 32 ----------------------- 2 files changed, 4 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-13 17:08:43 UTC (rev 233492) +++ PKGBUILD 2015-03-13 17:08:49 UTC (rev 233493) @@ -3,8 +3,8 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=kiconthemes -pkgver=5.7.0 -pkgrel=2 +pkgver=5.8.0 +pkgrel=1 pkgdesc='Support for icon themes' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/frameworks/kiconthemes' @@ -12,17 +12,11 @@ depends=('qt5-svg' 'kconfigwidgets' 'kitemviews') makedepends=('extra-cmake-modules' 'python') groups=('kf5') -source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"; - 'b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch') -md5sums=('d41b5a4f68e350b1d36e05c99f060e53' - 'd0b13de27754ed275b0a6ab8d41eb47a') +source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) +md5sums=('bebd631369a52c8ce3b168f033688a8d') prepare() { mkdir -p build - - cd ${pkgname}-${pkgver} - # FS#43940 - patch -p1 -i ../b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch } build() { Deleted: b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch =================================================================== --- b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch 2015-03-13 17:08:43 UTC (rev 233492) +++ b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch 2015-03-13 17:08:49 UTC (rev 233493) @@ -1,32 +0,0 @@ -commit b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956 -Author: Olivier Goffart <[email protected]> -Date: Tue Feb 17 15:24:08 2015 +0100 - - Fix QIcon::fromTheme(xxx, someFallback) would not return the fallback - - because KIconEngine::availableSize always return something even if the icon - is not there - - BUG: 342906 - REVIEW: 122608 - -diff --git a/src/kiconengine.cpp b/src/kiconengine.cpp -index 530403e..6dff533 100644 ---- a/src/kiconengine.cpp -+++ b/src/kiconengine.cpp -@@ -111,6 +111,15 @@ QList<QSize> KIconEngine::availableSizes(QIcon::Mode mode, QIcon::State state) c - { - Q_UNUSED(mode); - Q_UNUSED(state); -+ -+ if (!mIconLoader) { -+ return QList<QSize>(); -+ } -+ -+ if (mIconLoader->iconPath(mIconName, KIconLoader::Desktop, KIconLoader::MatchBest).isEmpty()) { -+ return QList<QSize>(); -+ } -+ - return QList<QSize>() << QSize(16, 16) - << QSize(22, 22) - << QSize(32, 32)
