Date: Sunday, October 25, 2020 @ 09:15:56
Author: felixonmars
Revision: 732185
archrelease: copy trunk to community-x86_64
Added:
deepin-music/repos/community-x86_64/PKGBUILD
(from rev 732183, deepin-music/trunk/PKGBUILD)
deepin-music/repos/community-x86_64/qt-5.15.patch
(from rev 732183, deepin-music/trunk/qt-5.15.patch)
Deleted:
deepin-music/repos/community-x86_64/PKGBUILD
deepin-music/repos/community-x86_64/qt-5.15.patch
---------------+
PKGBUILD | 68 +++++++-------
qt-5.15.patch | 264 ++++++++++++++++++++++++++++----------------------------
2 files changed, 166 insertions(+), 166 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-25 09:15:55 UTC (rev 732184)
+++ PKGBUILD 2020-10-25 09:15:56 UTC (rev 732185)
@@ -1,34 +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-music
-pkgver=6.0.1.40
-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')
-makedepends=('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=('768a90203de1e6387b1fa456732e7033fa0eab60e5851dbcc6e2d74d9baa41e94ca378db46f25128672b9181facb2a0b4b54962133f6b80bbe47bdc34ae05b56'
-
'8e9d74a78c010431cf5428561ffb59006658281da9f0856c5dfdd4d854e40f4b03d5799f8b0cce81c08c393edf2c225505e76e3ad010c0a3834edeb3c208e853')
-
-prepare() {
- cd deepin-music-$pkgver
- patch -Np1 -i ../qt-5.15.patch
-}
-
-build() {
- cd deepin-music-$pkgver
- qmake-qt5 PREFIX=/usr
- make
-}
-
-package() {
- cd deepin-music-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: deepin-music/repos/community-x86_64/PKGBUILD (from rev 732183,
deepin-music/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-25 09:15:56 UTC (rev 732185)
@@ -0,0 +1,34 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-music
+pkgver=6.0.1.41
+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')
+makedepends=('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=('93ea2d15974941011170afa3479171bebdd452e17d3ded15c2788ad383a506759a6933b548b0ba1a503b5f16c117f0e5b46b079ccb7e46431f3b76c0dee9be60'
+
'8e9d74a78c010431cf5428561ffb59006658281da9f0856c5dfdd4d854e40f4b03d5799f8b0cce81c08c393edf2c225505e76e3ad010c0a3834edeb3c208e853')
+
+prepare() {
+ cd deepin-music-$pkgver
+ patch -Np1 -i ../qt-5.15.patch
+}
+
+build() {
+ cd deepin-music-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd deepin-music-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: qt-5.15.patch
===================================================================
--- qt-5.15.patch 2020-10-25 09:15:55 UTC (rev 732184)
+++ qt-5.15.patch 2020-10-25 09:15:56 UTC (rev 732185)
@@ -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>
-
Copied: deepin-music/repos/community-x86_64/qt-5.15.patch (from rev 732183,
deepin-music/trunk/qt-5.15.patch)
===================================================================
--- qt-5.15.patch (rev 0)
+++ qt-5.15.patch 2020-10-25 09:15:56 UTC (rev 732185)
@@ -0,0 +1,132 @@
+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>
+
