[arch-commits] Commit in kiconthemes/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Jul 12 10:05:41 UTC 2016
Date: Tuesday, July 12, 2016 @ 10:05:41
Author: arojas
Revision: 271489
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kiconthemes/repos/testing-i686/PKGBUILD
(from rev 271488, kiconthemes/trunk/PKGBUILD)
kiconthemes/repos/testing-i686/kdebug-365130.patch
(from rev 271488, kiconthemes/trunk/kdebug-365130.patch)
kiconthemes/repos/testing-x86_64/PKGBUILD
(from rev 271488, kiconthemes/trunk/PKGBUILD)
kiconthemes/repos/testing-x86_64/kdebug-365130.patch
(from rev 271488, kiconthemes/trunk/kdebug-365130.patch)
Deleted:
kiconthemes/repos/testing-i686/PKGBUILD
kiconthemes/repos/testing-x86_64/PKGBUILD
------------------------------------+
/PKGBUILD | 82 +++++++++++++++++++++++++++++++++++
testing-i686/PKGBUILD | 35 --------------
testing-i686/kdebug-365130.patch | 56 +++++++++++++++++++++++
testing-x86_64/PKGBUILD | 35 --------------
testing-x86_64/kdebug-365130.patch | 56 +++++++++++++++++++++++
5 files changed, 194 insertions(+), 70 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-07-12 10:05:08 UTC (rev 271488)
+++ testing-i686/PKGBUILD 2016-07-12 10:05:41 UTC (rev 271489)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kiconthemes
-pkgver=5.24.0
-pkgrel=1
-pkgdesc='Support for icon themes'
-arch=('i686' 'x86_64')
-url='https://community.kde.org/Frameworks'
-license=('LGPL')
-depends=('qt5-svg' 'kconfigwidgets' 'kitemviews' 'karchive')
-makedepends=('extra-cmake-modules' 'python' 'mesa')
-groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('74b986efc24bec1e78b9e72b4c0defcd')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kiconthemes/repos/testing-i686/PKGBUILD (from rev 271488, kiconthemes/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-07-12 10:05:41 UTC (rev 271489)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kiconthemes
+pkgver=5.24.0
+pkgrel=2
+pkgdesc='Support for icon themes'
+arch=('i686' 'x86_64')
+url='https://community.kde.org/Frameworks'
+license=('LGPL')
+depends=('qt5-svg' 'kconfigwidgets' 'kitemviews' 'karchive')
+makedepends=('extra-cmake-modules' 'python' 'mesa')
+groups=('kf5')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+ kdebug-365130.patch)
+md5sums=('74b986efc24bec1e78b9e72b4c0defcd'
+ '680419b1157cdd7396cd2170b0b89bc2')
+
+prepare() {
+ mkdir -p build
+
+# Fix missing icons http://bugs.kde.org/show_bug.cgi?id=365130
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kdebug-365130.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kiconthemes/repos/testing-i686/kdebug-365130.patch (from rev 271488, kiconthemes/trunk/kdebug-365130.patch)
===================================================================
--- testing-i686/kdebug-365130.patch (rev 0)
+++ testing-i686/kdebug-365130.patch 2016-07-12 10:05:41 UTC (rev 271489)
@@ -0,0 +1,56 @@
+From: David Rosca <nowrep at gmail.com>
+Date: Tue, 12 Jul 2016 07:54:04 +0000
+Subject: KIconEngine: Fix QIcon::hasThemeIcon always returning true
+X-Git-Url: http://quickgit.kde.org/?p=kiconthemes.git&a=commitdiff&h=0abf1b7a148cf6b27caea01a329631e0f1daa983
+---
+KIconEngine: Fix QIcon::hasThemeIcon always returning true
+
+QIcon::hasThemeIcon(name) checks if QIcon::name() == name,
+so icon engine must return empty string when icon doesn't exist.
+Also implement IsNullHook for Qt 5.7. Comes with autotest.
+
+REVIEW: 128397
+BUG: 365130
+---
+
+
+--- a/src/kiconengine.cpp
++++ b/src/kiconengine.cpp
+@@ -116,6 +116,9 @@
+
+ QString KIconEngine::iconName() const
+ {
++ if (!mIconLoader || !mIconLoader->hasIcon(mIconName)) {
++ return QString();
++ }
+ return mIconName;
+ }
+
+@@ -156,3 +159,15 @@
+ return true;
+ }
++
++void KIconEngine::virtual_hook(int id, void *data)
++{
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++ if (id == QIconEngine::IsNullHook) {
++#else
++ if (id == 3) {
++#endif
++ *reinterpret_cast<bool*>(data) = !mIconLoader || !mIconLoader->hasIcon(mIconName);
++ }
++ QIconEngine::virtual_hook(id, data);
++}
+
+--- a/src/kiconengine.h
++++ b/src/kiconengine.h
+@@ -78,6 +78,8 @@
+ bool read(QDataStream &in) Q_DECL_OVERRIDE;
+ bool write(QDataStream &out) const Q_DECL_OVERRIDE;
+
++ void virtual_hook(int id, void *data) Q_DECL_OVERRIDE;
++
+ private:
+ //TODO KF6: move those into the d-pointer
+ QString mIconName;
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-07-12 10:05:08 UTC (rev 271488)
+++ testing-x86_64/PKGBUILD 2016-07-12 10:05:41 UTC (rev 271489)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kiconthemes
-pkgver=5.24.0
-pkgrel=1
-pkgdesc='Support for icon themes'
-arch=('i686' 'x86_64')
-url='https://community.kde.org/Frameworks'
-license=('LGPL')
-depends=('qt5-svg' 'kconfigwidgets' 'kitemviews' 'karchive')
-makedepends=('extra-cmake-modules' 'python' 'mesa')
-groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('74b986efc24bec1e78b9e72b4c0defcd')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kiconthemes/repos/testing-x86_64/PKGBUILD (from rev 271488, kiconthemes/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-07-12 10:05:41 UTC (rev 271489)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kiconthemes
+pkgver=5.24.0
+pkgrel=2
+pkgdesc='Support for icon themes'
+arch=('i686' 'x86_64')
+url='https://community.kde.org/Frameworks'
+license=('LGPL')
+depends=('qt5-svg' 'kconfigwidgets' 'kitemviews' 'karchive')
+makedepends=('extra-cmake-modules' 'python' 'mesa')
+groups=('kf5')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+ kdebug-365130.patch)
+md5sums=('74b986efc24bec1e78b9e72b4c0defcd'
+ '680419b1157cdd7396cd2170b0b89bc2')
+
+prepare() {
+ mkdir -p build
+
+# Fix missing icons http://bugs.kde.org/show_bug.cgi?id=365130
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kdebug-365130.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kiconthemes/repos/testing-x86_64/kdebug-365130.patch (from rev 271488, kiconthemes/trunk/kdebug-365130.patch)
===================================================================
--- testing-x86_64/kdebug-365130.patch (rev 0)
+++ testing-x86_64/kdebug-365130.patch 2016-07-12 10:05:41 UTC (rev 271489)
@@ -0,0 +1,56 @@
+From: David Rosca <nowrep at gmail.com>
+Date: Tue, 12 Jul 2016 07:54:04 +0000
+Subject: KIconEngine: Fix QIcon::hasThemeIcon always returning true
+X-Git-Url: http://quickgit.kde.org/?p=kiconthemes.git&a=commitdiff&h=0abf1b7a148cf6b27caea01a329631e0f1daa983
+---
+KIconEngine: Fix QIcon::hasThemeIcon always returning true
+
+QIcon::hasThemeIcon(name) checks if QIcon::name() == name,
+so icon engine must return empty string when icon doesn't exist.
+Also implement IsNullHook for Qt 5.7. Comes with autotest.
+
+REVIEW: 128397
+BUG: 365130
+---
+
+
+--- a/src/kiconengine.cpp
++++ b/src/kiconengine.cpp
+@@ -116,6 +116,9 @@
+
+ QString KIconEngine::iconName() const
+ {
++ if (!mIconLoader || !mIconLoader->hasIcon(mIconName)) {
++ return QString();
++ }
+ return mIconName;
+ }
+
+@@ -156,3 +159,15 @@
+ return true;
+ }
++
++void KIconEngine::virtual_hook(int id, void *data)
++{
++#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++ if (id == QIconEngine::IsNullHook) {
++#else
++ if (id == 3) {
++#endif
++ *reinterpret_cast<bool*>(data) = !mIconLoader || !mIconLoader->hasIcon(mIconName);
++ }
++ QIconEngine::virtual_hook(id, data);
++}
+
+--- a/src/kiconengine.h
++++ b/src/kiconengine.h
+@@ -78,6 +78,8 @@
+ bool read(QDataStream &in) Q_DECL_OVERRIDE;
+ bool write(QDataStream &out) const Q_DECL_OVERRIDE;
+
++ void virtual_hook(int id, void *data) Q_DECL_OVERRIDE;
++
+ private:
+ //TODO KF6: move those into the d-pointer
+ QString mIconName;
+
More information about the arch-commits
mailing list