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

Felix Yan felixonmars at archlinux.org
Wed Jun 3 18:01:14 UTC 2020


    Date: Wednesday, June 3, 2020 @ 18:01:13
  Author: felixonmars
Revision: 638419

upgpkg: deepin-reader 5.6.5-1

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

----------------------------+
 PKGBUILD                   |   20 +++++---
 deepin-reader-qt5.15.patch |   97 -------------------------------------------
 2 files changed, 12 insertions(+), 105 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-03 17:59:48 UTC (rev 638418)
+++ PKGBUILD	2020-06-03 18:01:13 UTC (rev 638419)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-reader
-pkgver=5.6.4
-pkgrel=2
+pkgver=5.6.5
+pkgrel=1
 pkgdesc='A simple PDF reader, supporting bookmarks, highlights and annotations'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-reader"
@@ -12,15 +12,19 @@
 groups=('deepin-extra')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-reader/archive/$pkgver.tar.gz"
          deepin-reader-qt5.15.patch)
-sha512sums=('78b7441b9cb31a914ac81881c5c49176ce110dd69c6f33c6a063a3ff6cf609dffb80b819ec6c4b29216cdda706c1945b6803f772a0f8d73b8d0d7992b4a430f5'
+sha512sums=('1a2c41470f08e1d33854add22019607158f7c322c9c9b69f065a824212f7852a188d2644f306f21b14f48438eea2a95a67560317e0bb4b82146f63cf192a747a'
             '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
+  cd deepin-reader-$pkgver/src
+  sed -i '/include <QMetaType>/a #include <QRectF>' pdfControl/docview/commonstruct.h
+  sed -i '/include <QPainter>/a #include <QPainterPath>' CustomControl/RoundColorWidget.cpp lpreviewControl/bookmark/bookmarkdelegate.cpp \
+                                                         utils/utils.cpp lpreviewControl/thumbnail/ThumbnailDelegate.cpp lpreviewControl/note/notesdelegate.cpp \
+                                                         lpreviewControl/search/searchresdelegate.cpp
+  sed -i '/include <QRect>/a #include <QPainterPath>' document/model.h
+  sed -i '/include <QMap>/a #include <QSet>' uiframe/DocSheet.h
+  sed -i '/include <QBitmap>/a #include <QMouseEvent>' djvuControl/SheetBrowserDJVU.cpp
+  sed -i '/include <QDesktopWidget>/a #include <QMouseEvent>' widgets/SlideWidget.cpp
 }
 
 build() {

Deleted: deepin-reader-qt5.15.patch
===================================================================
--- deepin-reader-qt5.15.patch	2020-06-03 17:59:48 UTC (rev 638418)
+++ deepin-reader-qt5.15.patch	2020-06-03 18:01:13 UTC (rev 638419)
@@ -1,97 +0,0 @@
-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>


More information about the arch-commits mailing list