From 5abb4533c5c7aea0d513f71dac691ccf6f620508 Mon Sep 17 00:00:00 2001 From: liweiganga Date: Mon, 7 Feb 2022 14:20:35 +0800 Subject: [PATCH] fix build error --- deepin-image-viewer.spec | 10 ++++-- modify-QPainterPath-error.patch | 55 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 modify-QPainterPath-error.patch diff --git a/deepin-image-viewer.spec b/deepin-image-viewer.spec index 45969ca..3787306 100644 --- a/deepin-image-viewer.spec +++ b/deepin-image-viewer.spec @@ -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 - 5.6.3.49-3 +* Mon Feb 07 2022 liweigang - 5.6.3.49-2 +- fix build error + +* Mon Jul 12 2021 weidong - 5.6.3.49-1 - Update 5.6.3.49 * Fri Sep 4 2020 chenbo pan - 1.3.17-3 diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch new file mode 100644 index 0000000..afaa89a --- /dev/null +++ b/modify-QPainterPath-error.patch @@ -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 + #include + #include ++#include + #include + #include + #include +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 + #include + #include ++#include + #include + #include + +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 + #include + #include ++#include + #include + #include + +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 + #include + #include ++#include + #include + #include + #include +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 + #include + #include ++#include + #include + #include + #include -- Gitee