[arch-commits] Commit in kiconthemes/repos (6 files)
Felix Yan
fyan at archlinux.org
Wed Feb 25 10:31:24 UTC 2015
Date: Wednesday, February 25, 2015 @ 11:31:23
Author: fyan
Revision: 231968
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kiconthemes/repos/extra-i686/PKGBUILD
(from rev 231967, kiconthemes/trunk/PKGBUILD)
kiconthemes/repos/extra-i686/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch
(from rev 231967, kiconthemes/trunk/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch)
kiconthemes/repos/extra-x86_64/PKGBUILD
(from rev 231967, kiconthemes/trunk/PKGBUILD)
kiconthemes/repos/extra-x86_64/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch
(from rev 231967, kiconthemes/trunk/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch)
Deleted:
kiconthemes/repos/extra-i686/PKGBUILD
kiconthemes/repos/extra-x86_64/PKGBUILD
-------------------------------------------------------------+
/PKGBUILD | 84 ++++++++++
extra-i686/PKGBUILD | 36 ----
extra-i686/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch | 32 +++
extra-x86_64/PKGBUILD | 36 ----
extra-x86_64/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch | 32 +++
5 files changed, 148 insertions(+), 72 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-02-25 10:30:54 UTC (rev 231967)
+++ extra-i686/PKGBUILD 2015-02-25 10:31:23 UTC (rev 231968)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kiconthemes
-pkgver=5.7.0
-pkgrel=1
-pkgdesc='Support for icon themes'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kiconthemes'
-license=('LGPL')
-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')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kiconthemes/repos/extra-i686/PKGBUILD (from rev 231967, kiconthemes/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-25 10:31:23 UTC (rev 231968)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kiconthemes
+pkgver=5.7.0
+pkgrel=2
+pkgdesc='Support for icon themes'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kiconthemes'
+license=('LGPL')
+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')
+
+prepare() {
+ mkdir -p build
+
+ cd ${pkgname}-${pkgver}
+ # FS#43940
+ patch -p1 -i ../b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kiconthemes/repos/extra-i686/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch (from rev 231967, kiconthemes/trunk/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch)
===================================================================
--- extra-i686/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch (rev 0)
+++ extra-i686/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch 2015-02-25 10:31:23 UTC (rev 231968)
@@ -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)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-02-25 10:30:54 UTC (rev 231967)
+++ extra-x86_64/PKGBUILD 2015-02-25 10:31:23 UTC (rev 231968)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kiconthemes
-pkgver=5.7.0
-pkgrel=1
-pkgdesc='Support for icon themes'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kiconthemes'
-license=('LGPL')
-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')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kiconthemes/repos/extra-x86_64/PKGBUILD (from rev 231967, kiconthemes/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-02-25 10:31:23 UTC (rev 231968)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kiconthemes
+pkgver=5.7.0
+pkgrel=2
+pkgdesc='Support for icon themes'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kiconthemes'
+license=('LGPL')
+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')
+
+prepare() {
+ mkdir -p build
+
+ cd ${pkgname}-${pkgver}
+ # FS#43940
+ patch -p1 -i ../b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kiconthemes/repos/extra-x86_64/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch (from rev 231967, kiconthemes/trunk/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch)
===================================================================
--- extra-x86_64/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch (rev 0)
+++ extra-x86_64/b0a6df6fbd9117b41a7f4e3bc861e20fbadb1956.patch 2015-02-25 10:31:23 UTC (rev 231968)
@@ -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)
More information about the arch-commits
mailing list