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

[Antonio Rojas]

    Date: Tuesday, May 26, 2020 @ 11:15:53
  Author: arojas
Revision: 635022

Qt 5.15 rebuild

Added:
  deepin-album/trunk/deepin-album-qt5.15.patch
Modified:
  deepin-album/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   12 ++++--
 deepin-album-qt5.15.patch |   84 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 11:15:44 UTC (rev 635021)
+++ PKGBUILD	2020-05-26 11:15:53 UTC (rev 635022)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-album
 pkgver=5.6.9.13
-pkgrel=1
+pkgrel=2
 pkgdesc='A fashion photo manager for viewing and organizing pictures'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-album"
@@ -10,9 +10,15 @@
 depends=('deepin-qt5integration' 'freeimage' 'gio-qt' 'udisks2-qt5')
 makedepends=('qt5-tools')
 groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-album/archive/$pkgver.tar.gz")
-sha512sums=('66458c0043143892087d63088543663967b79a5674240232bbe6f1699d1b79ceeb849c49d439ac768ccd89e2f144556b11fb129023bffd352b76768ac3848524')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-album/archive/$pkgver.tar.gz"
+         deepin-album-qt5.15.patch)
+sha512sums=('66458c0043143892087d63088543663967b79a5674240232bbe6f1699d1b79ceeb849c49d439ac768ccd89e2f144556b11fb129023bffd352b76768ac3848524'
+            'bd263f21eef20b586b3c673bb9bb3fcdb53f8f708f57335ce27edcd6069048e8a2e03a46cd9849f24b37165ccd108cd96e20adfc83d5d82a544d61b96fc5d297')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../deepin-album-qt5.15.patch # Fix build with Qt 5.15
+}
+
 build() {
   cd deepin-album-$pkgver
   qmake-qt5 PREFIX=/usr

Added: deepin-album-qt5.15.patch
===================================================================
--- deepin-album-qt5.15.patch	                        (rev 0)
+++ deepin-album-qt5.15.patch	2020-05-26 11:15:53 UTC (rev 635022)
@@ -0,0 +1,84 @@
+diff --git a/frame/toptoolbar.cpp b/frame/toptoolbar.cpp
+index f6f8073..a1dc84e 100644
+--- a/frame/toptoolbar.cpp
++++ b/frame/toptoolbar.cpp
+@@ -35,6 +35,7 @@
+ #include <QDebug>
+ #include <QHBoxLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QProcess>
+ #include <QResizeEvent>
+ #include <QShortcut>
+diff --git a/module/view/contents/imageinfowidget.cpp b/module/view/contents/imageinfowidget.cpp
+index 534bcbf..f9d5440 100644
+--- a/module/view/contents/imageinfowidget.cpp
++++ b/module/view/contents/imageinfowidget.cpp
+@@ -33,6 +33,7 @@
+ #include <QPushButton>
+ #include <QScrollBar>
+ #include <QtDebug>
++#include <QPainterPath>
+ #include <DPushButton>
+ #include <DScrollBar>
+ #include <DFontSizeManager>
+diff --git a/module/view/contents/ttbcontent.cpp b/module/view/contents/ttbcontent.cpp
+index 1f95a63..7d03cdc 100644
+--- a/module/view/contents/ttbcontent.cpp
++++ b/module/view/contents/ttbcontent.cpp
+@@ -38,6 +38,7 @@
+ #include <DApplicationHelper>
+ #include <DSpinner>
+ #include <QtMath>
++#include <QPainterPath>
+ 
+ DWIDGET_USE_NAMESPACE
+ namespace {
+diff --git a/thumbnail/thumbnaildelegate.cpp b/thumbnail/thumbnaildelegate.cpp
+index a789f41..3b2b50a 100644
+--- a/thumbnail/thumbnaildelegate.cpp
++++ b/thumbnail/thumbnaildelegate.cpp
+@@ -24,6 +24,7 @@
+ #include <QHBoxLayout>
+ #include <QLineEdit>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmapCache>
+ #include <QStandardItemModel>
+ #include <QThread>
+diff --git a/widgets/dialogs/imginfodialog.cpp b/widgets/dialogs/imginfodialog.cpp
+index 9b12d06..cb463eb 100644
+--- a/widgets/dialogs/imginfodialog.cpp
++++ b/widgets/dialogs/imginfodialog.cpp
+@@ -35,6 +35,7 @@
+ #include <DApplicationHelper>
+ #include <DDialogCloseButton>
+ #include <QGraphicsOpacityEffect>
++#include <QPainterPath>
+ 
+ namespace {
+ 
+diff --git a/widgets/dlmenuarrow.h b/widgets/dlmenuarrow.h
+index fe01781..201a6d2 100644
+--- a/widgets/dlmenuarrow.h
++++ b/widgets/dlmenuarrow.h
+@@ -7,6 +7,7 @@
+ #include <QEvent>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ 
+ DWIDGET_USE_NAMESPACE
+diff --git a/widgets/popupmenustyle.cpp b/widgets/popupmenustyle.cpp
+index ddb509c..0fd91f7 100644
+--- a/widgets/popupmenustyle.cpp
++++ b/widgets/popupmenustyle.cpp
+@@ -19,6 +19,7 @@
+ #include <QPixmap>
+ #include <QPixmapCache>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOption>
+ #include <QStyleOptionMenuItem>
+