!7 fix build error
From: @ll3366 Reviewed-by: @weidongkl Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot
Gitee
commit
1fd1035d2c
@ -1,10 +1,11 @@
|
||||
Name: deepin-reader
|
||||
Version: 5.7.0.21
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: A simple PDF reader, supporting bookmarks, highlights and annotations
|
||||
License: GPLv3+
|
||||
URL: https://github.com/linuxdeepin/%{name}
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: fix-qtbase-include.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
@ -22,12 +23,13 @@ BuildRequires: poppler-qt5-devel
|
||||
BuildRequires: libspectre-devel
|
||||
BuildRequires: kf5-karchive-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
||||
@ -49,6 +51,9 @@ popd
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
%changelog
|
||||
* Thu Feb 10 2022 liweigang <liweiganga@uniontech.com> - 5.7.0.21-2
|
||||
- fix build error
|
||||
|
||||
* Wed Jul 07 2021 weidong <weidong@uniontech.com> - 5.7.0.21-1
|
||||
- Update to 5.7.0.21
|
||||
|
||||
|
||||
146
fix-qtbase-include.patch
Normal file
146
fix-qtbase-include.patch
Normal file
@ -0,0 +1,146 @@
|
||||
diff --color -Naur a/src/CustomControl/RoundColorWidget.cpp b/src/CustomControl/RoundColorWidget.cpp
|
||||
--- a/src/CustomControl/RoundColorWidget.cpp 2022-02-10 14:35:12.146852806 +0800
|
||||
+++ b/src/CustomControl/RoundColorWidget.cpp 2022-02-10 14:38:53.443472741 +0800
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <QColor>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QMouseEvent>
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
diff --color -Naur a/src/djvuControl/SheetBrowserDJVU.cpp b/src/djvuControl/SheetBrowserDJVU.cpp
|
||||
--- a/src/djvuControl/SheetBrowserDJVU.cpp 2022-02-10 14:35:12.166852863 +0800
|
||||
+++ b/src/djvuControl/SheetBrowserDJVU.cpp 2022-02-10 14:38:22.019385541 +0800
|
||||
@@ -39,6 +39,9 @@
|
||||
#include <QBitmap>
|
||||
#include <DMenu>
|
||||
#include <DGuiApplicationHelper>
|
||||
+#include <QDragEnterEvent>
|
||||
+#include <QMouseEvent>
|
||||
+#include <QWheelEvent>
|
||||
|
||||
DWIDGET_USE_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/document/djvumodel.cpp b/src/document/djvumodel.cpp
|
||||
--- a/src/document/djvumodel.cpp 2022-02-10 14:35:12.146852806 +0800
|
||||
+++ b/src/document/djvumodel.cpp 2022-02-10 14:42:41.468099365 +0800
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <QFile>
|
||||
#include <qmath.h>
|
||||
#include <QMutexLocker>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include <libdjvu/ddjvuapi.h>
|
||||
#include <libdjvu/miniexp.h>
|
||||
diff --color -Naur a/src/document/model.h b/src/document/model.h
|
||||
--- a/src/document/model.h 2022-02-10 14:35:12.146852806 +0800
|
||||
+++ b/src/document/model.h 2022-02-10 14:35:55.890976539 +0800
|
||||
@@ -2,6 +2,7 @@
|
||||
#define DOCUMENTMODEL_H
|
||||
|
||||
#include <QList>
|
||||
+#include <QPainterPath>
|
||||
#include <QtPlugin>
|
||||
#include <QRect>
|
||||
#include <QStandardItemModel>
|
||||
diff --color -Naur a/src/lpreviewControl/bookmark/bookmarkdelegate.cpp b/src/lpreviewControl/bookmark/bookmarkdelegate.cpp
|
||||
--- a/src/lpreviewControl/bookmark/bookmarkdelegate.cpp 2022-02-10 14:35:12.150852818 +0800
|
||||
+++ b/src/lpreviewControl/bookmark/bookmarkdelegate.cpp 2022-02-10 14:41:55.931974985 +0800
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "application.h"
|
||||
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QDebug>
|
||||
#include <QItemSelectionModel>
|
||||
#include <QAbstractItemView>
|
||||
diff --color -Naur a/src/lpreviewControl/note/notesdelegate.cpp b/src/lpreviewControl/note/notesdelegate.cpp
|
||||
--- a/src/lpreviewControl/note/notesdelegate.cpp 2022-02-10 14:35:12.150852818 +0800
|
||||
+++ b/src/lpreviewControl/note/notesdelegate.cpp 2022-02-10 14:48:31.816027212 +0800
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "utils/utils.h"
|
||||
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QDebug>
|
||||
#include <QItemSelectionModel>
|
||||
#include <QAbstractItemView>
|
||||
diff --color -Naur a/src/lpreviewControl/search/searchresdelegate.cpp b/src/lpreviewControl/search/searchresdelegate.cpp
|
||||
--- a/src/lpreviewControl/search/searchresdelegate.cpp 2022-02-10 14:35:12.150852818 +0800
|
||||
+++ b/src/lpreviewControl/search/searchresdelegate.cpp 2022-02-10 15:07:50.068365245 +0800
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "utils/utils.h"
|
||||
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QDebug>
|
||||
#include <QItemSelectionModel>
|
||||
#include <QAbstractItemView>
|
||||
diff --color -Naur a/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp b/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp
|
||||
--- a/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp 2022-02-10 14:35:12.150852818 +0800
|
||||
+++ b/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp 2022-02-10 15:07:21.856323445 +0800
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "utils/utils.h"
|
||||
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QDebug>
|
||||
#include <QItemSelectionModel>
|
||||
#include <QAbstractItemView>
|
||||
diff --color -Naur a/src/pdfControl/docview/commonstruct.h b/src/pdfControl/docview/commonstruct.h
|
||||
--- a/src/pdfControl/docview/commonstruct.h 2022-02-10 14:35:12.154852830 +0800
|
||||
+++ b/src/pdfControl/docview/commonstruct.h 2022-02-10 14:44:13.904350919 +0800
|
||||
@@ -6,6 +6,8 @@
|
||||
#include <QDateTime>
|
||||
|
||||
#include <QMetaType>
|
||||
+#include <QPointF>
|
||||
+#include <QRectF>
|
||||
|
||||
enum ViewMode_EM {
|
||||
ViewMode_SinglePage = 0,
|
||||
diff --color -Naur a/src/uiframe/DocSheet.h b/src/uiframe/DocSheet.h
|
||||
--- a/src/uiframe/DocSheet.h 2022-02-10 14:35:12.166852863 +0800
|
||||
+++ b/src/uiframe/DocSheet.h 2022-02-10 15:25:55.504676036 +0800
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <DSplitter>
|
||||
#include <QMap>
|
||||
+#include <QSet>
|
||||
|
||||
#include "global.h"
|
||||
#include "pdfControl/docview/commonstruct.h"
|
||||
diff --color -Naur a/src/utils/utils.cpp b/src/utils/utils.cpp
|
||||
--- a/src/utils/utils.cpp 2022-02-10 14:35:12.146852806 +0800
|
||||
+++ b/src/utils/utils.cpp 2022-02-10 14:45:13.936513702 +0800
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <QDir>
|
||||
#include <QFontMetrics>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QString>
|
||||
#include <QtMath>
|
||||
#include <QWidget>
|
||||
diff --color -Naur a/src/widgets/ScaleWidget.cpp b/src/widgets/ScaleWidget.cpp
|
||||
--- a/src/widgets/ScaleWidget.cpp 2022-02-10 14:35:12.162852852 +0800
|
||||
+++ b/src/widgets/ScaleWidget.cpp 2022-02-10 14:43:26.176221180 +0800
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <QHBoxLayout>
|
||||
#include <QLineEdit>
|
||||
#include <DIconButton>
|
||||
+#include <QMouseEvent>
|
||||
|
||||
ScaleWidget::ScaleWidget(DWidget *parent)
|
||||
: DWidget(parent)
|
||||
diff --color -Naur a/src/widgets/SlideWidget.cpp b/src/widgets/SlideWidget.cpp
|
||||
--- a/src/widgets/SlideWidget.cpp 2022-02-10 14:35:12.162852852 +0800
|
||||
+++ b/src/widgets/SlideWidget.cpp 2022-02-10 14:58:45.191734367 +0800
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <QDesktopWidget>
|
||||
#include <QPropertyAnimation>
|
||||
#include <QTimer>
|
||||
+#include <QMouseEvent>
|
||||
|
||||
SlideWidget::SlideWidget(DocSheet *docsheet)
|
||||
: DWidget(MainWindow::windowContainSheet(docsheet))
|
||||
Loading…
x
Reference in New Issue
Block a user