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

[Antonio Rojas]

    Date: Tuesday, May 26, 2020 @ 14:24:04
  Author: arojas
Revision: 635101

Qt 5.15 rebuild

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

----------------------------+
 PKGBUILD                   |   10 +++-
 deepin-reader-qt5.15.patch |   97 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 14:21:42 UTC (rev 635100)
+++ PKGBUILD	2020-05-26 14:24:04 UTC (rev 635101)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-reader
 pkgver=5.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple PDF reader, supporting bookmarks, highlights and annotations'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-reader"
@@ -10,13 +10,17 @@
 depends=('deepin-qt5integration' 'djvulibre' 'karchive' 'libspectre' 'poppler-qt5')
 makedepends=('qt5-tools')
 groups=('deepin-extra')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-reader/archive/$pkgver.tar.gz")
-sha512sums=('78b7441b9cb31a914ac81881c5c49176ce110dd69c6f33c6a063a3ff6cf609dffb80b819ec6c4b29216cdda706c1945b6803f772a0f8d73b8d0d7992b4a430f5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-reader/archive/$pkgver.tar.gz"
+         deepin-reader-qt5.15.patch)
+sha512sums=('78b7441b9cb31a914ac81881c5c49176ce110dd69c6f33c6a063a3ff6cf609dffb80b819ec6c4b29216cdda706c1945b6803f772a0f8d73b8d0d7992b4a430f5'
+            '6632b42f130fedb8b2bdbe401a2b39a4a389b7ee9097ae7d4752748bd0bb710ec1750a2f1878cf4ed3bd795e04e5fd7acefea74e5f3a90c845c527da2ef174af')
 
 prepare() {
   cd deepin-reader-$pkgver
   sed -i '/include <QAbstractListModel>/a #include <QPointF>' application/pdfControl/imageviewmodel.h
   sed -i '/include <QMetaType>/a #include <QRectF>' application/pdfControl/docview/commonstruct.h
+
+  patch -p1 -i ../deepin-reader-qt5.15.patch # Fix build with Qt 5.15
 }
 
 build() {

Added: deepin-reader-qt5.15.patch
===================================================================
--- deepin-reader-qt5.15.patch	                        (rev 0)
+++ deepin-reader-qt5.15.patch	2020-05-26 14:24:04 UTC (rev 635101)
@@ -0,0 +1,97 @@
+diff --git a/application/CustomControl/DFMGlobal.cpp b/application/CustomControl/DFMGlobal.cpp
+index 99be58f6..ddab64c2 100644
+--- a/application/CustomControl/DFMGlobal.cpp
++++ b/application/CustomControl/DFMGlobal.cpp
+@@ -1,6 +1,8 @@
+ #include "DFMGlobal.h"
+ #include <private/qtextengine_p.h>
+ 
++#include <QPainterPath>
++
+ #define MAX_FILE_NAME_CHAR_COUNT 255
+ #define TEXT_LINE_HEIGHT 18
+ 
+diff --git a/application/CustomControl/ImageLabel.cpp b/application/CustomControl/ImageLabel.cpp
+index 1870e5c5..51e2cca2 100644
+--- a/application/CustomControl/ImageLabel.cpp
++++ b/application/CustomControl/ImageLabel.cpp
+@@ -21,6 +21,7 @@
+ #include <DGuiApplicationHelper>
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPalette>
+ 
+ #include "utils/utils.h"
+diff --git a/application/CustomControl/RoundColorWidget.cpp b/application/CustomControl/RoundColorWidget.cpp
+index 06f1e593..41f29739 100644
+--- a/application/CustomControl/RoundColorWidget.cpp
++++ b/application/CustomControl/RoundColorWidget.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QColor>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QApplication>
+ #include <QDebug>
+diff --git a/application/document/model.h b/application/document/model.h
+index 91ed1f4e..15f1ffa6 100644
+--- a/application/document/model.h
++++ b/application/document/model.h
+@@ -29,6 +29,7 @@ along with qpdfview.  If not, see <http://www.gnu.org/licenses/>.
+ #include <QStandardItemModel>
+ #include <QString>
+ #include <QWidget>
++#include <QPainterPath>
+ 
+ class QColor;
+ class QImage;
+diff --git a/application/pdfControl/bookmark/bookmarkdelegate.cpp b/application/pdfControl/bookmark/bookmarkdelegate.cpp
+index 7145d877..e8c18480 100644
+--- a/application/pdfControl/bookmark/bookmarkdelegate.cpp
++++ b/application/pdfControl/bookmark/bookmarkdelegate.cpp
+@@ -18,6 +18,7 @@
+ #include "pdfControl/imageviewmodel.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ #include <QItemSelectionModel>
+ #include <QAbstractItemView>
+diff --git a/application/pdfControl/note/notesdelegate.cpp b/application/pdfControl/note/notesdelegate.cpp
+index ecbda8b2..eff67b07 100644
+--- a/application/pdfControl/note/notesdelegate.cpp
++++ b/application/pdfControl/note/notesdelegate.cpp
+@@ -18,6 +18,7 @@
+ #include "pdfControl/imageviewmodel.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ #include <QItemSelectionModel>
+ #include <QAbstractItemView>
+diff --git a/application/pdfControl/search/searchresdelegate.cpp b/application/pdfControl/search/searchresdelegate.cpp
+index d39dec80..217a0190 100644
+--- a/application/pdfControl/search/searchresdelegate.cpp
++++ b/application/pdfControl/search/searchresdelegate.cpp
+@@ -18,6 +18,7 @@
+ #include "pdfControl/imageviewmodel.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ #include <QItemSelectionModel>
+ #include <QAbstractItemView>
+diff --git a/application/pdfControl/thumbnail/ThumbnailDelegate.cpp b/application/pdfControl/thumbnail/ThumbnailDelegate.cpp
+index d6b7a20d..33d11258 100644
+--- a/application/pdfControl/thumbnail/ThumbnailDelegate.cpp
++++ b/application/pdfControl/thumbnail/ThumbnailDelegate.cpp
+@@ -19,6 +19,7 @@
+ #include "utils/utils.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ #include <QItemSelectionModel>
+ #include <QAbstractItemView>