[arch-commits] Commit in deepin-image-viewer/trunk (2 files)

[Antonio Rojas]

    Date: Tuesday, May 26, 2020 @ 14:09:35
  Author: arojas
Revision: 635094

Qt 5.15 rebuild

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

----------------------------------+
 PKGBUILD                         |   12 ++++--
 deepin-image-viewer-qt5.15.patch |   72 +++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 14:00:37 UTC (rev 635093)
+++ PKGBUILD	2020-05-26 14:09:35 UTC (rev 635094)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-image-viewer
 pkgver=5.6.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Deepin Image Viewer'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-image-viewer"
@@ -12,9 +12,15 @@
 optdepends=('deepin-manual: for help menual'
             'deepin-shortcut-viewer: for shortcut display')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-image-viewer/archive/$pkgver.tar.gz")
-sha512sums=('1a819d6cebce1fecd40c8a701a7cf9346777771ae08e87709ce4caa9220101b6badc60e55a03a4b66b7cc1ddd0840481b3966882abf8db4cf55f8f245e28d9bb')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-image-viewer/archive/$pkgver.tar.gz"
+        deepin-image-viewer-qt5.15.patch)
+sha512sums=('1a819d6cebce1fecd40c8a701a7cf9346777771ae08e87709ce4caa9220101b6badc60e55a03a4b66b7cc1ddd0840481b3966882abf8db4cf55f8f245e28d9bb'
+            'e802fa93972bf3d32c3672603e41bc662866aaf7e458b0cd7eeef786e22348c57161d3292754df5357beae6bb3b475bd45dfc6912c969200e4bf079c00b77763')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../deepin-image-viewer-qt5.15.patch # Fix build with Qt 5.15
+}
+
 build() {
   cd deepin-image-viewer-$pkgver
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=

Added: deepin-image-viewer-qt5.15.patch
===================================================================
--- deepin-image-viewer-qt5.15.patch	                        (rev 0)
+++ deepin-image-viewer-qt5.15.patch	2020-05-26 14:09:35 UTC (rev 635094)
@@ -0,0 +1,72 @@
+diff --git a/viewer/frame/toptoolbar.cpp b/viewer/frame/toptoolbar.cpp
+index 545ab1fb..89648d2b 100644
+--- a/viewer/frame/toptoolbar.cpp
++++ b/viewer/frame/toptoolbar.cpp
+@@ -37,6 +37,7 @@
+ #include <QImageReader>
+ #include <QLabel>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QProcess>
+ #include <QResizeEvent>
+ #include <QShortcut>
+diff --git a/viewer/module/view/contents/imageinfowidget.cpp b/viewer/module/view/contents/imageinfowidget.cpp
+index ec6e8b91..623734b4 100644
+--- a/viewer/module/view/contents/imageinfowidget.cpp
++++ b/viewer/module/view/contents/imageinfowidget.cpp
+@@ -34,6 +34,7 @@
+ #include <QScrollBar>
+ #include <QString>
+ #include <QtDebug>
++#include <QPainterPath>
+ 
+ namespace {
+ 
+diff --git a/viewer/module/view/contents/ttbcontent.cpp b/viewer/module/view/contents/ttbcontent.cpp
+index 07d6b211..cc4718be 100644
+--- a/viewer/module/view/contents/ttbcontent.cpp
++++ b/viewer/module/view/contents/ttbcontent.cpp
+@@ -35,6 +35,7 @@
+ #include <QHBoxLayout>
+ #include <QTimer>
+ #include <QtMath>
++#include <QPainterPath>
+ 
+ #define TTB 0
+ 
+diff --git a/viewer/widgets/popupmenustyle.cpp b/viewer/widgets/popupmenustyle.cpp
+index ddb509cd..0fd91f73 100644
+--- a/viewer/widgets/popupmenustyle.cpp
++++ b/viewer/widgets/popupmenustyle.cpp
+@@ -19,6 +19,7 @@
+ #include <QPixmap>
+ #include <QPixmapCache>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOption>
+ #include <QStyleOptionMenuItem>
+ 
+diff --git a/viewer/widgets/thumbnaildelegate.cpp b/viewer/widgets/thumbnaildelegate.cpp
+index 64bd65ef..1a09702d 100644
+--- a/viewer/widgets/thumbnaildelegate.cpp
++++ b/viewer/widgets/thumbnaildelegate.cpp
+@@ -23,6 +23,7 @@
+ #include <QHBoxLayout>
+ #include <QLineEdit>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmapCache>
+ #include <QStandardItemModel>
+ #include <QThread>
+diff --git a/viewer/widgets/thumbnaillistview.cpp b/viewer/widgets/thumbnaillistview.cpp
+index 0681c9d9..1f2f3940 100644
+--- a/viewer/widgets/thumbnaillistview.cpp
++++ b/viewer/widgets/thumbnaillistview.cpp
+@@ -30,6 +30,7 @@
+ #include <QMutex>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPen>
+ #include <QScrollBar>
+ #include <QStandardItemModel>