[arch-commits] Commit in deepin-dock/trunk (PKGBUILD deepin-dock-qt5.15.patch)

[Felix Yan]

    Date: Sunday, October 25, 2020 @ 15:39:07
  Author: felixonmars
Revision: 732806

upgpkg: deepin-dock 5.2.0.16-1

Modified:
  deepin-dock/trunk/PKGBUILD
Deleted:
  deepin-dock/trunk/deepin-dock-qt5.15.patch

--------------------------+
 PKGBUILD                 |   17 ++++++------
 deepin-dock-qt5.15.patch |   60 ---------------------------------------------
 2 files changed, 9 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-25 15:38:58 UTC (rev 732805)
+++ PKGBUILD	2020-10-25 15:39:07 UTC (rev 732806)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-dock
-pkgver=5.2.0.14
+pkgver=5.2.0.16
 pkgrel=1
 pkgdesc='Deepin desktop-environment - dock module'
 arch=('x86_64')
@@ -16,15 +16,16 @@
 replaces=('dde-dock')
 groups=('deepin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-dock/archive/$pkgver.tar.gz"
-         deepin-dock-qt5.15.patch
-         deepin-dock-fix-build.patch)
-sha512sums=('32c49dab42e32ca78f11b398be917c4a206c578b24a7a4341274e7996b1c0392c0f5d6352f02a02c4f84eadbfca60ba7436c5114bf762f3ac7af61cd0281e037'
-            '1fb3a6490e152d081f5fdff655e503dac602cb29b231df252edd664bf8b5ffcc589efd7d96b7b61e53f620670b110dcd5e1952fe5b88fe65fbf8acf8ce8812fd'
-            '38c3f683e10c70f54123d445b80831eb74830b27f265fccf7eb4037bfb0c96879bf25203e8e672ebe483e8cae291197dfac81296648f08548d61a7644c0076f9')
+        deepin-dock-fix-build.patch
+        https://github.com/linuxdeepin/dde-dock/commit/1611be8c849d19fab44de5eecc663a7c38575e70.patch)
+sha512sums=('79eda542b499e533a6987c0e7eef14868e4cb0fcd2f6c179a412532316f637c428d7e409f93a6f592f3cc285e619a347b38f8fc8d7e79cf37433866efbe2b056'
+            '38c3f683e10c70f54123d445b80831eb74830b27f265fccf7eb4037bfb0c96879bf25203e8e672ebe483e8cae291197dfac81296648f08548d61a7644c0076f9'
+            'f65a066dbbd27caec29e59dcb5f0328dd462cc5b86d4d899a10f04d9164c29729575230ab1be81f47ea4f4c9ee8bdeaa0a2b4d89fe82d30f8858509ebb2e289a')
 
 prepare() {
-  patch -d dde-dock-$pkgver -p1 -i ../deepin-dock-qt5.15.patch # Fix build with Qt 5.15
-  patch -d dde-dock-$pkgver -p1 -i ../deepin-dock-fix-build.patch # Fix build with new deepin-network-utils
+  cd dde-dock-$pkgver
+  patch -p1 -i ../deepin-dock-fix-build.patch
+  patch -p1 -i ../1611be8c849d19fab44de5eecc663a7c38575e70.patch
 }
 
 build() {

Deleted: deepin-dock-qt5.15.patch
===================================================================
--- deepin-dock-qt5.15.patch	2020-10-25 15:38:58 UTC (rev 732805)
+++ deepin-dock-qt5.15.patch	2020-10-25 15:39:07 UTC (rev 732806)
@@ -1,60 +0,0 @@
-diff --git a/plugins/onboard/onboarditem.cpp b/plugins/onboard/onboarditem.cpp
-index e43a0917..a7b29345 100644
---- a/plugins/onboard/onboarditem.cpp
-+++ b/plugins/onboard/onboarditem.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QSvgRenderer>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QApplication>
- #include <QIcon>
-diff --git a/plugins/shutdown/shutdownwidget.cpp b/plugins/shutdown/shutdownwidget.cpp
-index 8b62a4ab..a303df4e 100644
---- a/plugins/shutdown/shutdownwidget.cpp
-+++ b/plugins/shutdown/shutdownwidget.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QSvgRenderer>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QApplication>
- #include <QIcon>
-diff --git a/plugins/tray/fashiontray/containers/spliteranimated.cpp b/plugins/tray/fashiontray/containers/spliteranimated.cpp
-index 92d4ca1c..3feb06f4 100644
---- a/plugins/tray/fashiontray/containers/spliteranimated.cpp
-+++ b/plugins/tray/fashiontray/containers/spliteranimated.cpp
-@@ -1,6 +1,7 @@
- #include "spliteranimated.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
- 
- #define OpacityMax 0.3
-diff --git a/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp b/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp
-index b7edc119..2238f559 100644
---- a/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp
-+++ b/plugins/tray/fashiontray/fashiontraycontrolwidget.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <DHiDPIHelper>
- #include <DStyle>
- #include <DGuiApplicationHelper>
-diff --git a/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp b/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp
-index 30e47172..833f1e1c 100644
---- a/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp
-+++ b/plugins/tray/fashiontray/fashiontraywidgetwrapper.cpp
-@@ -23,6 +23,7 @@
- #include "../xembedtraywidget.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
- #include <QMouseEvent>
- #include <QDrag>