Date: Thursday, June 25, 2020 @ 08:58:43
Author: felixonmars
Revision: 653001
archrelease: copy trunk to community-x86_64
Added:
deepin-dock/repos/community-x86_64/PKGBUILD
(from rev 653000, deepin-dock/trunk/PKGBUILD)
deepin-dock/repos/community-x86_64/deepin-dock-qt5.15.patch
(from rev 653000, deepin-dock/trunk/deepin-dock-qt5.15.patch)
Deleted:
deepin-dock/repos/community-x86_64/PKGBUILD
deepin-dock/repos/community-x86_64/deepin-dock-qt5.15.patch
--------------------------+
PKGBUILD | 73 +++++++++++++--------------
deepin-dock-qt5.15.patch | 120 ++++++++++++++++++++++-----------------------
2 files changed, 97 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-25 08:58:27 UTC (rev 653000)
+++ PKGBUILD 2020-06-25 08:58:43 UTC (rev 653001)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-dock
-pkgver=5.1.0.11
-pkgrel=1
-pkgdesc='Deepin desktop-environment - dock module'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dde-dock";
-license=('GPL3')
-depends=('qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-launcher'
'deepin-qt5integration'
- 'deepin-qt-dbus-factory' 'deepin-network-utils' 'libdbusmenu-qt5')
-makedepends=('cmake' 'qt5-tools')
-conflicts=('dde-dock')
-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)
-sha512sums=('e6d8cf3bf026872b65f76c989bd8a9d57fe16c17a75d6a9289046008fbdc230ce4f5e5892f870af1e064a1c460103141ac08999c9fe9ba6029c7b3f5fb37e3b4'
-
'1fb3a6490e152d081f5fdff655e503dac602cb29b231df252edd664bf8b5ffcc589efd7d96b7b61e53f620670b110dcd5e1952fe5b88fe65fbf8acf8ce8812fd')
-
-prepare() {
- patch -d dde-dock-$pkgver -p1 -i ../deepin-dock-qt5.15.patch # Fix build
with Qt 5.15
-}
-
-build() {
- cd dde-dock-$pkgver
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
-DDOCK_TRAY_USE_NATIVE_POPUP=YES
- make
-}
-
-package() {
- cd dde-dock-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: deepin-dock/repos/community-x86_64/PKGBUILD (from rev 653000,
deepin-dock/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-25 08:58:43 UTC (rev 653001)
@@ -0,0 +1,37 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-dock
+pkgver=5.1.0.11.20200622
+_commit=e4acd32b24e220e66c283707b481f9757048ad7c
+pkgrel=1
+pkgdesc='Deepin desktop-environment - dock module'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-dock";
+license=('GPL3')
+depends=('qt5-svg' 'deepin-menu' 'deepin-daemon' 'deepin-launcher'
'deepin-qt5integration'
+ 'deepin-qt-dbus-factory' 'deepin-network-utils' 'libdbusmenu-qt5')
+makedepends=('cmake' 'qt5-tools')
+conflicts=('dde-dock')
+replaces=('dde-dock')
+groups=('deepin')
+source=("$pkgname-$_commit.tar.gz::https://github.com/linuxdeepin/dde-dock/archive/$_commit.tar.gz";
+ deepin-dock-qt5.15.patch)
+sha512sums=('1d191dbcf23882f906eaf6f63ee1c93df33fcb792fe8d15bfbc2b64a694c2b9bbdff781ba00a02a965a23aff402959318e8b8419e8331446a1bebedf71e16a64'
+
'1fb3a6490e152d081f5fdff655e503dac602cb29b231df252edd664bf8b5ffcc589efd7d96b7b61e53f620670b110dcd5e1952fe5b88fe65fbf8acf8ce8812fd')
+
+prepare() {
+ patch -d dde-dock-$_commit -p1 -i ../deepin-dock-qt5.15.patch # Fix build
with Qt 5.15
+}
+
+build() {
+ cd dde-dock-$_commit
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
-DDOCK_TRAY_USE_NATIVE_POPUP=YES
+ make
+}
+
+package() {
+ cd dde-dock-$_commit
+ make DESTDIR="$pkgdir" install
+}
Deleted: deepin-dock-qt5.15.patch
===================================================================
--- deepin-dock-qt5.15.patch 2020-06-25 08:58:27 UTC (rev 653000)
+++ deepin-dock-qt5.15.patch 2020-06-25 08:58:43 UTC (rev 653001)
@@ -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>
Copied: deepin-dock/repos/community-x86_64/deepin-dock-qt5.15.patch (from rev
653000, deepin-dock/trunk/deepin-dock-qt5.15.patch)
===================================================================
--- deepin-dock-qt5.15.patch (rev 0)
+++ deepin-dock-qt5.15.patch 2020-06-25 08:58:43 UTC (rev 653001)
@@ -0,0 +1,60 @@
+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>
