[arch-commits] Commit in deepin-music/trunk (PKGBUILD qt-5.15.patch)

[Felix Yan]

    Date: Sunday, April 25, 2021 @ 22:00:16
  Author: felixonmars
Revision: 924454

upgpkg: deepin-music 6.1.2-1

Modified:
  deepin-music/trunk/PKGBUILD
Deleted:
  deepin-music/trunk/qt-5.15.patch

---------------+
 PKGBUILD      |   20 ++------
 qt-5.15.patch |  132 --------------------------------------------------------
 2 files changed, 6 insertions(+), 146 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-25 21:51:37 UTC (rev 924453)
+++ PKGBUILD	2021-04-25 22:00:16 UTC (rev 924454)
@@ -3,27 +3,19 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-music
-pkgver=6.0.1.91
-pkgrel=4
+pkgver=6.1.2
+pkgrel=1
 pkgdesc='Awesome music player with brilliant and tweakful UI Deepin-UI based.'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-music"
 license=('GPL3')
-depends=('deepin-qt5integration' 'ffmpeg' 'kcodecs' 'libcue' 'qt5-svg' 'taglib' 'vlc')
+depends=('deepin-qt5integration' 'ffmpeg' 'kcodecs' 'libcue' 'qt5-svg' 'qtdbusextended' 'qtmpris'
+         'taglib' 'udisks2-qt5' 'vlc')
 makedepends=('cmake' 'ninja' 'qt5-tools')
 groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-music/archive/$pkgver.tar.gz"
