[arch-commits] Commit in deepin-dock/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Mon Feb 20 12:12:14 UTC 2017
Date: Monday, February 20, 2017 @ 12:12:14
Author: felixonmars
Revision: 213191
archrelease: copy trunk to community-i686, community-x86_64
Added:
deepin-dock/repos/community-i686/PKGBUILD
(from rev 213190, deepin-dock/trunk/PKGBUILD)
deepin-dock/repos/community-i686/fix-null-pixmap.patch
(from rev 213190, deepin-dock/trunk/fix-null-pixmap.patch)
deepin-dock/repos/community-x86_64/PKGBUILD
(from rev 213190, deepin-dock/trunk/PKGBUILD)
deepin-dock/repos/community-x86_64/fix-null-pixmap.patch
(from rev 213190, deepin-dock/trunk/fix-null-pixmap.patch)
Deleted:
deepin-dock/repos/community-i686/PKGBUILD
deepin-dock/repos/community-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 30 ------------
community-i686/fix-null-pixmap.patch | 29 ++++++++++++
community-x86_64/PKGBUILD | 30 ------------
community-x86_64/fix-null-pixmap.patch | 29 ++++++++++++
5 files changed, 132 insertions(+), 60 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-02-20 12:11:35 UTC (rev 213190)
+++ community-i686/PKGBUILD 2017-02-20 12:12:14 UTC (rev 213191)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-dock
-pkgver=4.1.1
-pkgrel=1
-pkgdesc='Deepin desktop-environment - dock module'
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/dde-dock"
-license=('GPL3')
-depends=('gtk2' 'deepin-tool-kit' 'qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-qt5integration' 'deepin-qt-dbus-factory')
-makedepends=('git' 'qt5-tools')
-conflicts=('dde-dock')
-replaces=('dde-dock')
-groups=('deepin')
-source=("git+https://cr.deepin.io/dde/dde-dock.git#tag=$pkgver")
-sha256sums=('SKIP')
-
-build() {
- cd dde-dock
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd dde-dock
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: deepin-dock/repos/community-i686/PKGBUILD (from rev 213190, deepin-dock/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-20 12:12:14 UTC (rev 213191)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-dock
+pkgver=4.1.1
+pkgrel=2
+pkgdesc='Deepin desktop-environment - dock module'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/dde-dock"
+license=('GPL3')
+depends=('gtk2' 'deepin-tool-kit' 'qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-qt5integration' 'deepin-qt-dbus-factory')
+makedepends=('git' 'qt5-tools')
+conflicts=('dde-dock')
+replaces=('dde-dock')
+groups=('deepin')
+source=("git+https://cr.deepin.io/dde/dde-dock.git#tag=$pkgver"
+ fix-null-pixmap.patch)
+sha256sums=('SKIP'
+ 'a6340bddad48f6cf27387c130f0546b042873654f3ea05615d6896b46cda54de')
+
+prepare() {
+ cd dde-dock
+ patch -p1 -i ../fix-null-pixmap.patch
+}
+
+build() {
+ cd dde-dock
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd dde-dock
+ make INSTALL_ROOT="${pkgdir}" install
+}
Copied: deepin-dock/repos/community-i686/fix-null-pixmap.patch (from rev 213190, deepin-dock/trunk/fix-null-pixmap.patch)
===================================================================
--- community-i686/fix-null-pixmap.patch (rev 0)
+++ community-i686/fix-null-pixmap.patch 2017-02-20 12:12:14 UTC (rev 213191)
@@ -0,0 +1,29 @@
+commit 90e102335bc45af76455a8591ca3b2d5b0aa6e44
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Mon Feb 20 20:05:26 2017 +0800
+
+ Only return QPixmap when it is not null
+
+ QFile::exists() returns true even for executables in $PATH, and loading
+ those files with QPixmap() will return a null object.
+
+ Change-Id: I29a954aa2d504ca051b7328978426b6b993da753
+
+diff --git a/frame/util/themeappicon.cpp b/frame/util/themeappicon.cpp
+index b8e1587..b150b97 100644
+--- a/frame/util/themeappicon.cpp
++++ b/frame/util/themeappicon.cpp
+@@ -18,8 +18,11 @@ QPixmap ThemeAppIcon::getIcon(const QString iconName, const int size)
+ {
+ QPixmap pixmap(size, size);
+
+- if (QFile::exists(iconName))
+- return QPixmap(iconName);
++ if (QFile::exists(iconName)) {
++ pixmap = QPixmap(iconName);
++ if (!pixmap.isNull())
++ return pixmap;
++ }
+ if (iconName.startsWith("data:image/"))
+ {
+ const QStringList strs = iconName.split("base64,");
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-02-20 12:11:35 UTC (rev 213190)
+++ community-x86_64/PKGBUILD 2017-02-20 12:12:14 UTC (rev 213191)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-dock
-pkgver=4.1.1
-pkgrel=1
-pkgdesc='Deepin desktop-environment - dock module'
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/dde-dock"
-license=('GPL3')
-depends=('gtk2' 'deepin-tool-kit' 'qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-qt5integration' 'deepin-qt-dbus-factory')
-makedepends=('git' 'qt5-tools')
-conflicts=('dde-dock')
-replaces=('dde-dock')
-groups=('deepin')
-source=("git+https://cr.deepin.io/dde/dde-dock.git#tag=$pkgver")
-sha256sums=('SKIP')
-
-build() {
- cd dde-dock
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd dde-dock
- make INSTALL_ROOT="${pkgdir}" install
-}
Copied: deepin-dock/repos/community-x86_64/PKGBUILD (from rev 213190, deepin-dock/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-02-20 12:12:14 UTC (rev 213191)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-dock
+pkgver=4.1.1
+pkgrel=2
+pkgdesc='Deepin desktop-environment - dock module'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/dde-dock"
+license=('GPL3')
+depends=('gtk2' 'deepin-tool-kit' 'qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-qt5integration' 'deepin-qt-dbus-factory')
+makedepends=('git' 'qt5-tools')
+conflicts=('dde-dock')
+replaces=('dde-dock')
+groups=('deepin')
+source=("git+https://cr.deepin.io/dde/dde-dock.git#tag=$pkgver"
+ fix-null-pixmap.patch)
+sha256sums=('SKIP'
+ 'a6340bddad48f6cf27387c130f0546b042873654f3ea05615d6896b46cda54de')
+
+prepare() {
+ cd dde-dock
+ patch -p1 -i ../fix-null-pixmap.patch
+}
+
+build() {
+ cd dde-dock
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd dde-dock
+ make INSTALL_ROOT="${pkgdir}" install
+}
Copied: deepin-dock/repos/community-x86_64/fix-null-pixmap.patch (from rev 213190, deepin-dock/trunk/fix-null-pixmap.patch)
===================================================================
--- community-x86_64/fix-null-pixmap.patch (rev 0)
+++ community-x86_64/fix-null-pixmap.patch 2017-02-20 12:12:14 UTC (rev 213191)
@@ -0,0 +1,29 @@
+commit 90e102335bc45af76455a8591ca3b2d5b0aa6e44
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Mon Feb 20 20:05:26 2017 +0800
+
+ Only return QPixmap when it is not null
+
+ QFile::exists() returns true even for executables in $PATH, and loading
+ those files with QPixmap() will return a null object.
+
+ Change-Id: I29a954aa2d504ca051b7328978426b6b993da753
+
+diff --git a/frame/util/themeappicon.cpp b/frame/util/themeappicon.cpp
+index b8e1587..b150b97 100644
+--- a/frame/util/themeappicon.cpp
++++ b/frame/util/themeappicon.cpp
+@@ -18,8 +18,11 @@ QPixmap ThemeAppIcon::getIcon(const QString iconName, const int size)
+ {
+ QPixmap pixmap(size, size);
+
+- if (QFile::exists(iconName))
+- return QPixmap(iconName);
++ if (QFile::exists(iconName)) {
++ pixmap = QPixmap(iconName);
++ if (!pixmap.isNull())
++ return pixmap;
++ }
+ if (iconName.startsWith("data:image/"))
+ {
+ const QStringList strs = iconName.split("base64,");
More information about the arch-commits
mailing list