From 0b17a64206ed4b208c7431177515316fb6ef5ed4 Mon Sep 17 00:00:00 2001 From: liweiganga Date: Fri, 11 Feb 2022 11:05:17 +0800 Subject: [PATCH] fix build error --- deepin-font-manager.spec | 9 ++++-- fix-qtbase-QPainterPath.patch | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 fix-qtbase-QPainterPath.patch diff --git a/deepin-font-manager.spec b/deepin-font-manager.spec index 6c9deb9..fce9923 100644 --- a/deepin-font-manager.spec +++ b/deepin-font-manager.spec @@ -2,11 +2,12 @@ Name: deepin-font-manager Version: 5.6.23 -Release: 1 +Release: 2 Summary: Deepin Font Manager is used to install and uninstall font file for users with bulk install function License: GPLv3+ URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: fix-qtbase-QPainterPath.patch BuildRequires: gcc-c++ BuildRequires: qt5-devel @@ -17,6 +18,7 @@ BuildRequires: pkgconfig(dtkgui) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(dde-file-manager) +BuildRequires: qt5-qtbase-private-devel %description %{summary}. @@ -33,7 +35,7 @@ Summary: %{summary} %prep -%autosetup +%autosetup -p1 %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -66,6 +68,9 @@ popd %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 11 2022 liweigang - 5.6.23-2 +- fix build error + * Mon Jul 12 2021 weidong - 5.6.23-1 - Update 5.6.23 diff --git a/fix-qtbase-QPainterPath.patch b/fix-qtbase-QPainterPath.patch new file mode 100644 index 0000000..4a8fadf --- /dev/null +++ b/fix-qtbase-QPainterPath.patch @@ -0,0 +1,55 @@ +diff --color -Naur a/deepin-font-manager/interfaces/dfontpreviewer.cpp b/deepin-font-manager/interfaces/dfontpreviewer.cpp +--- a/deepin-font-manager/interfaces/dfontpreviewer.cpp 2022-02-11 09:38:55.999617049 +0800 ++++ b/deepin-font-manager/interfaces/dfontpreviewer.cpp 2022-02-11 09:39:41.675711054 +0800 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + #include + + #include +diff --color -Naur a/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp b/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp +--- a/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp 2022-02-11 09:38:55.999617049 +0800 ++++ b/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp 2022-02-11 10:05:20.575062102 +0800 +@@ -4,6 +4,7 @@ + #include "utils.h" + + #include ++#include + + #include + #include +diff --color -Naur a/deepin-font-manager/views/dfinstallerrorlistview.cpp b/deepin-font-manager/views/dfinstallerrorlistview.cpp +--- a/deepin-font-manager/views/dfinstallerrorlistview.cpp 2022-02-11 09:38:55.999617049 +0800 ++++ b/deepin-font-manager/views/dfinstallerrorlistview.cpp 2022-02-11 10:07:36.171363953 +0800 +@@ -3,6 +3,7 @@ + #include "utils.h" + + #include ++#include + #include + #include + +diff --color -Naur a/deepin-font-manager/views/dfontspinner.cpp b/deepin-font-manager/views/dfontspinner.cpp +--- a/deepin-font-manager/views/dfontspinner.cpp 2022-02-11 09:38:56.003617058 +0800 ++++ b/deepin-font-manager/views/dfontspinner.cpp 2022-02-11 10:04:15.498917746 +0800 +@@ -2,6 +2,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --color -Naur a/deepin-font-manager/views/dsplitlistwidget.cpp b/deepin-font-manager/views/dsplitlistwidget.cpp +--- a/deepin-font-manager/views/dsplitlistwidget.cpp 2022-02-11 09:38:56.003617058 +0800 ++++ b/deepin-font-manager/views/dsplitlistwidget.cpp 2022-02-11 10:06:56.747276058 +0800 +@@ -2,6 +2,7 @@ + #include "globaldef.h" + #include "utils.h" + #include ++#include + #include + + #include -- Gitee