[arch-commits] Commit in kiconthemes/trunk (2 files)

[Felix Yan]

    Date: Wednesday, February 25, 2015 @ 11:30:54
  Author: fyan
Revision: 231967

upgpkg: kiconthemes 5.7.0-2

add patch for FS#43940

Added:
  kiconthemes/trunk/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch
Modified:
  kiconthemes/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |   12 ++++++--
 b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch |   32 +++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-25 04:23:38 UTC (rev 231966)
+++ PKGBUILD	2015-02-25 10:30:54 UTC (rev 231967)
@@ -4,7 +4,7 @@
 
 pkgname=kiconthemes
 pkgver=5.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Support for icon themes'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/kiconthemes'
@@ -12,11 +12,17 @@
 depends=('qt5-svg' 'kconfigwidgets' 'kitemviews')
 makedepends=('extra-cmake-modules' 'python')
 groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('d41b5a4f68e350b1d36e05c99f060e53')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+        'b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch')
+md5sums=('d41b5a4f68e350b1d36e05c99f060e53'
+         'd0b13de27754ed275b0a6ab8d41eb47a')
 
 prepare() {
   mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  # FS#43940
+  patch -p1 -i ../b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch
 }
 
 build() {

Added: b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch
===================================================================
--- b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch	                        (rev 0)
+++ b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch	2015-02-25 10:30:54 UTC (rev 231967)
@@ -0,0 +1,32 @@
+commit b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956
+Author: Olivier Goffart <ogoffart at woboq.com>
+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)