packages/dde-introduction
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!9 fix build error

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

9
dde-introduction.spec
View File

@ -1,13 +1,15 @@
Name: dde-introduction Name: dde-introduction
Version: 5.6.0.7 Version: 5.6.0.7
Release: 1 Release: 2
Summary: Introduction for UOS Summary: Introduction for UOS
License: GPLv3+ License: GPLv3+
URL: https://github.com/linuxdeepin/%{name} URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: modify-QPainterPath-error.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: qt5-devel BuildRequires: qt5-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: dtkcore-devel dtkwidget-devel BuildRequires: dtkcore-devel dtkwidget-devel
BuildRequires: pkgconfig(dframeworkdbus) BuildRequires: pkgconfig(dframeworkdbus)
@ -25,7 +27,7 @@ Watch the introduction video to get new features, customize your desktop, enable
effect and know more about UnionTech OS. effect and know more about UnionTech OS.
%prep %prep
%autosetup %autosetup -p1
# disable dmr lib # disable dmr lib
sed -i 's/contains(TARGET_ARCH, x86_64)/contains(TARGET_ARCH, mips)/' introduction.pro sed -i 's/contains(TARGET_ARCH, x86_64)/contains(TARGET_ARCH, mips)/' introduction.pro
@ -54,6 +56,9 @@ popd
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%changelog %changelog
* Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.6.0.7-2
- fix build error
* Fri Oct 23 2020 panchenbo <panchenbo@uniontech.com> - 5.6.0.7-1 * Fri Oct 23 2020 panchenbo <panchenbo@uniontech.com> - 5.6.0.7-1
- update to 5.6.0.7 - update to 5.6.0.7

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

@ -0,0 +1,33 @@
diff --color -Naur a/src/dvideowidget.h b/src/dvideowidget.h
--- a/src/dvideowidget.h 2022-02-08 10:58:23.000430309 +0800
+++ b/src/dvideowidget.h 2022-02-08 11:00:21.694887451 +0800
@@ -28,6 +28,7 @@
#include <QMediaPlayer>
#include <QMediaPlaylist>
#include <QPainter>
+#include <QPainterPath>
#include <QPointer>
#include <DObjectPrivate>
diff --color -Naur a/src/widgets/closebutton.h b/src/widgets/closebutton.h
--- a/src/widgets/closebutton.h 2022-02-08 10:58:23.004430302 +0800
+++ b/src/widgets/closebutton.h 2022-02-08 10:59:16.412344856 +0800
@@ -3,6 +3,7 @@
#include <QPushButton>
#include <QPainter>
+#include <QPainterPath>
#include <DGuiApplicationHelper>
#include <QKeyEvent>
#include <QMouseEvent>
diff --color -Naur a/src/widgets/navigationbutton.h b/src/widgets/navigationbutton.h
--- a/src/widgets/navigationbutton.h 2022-02-08 10:58:23.004430302 +0800
+++ b/src/widgets/navigationbutton.h 2022-02-08 10:59:40.029104263 +0800
@@ -22,6 +22,7 @@
#include <QGraphicsDropShadowEffect>
#include <QHBoxLayout>
#include <QPainter>
+#include <QPainterPath>
#include <QKeyEvent>
#include <DGuiApplicationHelper>