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

!6 fix build error

Browse Source 
From: @ll3366 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot 2022-02-14 01:20:13 +00:00 committed by Gitee
commit d32faabf20
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deepin-font-manager.spec
View File

@ -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 <liweiganga@uniontech.com> - 5.6.23-2
- fix build error
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.6.23-1
- Update 5.6.23

55
fix-qtbase-QPainterPath.patch Normal file
View File

@ -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 <QPainter>
#include <QPaintEvent>
+#include <QPainterPath>
#include <QRect>
#include <DPalette>
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 <QPainter>
+#include <QPainterPath>
#include <DApplication>
#include <DApplicationHelper>
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 <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
#include <QStandardItemModel>
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 <QTimer>
#include <QPainter>
+#include <QPainterPath>
#include <QtMath>
#include <QEvent>
#include <QDebug>
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 <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
#include <DStyleHelper>