Date: Wednesday, May 27, 2020 @ 20:57:37 Author: felixonmars Revision: 636052
archrelease: copy trunk to community-testing-x86_64 Added: deepin-dock/repos/community-testing-x86_64/PKGBUILD (from rev 636051, deepin-dock/trunk/PKGBUILD) deepin-dock/repos/community-testing-x86_64/deepin-dock-qt5.15.patch (from rev 636051, deepin-dock/trunk/deepin-dock-qt5.15.patch) Deleted: deepin-dock/repos/community-testing-x86_64/PKGBUILD deepin-dock/repos/community-testing-x86_64/deepin-dock-qt5.15.patch --------------------------+ PKGBUILD | 72 +++++++++++++-------------- deepin-dock-qt5.15.patch | 120 ++++++++++++++++++++++----------------------- 2 files changed, 96 insertions(+), 96 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-27 20:57:16 UTC (rev 636051) +++ PKGBUILD 2020-05-27 20:57:37 UTC (rev 636052) @@ -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.9 -pkgrel=2 -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=('0d88e418ee21702f2786c47cce923c534cb7a564152eabb4706d54265c7675b563278949286e4fd247b06fa9b521e62b454d97ce28481b13730ad7f387e3d45f' - '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-testing-x86_64/PKGBUILD (from rev 636051, deepin-dock/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-27 20:57:37 UTC (rev 636052) @@ -0,0 +1,36 @@ +# 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 +} Deleted: deepin-dock-qt5.15.patch =================================================================== --- deepin-dock-qt5.15.patch 2020-05-27 20:57:16 UTC (rev 636051) +++ deepin-dock-qt5.15.patch 2020-05-27 20:57:37 UTC (rev 636052) @@ -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-testing-x86_64/deepin-dock-qt5.15.patch (from rev 636051, deepin-dock/trunk/deepin-dock-qt5.15.patch) =================================================================== --- deepin-dock-qt5.15.patch (rev 0) +++ deepin-dock-qt5.15.patch 2020-05-27 20:57:37 UTC (rev 636052) @@ -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>