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

[Felix Yan]

    Date: Monday, November 2, 2020 @ 18:20:05
  Author: felixonmars
Revision: 740027

upgpkg: deepin-album 5.6.9.27-1

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

---------------------------+
 PKGBUILD                  |   24 +++++++++++-----------
 deepin-album-qt5.15.patch |   48 --------------------------------------------
 2 files changed, 12 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-02 17:43:24 UTC (rev 740026)
+++ PKGBUILD	2020-11-02 18:20:05 UTC (rev 740027)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-album
-pkgver=5.6.9.26
+pkgver=5.6.9.27
 pkgrel=1
 pkgdesc='A fashion photo manager for viewing and organizing pictures'
 arch=('x86_64')
@@ -8,26 +8,26 @@
 url="https://github.com/linuxdeepin/deepin-album"
 license=('GPL3')
 depends=('deepin-qt5integration' 'freeimage' 'gio-qt' 'udisks2-qt5')
-makedepends=('qt5-tools')
+makedepends=('cmake' 'ninja' 'qt5-tools')
 groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-album/archive/$pkgver.tar.gz"
-         deepin-album-qt5.15.patch)
-sha512sums=('7db5ab578f468715e9a7d28478c43c85e3987edce2a1e3286b394c8c28e240a7bce39aa67ac028e8a364beee20f54be458c7642a2a731c82b5d00f0b68104eb6'
-            '52c48e5d2efe603cfa0d9ab9db9619370dfcf7fdeab8fb52d94c5481ad98fe3ca5bfadf240e3acc5542dbe5fa1be766ad7189316fc9db3632b76fbfd6ed9c640')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-album/archive/$pkgver.tar.gz")
+sha512sums=('59ed213dd533ed7d6187fef44e8f5edde95016494d562adb16b15002e837cfcfd5291d476b7e48a0ba5601219f2c273d0e0de8cbbf5075f93a16cc949a4e03f7')
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../deepin-album-qt5.15.patch # Fix build with Qt 5.15
-  sed -i '1i #include <QPainterPath>' widgets/dlmenuarrow.h module/view/contents/imageinfowidget.cpp
+  cd deepin-album-$pkgver
+  sed -i '/#include <QPainter>/a #include <QPainterPath>' deepin-album/album/frame/toptoolbar.cpp deepin-album/album/thumbnail/thumbnaildelegate.cpp \
+                                                          deepin-album/album/widgets/dlmenuarrow.h deepin-album/album/widgets/dialogs/dfmdarrowlineexpand.cpp \
+                                                          deepin-album/album/widgets/popupmenustyle.cpp
+  sed -i '/#include <QDebug>/a #include <QPainterPath>' deepin-album/album/module/view/contents/ttbcontent.cpp
 }
 
 build() {
   cd deepin-album-$pkgver
-  qmake-qt5 PREFIX=/usr
-  make
+  cmake . -GNinja -DCMAKE_INSTALL_PREFIX=/usr
+  ninja
 }
 
 package() {
   cd deepin-album-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
+  DESTDIR="$pkgdir" ninja install
 }

Deleted: deepin-album-qt5.15.patch
===================================================================
--- deepin-album-qt5.15.patch	2020-11-02 17:43:24 UTC (rev 740026)
+++ deepin-album-qt5.15.patch	2020-11-02 18:20:05 UTC (rev 740027)
@@ -1,48 +0,0 @@
-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/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/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>
-