packages/deepin-image-viewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!8 fix build error

Browse Source 
Merge pull request !8 from liweiganga/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-02-07 07:26:37 +00:00 committed by Gitee
commit 528e7035e8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deepin-image-viewer.spec
View File

@ -1,10 +1,11 @@
Name: deepin-image-viewer
Version: 5.6.3.49
Release: 1
Release: 2
Summary: Deepin Image Viewer
License: GPLv3
URL: https://github.com/linuxdeepin/deepin-image-viewer
Source0: %{name}_%{version}.tar.gz
Patch0: modify-QPainterPath-error.patch
BuildRequires: gcc-c++
BuildRequires: qt5-devel
@ -23,6 +24,7 @@ BuildRequires: udisks2-qt5-devel
BuildRequires: libgio-qt libgio-qt-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: qt5-qtbase-private-devel
Requires: hicolor-icon-theme
%description
@ -30,6 +32,7 @@ Requires: hicolor-icon-theme
%prep
%setup -q
%patch0 -p1
%build
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
@ -55,7 +58,10 @@ popd
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%changelog
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.6.3.49-3
* Mon Feb 07 2022 liweigang <liweiganga@uniontech.com> - 5.6.3.49-2
- fix build error
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.6.3.49-1
- Update 5.6.3.49
* Fri Sep 4 2020 chenbo pan <panchenbo@uniontech.com> - 1.3.17-3

55
modify-QPainterPath-error.patch Normal file
View File

@ -0,0 +1,55 @@
diff --color -Naur a/viewer/module/view/contents/imageinfowidget.cpp b/viewer/module/view/contents/imageinfowidget.cpp
--- a/viewer/module/view/contents/imageinfowidget.cpp 2022-02-07 14:32:34.180823978 +0800
+++ b/viewer/module/view/contents/imageinfowidget.cpp 2022-02-07 14:47:58.781017892 +0800
@@ -30,6 +30,7 @@
#include <QFileInfo>
#include <QFormLayout>
#include <QLabel>
+#include <QPainterPath>
#include <QPushButton>
#include <QScrollBar>
#include <QString>
diff --color -Naur a/viewer/module/view/contents/ttbcontent.cpp b/viewer/module/view/contents/ttbcontent.cpp
--- a/viewer/module/view/contents/ttbcontent.cpp 2022-02-07 14:32:34.180823978 +0800
+++ b/viewer/module/view/contents/ttbcontent.cpp 2022-02-07 14:37:02.997108175 +0800
@@ -33,6 +33,7 @@
#include <QDebug>
#include <QFileInfo>
#include <QHBoxLayout>
+#include <QPainterPath>
#include <QTimer>
#include <QtMath>
diff --color -Naur a/viewer/widgets/popupmenustyle.cpp b/viewer/widgets/popupmenustyle.cpp
--- a/viewer/widgets/popupmenustyle.cpp 2022-02-07 14:32:34.164823644 +0800
+++ b/viewer/widgets/popupmenustyle.cpp 2022-02-07 14:35:33.059939972 +0800
@@ -19,6 +19,7 @@
#include <QPixmap>
#include <QPixmapCache>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleOption>
#include <QStyleOptionMenuItem>
diff --color -Naur a/viewer/widgets/thumbnaildelegate.cpp b/viewer/widgets/thumbnaildelegate.cpp
--- a/viewer/widgets/thumbnaildelegate.cpp 2022-02-07 14:32:34.164823644 +0800
+++ b/viewer/widgets/thumbnaildelegate.cpp 2022-02-07 14:47:07.064895896 +0800
@@ -23,6 +23,7 @@
#include <QHBoxLayout>
#include <QLineEdit>
#include <QPainter>
+#include <QPainterPath>
#include <QPixmapCache>
#include <QStandardItemModel>
#include <QThread>
diff --color -Naur a/viewer/widgets/thumbnaillistview.cpp b/viewer/widgets/thumbnaillistview.cpp
--- a/viewer/widgets/thumbnaillistview.cpp 2022-02-07 14:32:34.160823559 +0800
+++ b/viewer/widgets/thumbnaillistview.cpp 2022-02-07 14:35:18.247724706 +0800
@@ -30,6 +30,7 @@
#include <QMutex>
#include <QPaintEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QPen>
#include <QScrollBar>
#include <QStandardItemModel>