[arch-commits] Commit in deepin-dock/repos (6 files)

Felix Yan felixonmars at archlinux.org
Tue Feb 21 09:20:11 UTC 2017


    Date: Tuesday, February 21, 2017 @ 09:20:10
  Author: felixonmars
Revision: 213289

archrelease: copy trunk to community-i686, community-x86_64

Added:
  deepin-dock/repos/community-i686/PKGBUILD
    (from rev 213288, deepin-dock/trunk/PKGBUILD)
  deepin-dock/repos/community-x86_64/PKGBUILD
    (from rev 213288, deepin-dock/trunk/PKGBUILD)
Deleted:
  deepin-dock/repos/community-i686/PKGBUILD
  deepin-dock/repos/community-i686/fix-null-pixmap.patch
  deepin-dock/repos/community-x86_64/PKGBUILD
  deepin-dock/repos/community-x86_64/fix-null-pixmap.patch

----------------------------------------+
 /PKGBUILD                              |   60 +++++++++++++++++++++++++++++++
 community-i686/PKGBUILD                |   37 -------------------
 community-i686/fix-null-pixmap.patch   |   29 --------------
 community-x86_64/PKGBUILD              |   37 -------------------
 community-x86_64/fix-null-pixmap.patch |   29 --------------
 5 files changed, 60 insertions(+), 132 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-02-21 09:19:40 UTC (rev 213288)
+++ community-i686/PKGBUILD	2017-02-21 09:20:10 UTC (rev 213289)
@@ -1,37 +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=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/PKGBUILD (from rev 213288, deepin-dock/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-02-21 09:20:10 UTC (rev 213289)
@@ -0,0 +1,30 @@
+# $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.3
+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
+}

Deleted: community-i686/fix-null-pixmap.patch
===================================================================
--- community-i686/fix-null-pixmap.patch	2017-02-21 09:19:40 UTC (rev 213288)
+++ community-i686/fix-null-pixmap.patch	2017-02-21 09:20:10 UTC (rev 213289)
@@ -1,29 +0,0 @@
-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-21 09:19:40 UTC (rev 213288)
+++ community-x86_64/PKGBUILD	2017-02-21 09:20:10 UTC (rev 213289)
@@ -1,37 +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=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/PKGBUILD (from rev 213288, deepin-dock/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-02-21 09:20:10 UTC (rev 213289)
@@ -0,0 +1,30 @@
+# $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.3
+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
+}

Deleted: community-x86_64/fix-null-pixmap.patch
===================================================================
--- community-x86_64/fix-null-pixmap.patch	2017-02-21 09:19:40 UTC (rev 213288)
+++ community-x86_64/fix-null-pixmap.patch	2017-02-21 09:20:10 UTC (rev 213289)
@@ -1,29 +0,0 @@
-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