-        qt-5.15.patch)
-sha512sums=('ef1e9727d2e16c86f9b26c746eb575eaefcc53703f6a7a838a13cb1546d911a5865b75150889805b890ca02da823e6bf927ba84111b8e58ab2db7aec89d1d9c7'
-            '8e9d74a78c010431cf5428561ffb59006658281da9f0856c5dfdd4d854e40f4b03d5799f8b0cce81c08c393edf2c225505e76e3ad010c0a3834edeb3c208e853')
+source=("https://github.com/linuxdeepin/deepin-music/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('d0b3be6710f0afd65dc9424f315a1a60f66d55b54e8c96769ed62aaeb33a9af7465cf346637e2ab9bb23587d4598e57e33ab91923fd353c867dc98259dfa5b38')
 
-prepare() {
-  cd deepin-music-$pkgver/music
-  patch -Np2 -i "$srcdir"/qt-5.15.patch
-
-  sed -i '/#include <QPainter>/a #include <QPainterPath>' music-player/view/widget/soundpixmapbutton.cpp
-}
-
 build() {
   cd deepin-music-$pkgver
   cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr .

Deleted: qt-5.15.patch
===================================================================
--- qt-5.15.patch	2021-04-25 21:51:37 UTC (rev 924453)
+++ qt-5.15.patch	2021-04-25 22:00:16 UTC (rev 924454)
@@ -1,132 +0,0 @@
-diff --git a/src/music-player/view/lyricwidget.cpp b/src/music-player/view/lyricwidget.cpp
-index b522ae4d..bb2ffc8a 100644
---- a/src/music-player/view/lyricwidget.cpp
-+++ b/src/music-player/view/lyricwidget.cpp
-@@ -26,6 +26,7 @@
- #include <QScrollArea>
- #include <QHBoxLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QResizeEvent>
- #include <QPaintEvent>
- #include <QStringListModel>
-diff --git a/src/music-player/view/widget/cover.cpp b/src/music-player/view/widget/cover.cpp
-index 8ade80be..6987fec5 100644
---- a/src/music-player/view/widget/cover.cpp
-+++ b/src/music-player/view/widget/cover.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGraphicsDropShadowEffect>
- 
- static auto borderPenWidth = 1.0;
-diff --git a/src/music-player/view/widget/delegate/musiclistdatadelegate.cpp b/src/music-player/view/widget/delegate/musiclistdatadelegate.cpp
-index 752c6e15..da30078b 100644
---- a/src/music-player/view/widget/delegate/musiclistdatadelegate.cpp
-+++ b/src/music-player/view/widget/delegate/musiclistdatadelegate.cpp
-@@ -22,6 +22,7 @@
- #include "musiclistdatadelegate.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
- #include <QDate>
- #include <QEvent>
-diff --git a/src/music-player/view/widget/delegate/musicsearchlistdelegate.cpp b/src/music-player/view/widget/delegate/musicsearchlistdelegate.cpp
-index 943eeca6..b9f40b22 100755
---- a/src/music-player/view/widget/delegate/musicsearchlistdelegate.cpp
-+++ b/src/music-player/view/widget/delegate/musicsearchlistdelegate.cpp
-@@ -25,6 +25,7 @@
- #include <DHiDPIHelper>
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextDocument>
- #include <QStyleOptionViewItem>
- #include <QTextCursor>
-diff --git a/src/music-player/view/widget/delegate/playitemdelegate.cpp b/src/music-player/view/widget/delegate/playitemdelegate.cpp
-index 19ff14cf..8593c1a2 100644
---- a/src/music-player/view/widget/delegate/playitemdelegate.cpp
-+++ b/src/music-player/view/widget/delegate/playitemdelegate.cpp
-@@ -25,6 +25,7 @@
- #include <QDebug>
- #include <QFont>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStandardItemModel>
- 
- #include <musicmeta.h>
-diff --git a/src/music-player/view/widget/musicpixmapbutton.cpp b/src/music-player/view/widget/musicpixmapbutton.cpp
-index 32cd78eb..d4f8c391 100644
---- a/src/music-player/view/widget/musicpixmapbutton.cpp
-+++ b/src/music-player/view/widget/musicpixmapbutton.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRect>
- 
- MusicPixmapButton::MusicPixmapButton(QWidget *parent)
-diff --git a/src/music-player/view/widget/musictitleimage.cpp b/src/music-player/view/widget/musictitleimage.cpp
-index 98744fdf..8a39e8d1 100644
---- a/src/music-player/view/widget/musictitleimage.cpp
-+++ b/src/music-player/view/widget/musictitleimage.cpp
-@@ -22,6 +22,7 @@
- #include "musictitleimage.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- MusicTitleImageWidget::MusicTitleImageWidget(QWidget *parent)
-     : DWidget( parent)
-diff --git a/src/music-player/view/widget/soundvolume.cpp b/src/music-player/view/widget/soundvolume.cpp
-index 79507306..c4328305 100644
---- a/src/music-player/view/widget/soundvolume.cpp
-+++ b/src/music-player/view/widget/soundvolume.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QWheelEvent>
- #include <QGraphicsDropShadowEffect>
- #include <QVBoxLayout>
-diff --git a/src/music-player/view/widget/tooltips.cpp b/src/music-player/view/widget/tooltips.cpp
-index b5233b69..acb77924 100644
---- a/src/music-player/view/widget/tooltips.cpp
-+++ b/src/music-player/view/widget/tooltips.cpp
-@@ -33,6 +33,7 @@
- #include <QHBoxLayout>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGraphicsDropShadowEffect>
- #include <QPropertyAnimation>
- #include <QGraphicsOpacityEffect>
-diff --git a/src/music-player/view/widget/waveform.cpp b/src/music-player/view/widget/waveform.cpp
-index e4822bee..832b28f1 100644
---- a/src/music-player/view/widget/waveform.cpp
-+++ b/src/music-player/view/widget/waveform.cpp
-@@ -26,6 +26,7 @@
- #include <QPaintEvent>
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QAudioBuffer>
- #include <QAudioFormat>
- #include <QWidget>
-diff --git a/src/music-player/view/widget/waveformscale.cpp b/src/music-player/view/widget/waveformscale.cpp
-index 93ab3004..b7f40c7b 100755
---- a/src/music-player/view/widget/waveformscale.cpp
-+++ b/src/music-player/view/widget/waveformscale.cpp
-@@ -27,6 +27,7 @@
- #include <QEvent>
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include <mediameta.h>
-