fix build error
This commit is contained in:
liweiganga
parent
2d59567f67
commit
26c1593d21
@ -1,11 +1,12 @@
|
||||
%global _name dtkwidget
|
||||
Name: dtkwidget2
|
||||
Version: 2.2.1
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Deepin tool kit widget modules
|
||||
License: GPLv3
|
||||
URL: https://github.com/linuxdeepin/dtkwidget
|
||||
Source0: %{name}_%{version}.orig.tar.xz
|
||||
Patch0: modify-QPainterPath-error.patch
|
||||
|
||||
|
||||
BuildRequires: dtkcore2
|
||||
@ -13,6 +14,7 @@ BuildRequires: dtkcore2-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: qt5-qtbase-static
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Concurrent)
|
||||
BuildRequires: pkgconfig(Qt5DBus)
|
||||
@ -51,6 +53,7 @@ Header files and libraries for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
sed -i 's|/lib|/libexec|' tools/svgc/svgc.pro
|
||||
|
||||
%build
|
||||
@ -80,5 +83,8 @@ export PATH=%{_qt5_bindir}:$PATH
|
||||
%{_libdir}/lib%{_name}.so
|
||||
|
||||
%changelog
|
||||
* Sun Jan 30 2022 liweigang <liweiganga@uniontech.com> - 2.2.1-3
|
||||
- fix bhild error
|
||||
|
||||
* Fri Aug 7 2020 zhaochen pan <panchenbo@uniontech.com> - 2.2.1-2
|
||||
- Initial release for OpenEuler
|
||||
|
||||
187
modify-QPainterPath-error.patch
Normal file
187
modify-QPainterPath-error.patch
Normal file
@ -0,0 +1,187 @@
|
||||
diff --color -Naur a/examples/dwidget-examples/collections/graphicseffecttab.cpp b/examples/dwidget-examples/collections/graphicseffecttab.cpp
|
||||
--- a/examples/dwidget-examples/collections/graphicseffecttab.cpp 2022-02-07 11:32:46.265328132 +0800
|
||||
+++ b/examples/dwidget-examples/collections/graphicseffecttab.cpp 2022-02-07 11:35:33.735665054 +0800
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <QLabel>
|
||||
#include <QDebug>
|
||||
+#include <QPainterPath>
|
||||
DWIDGET_USE_NAMESPACE
|
||||
|
||||
GraphicsEffectTab::GraphicsEffectTab(QWidget *parent) : QWidget(parent)
|
||||
diff --color -Naur a/examples/dwidget-examples/collections/multilistitem.cpp b/examples/dwidget-examples/collections/multilistitem.cpp
|
||||
--- a/examples/dwidget-examples/collections/multilistitem.cpp 2022-02-07 11:32:46.277328307 +0800
|
||||
+++ b/examples/dwidget-examples/collections/multilistitem.cpp 2022-02-07 11:35:05.159279929 +0800
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include "multilistitem.h"
|
||||
#include <QColor>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_USE_NAMESPACE
|
||||
|
||||
diff --color -Naur a/examples/dwidget-examples/collections/singlelistitem.cpp b/examples/dwidget-examples/collections/singlelistitem.cpp
|
||||
--- a/examples/dwidget-examples/collections/singlelistitem.cpp 2022-02-07 11:32:46.281328366 +0800
|
||||
+++ b/examples/dwidget-examples/collections/singlelistitem.cpp 2022-02-07 11:34:01.406401490 +0800
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include "singlelistitem.h"
|
||||
#include <QColor>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_USE_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/dborderlesswidget.cpp b/src/widgets/dborderlesswidget.cpp
|
||||
--- a/src/widgets/dborderlesswidget.cpp 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dborderlesswidget.cpp 2022-01-30 10:29:53.056928638 +0800
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <QPainter>
|
||||
#include <QGuiApplication>
|
||||
#include <QWindow>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include <DObjectPrivate>
|
||||
|
||||
diff --color -Naur a/src/widgets/dclipeffectwidget.cpp b/src/widgets/dclipeffectwidget.cpp
|
||||
--- a/src/widgets/dclipeffectwidget.cpp 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dclipeffectwidget.cpp 2022-01-30 10:11:17.278587133 +0800
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <QPainter>
|
||||
#include <QPaintEvent>
|
||||
#include <QDebug>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include <qpa/qplatformbackingstore.h>
|
||||
|
||||
diff --color -Naur a/src/widgets/dclipeffectwidget.h b/src/widgets/dclipeffectwidget.h
|
||||
--- a/src/widgets/dclipeffectwidget.h 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dclipeffectwidget.h 2022-02-07 11:27:55.172650712 +0800
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "dobject.h"
|
||||
|
||||
#include <QWidget>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_BEGIN_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/dcrumbedit.cpp b/src/widgets/dcrumbedit.cpp
|
||||
--- a/src/widgets/dcrumbedit.cpp 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dcrumbedit.cpp 2022-01-30 10:41:00.321067375 +0800
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QDebug>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_BEGIN_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/dgraphicsclipeffect.cpp b/src/widgets/dgraphicsclipeffect.cpp
|
||||
--- a/src/widgets/dgraphicsclipeffect.cpp 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dgraphicsclipeffect.cpp 2022-01-30 10:28:14.918953192 +0800
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <QPainter>
|
||||
#include <QDebug>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_BEGIN_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/dgraphicsclipeffect.h b/src/widgets/dgraphicsclipeffect.h
|
||||
--- a/src/widgets/dgraphicsclipeffect.h 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dgraphicsclipeffect.h 2022-01-30 10:39:43.082332653 +0800
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "dobject.h"
|
||||
|
||||
#include <QGraphicsEffect>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_BEGIN_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/dmainwindow.h b/src/widgets/dmainwindow.h
|
||||
--- a/src/widgets/dmainwindow.h 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dmainwindow.h 2022-02-07 11:20:19.938412657 +0800
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "dobject.h"
|
||||
|
||||
#include <QMainWindow>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_BEGIN_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/dsegmentedcontrol.cpp b/src/widgets/dsegmentedcontrol.cpp
|
||||
--- a/src/widgets/dsegmentedcontrol.cpp 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dsegmentedcontrol.cpp 2022-01-30 10:05:50.226654486 +0800
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <QPainter>
|
||||
#include <QPaintEvent>
|
||||
#include <QApplication>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include "dsegmentedcontrol.h"
|
||||
#include "dthememanager.h"
|
||||
diff --color -Naur a/src/widgets/dsimplelistview.cpp b/src/widgets/dsimplelistview.cpp
|
||||
--- a/src/widgets/dsimplelistview.cpp 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dsimplelistview.cpp 2022-01-30 10:10:28.685678405 +0800
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <QWheelEvent>
|
||||
#include <QtMath>
|
||||
#include <QPointer>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include "dhidpihelper.h"
|
||||
|
||||
diff --color -Naur a/src/widgets/dspinner.cpp b/src/widgets/dspinner.cpp
|
||||
--- a/src/widgets/dspinner.cpp 2022-01-30 10:04:32.383168164 +0800
|
||||
+++ b/src/widgets/dspinner.cpp 2022-01-30 10:27:17.148199620 +0800
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <QtMath>
|
||||
#include <QPainter>
|
||||
#include <QTimer>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include <DObjectPrivate>
|
||||
|
||||
diff --color -Naur a/src/widgets/dvideowidget.cpp b/src/widgets/dvideowidget.cpp
|
||||
--- a/src/widgets/dvideowidget.cpp 2022-01-30 10:04:32.387168138 +0800
|
||||
+++ b/src/widgets/dvideowidget.cpp 2022-01-30 10:40:34.889482018 +0800
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <QMediaPlaylist>
|
||||
#include <QPainter>
|
||||
#include <QPointer>
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_BEGIN_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/dwaterprogress.cpp b/src/widgets/dwaterprogress.cpp
|
||||
--- a/src/widgets/dwaterprogress.cpp 2022-01-30 10:04:32.387168138 +0800
|
||||
+++ b/src/widgets/dwaterprogress.cpp 2022-01-30 10:28:51.938176611 +0800
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <QTimer>
|
||||
#include <QPainter>
|
||||
#include <QGraphicsDropShadowEffect>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include <DObjectPrivate>
|
||||
#include <DSvgRenderer>
|
||||
diff --color -Naur a/src/widgets/private/dblureffectwidget_p.h b/src/widgets/private/dblureffectwidget_p.h
|
||||
--- a/src/widgets/private/dblureffectwidget_p.h 2022-01-30 10:04:32.367168273 +0800
|
||||
+++ b/src/widgets/private/dblureffectwidget_p.h 2022-01-30 10:13:30.839139642 +0800
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <DObjectPrivate>
|
||||
#include "dblureffectwidget.h"
|
||||
+#include <QPainterPath>
|
||||
|
||||
DWIDGET_BEGIN_NAMESPACE
|
||||
|
||||
diff --color -Naur a/src/widgets/private/settings/shortcutedit.cpp b/src/widgets/private/settings/shortcutedit.cpp
|
||||
--- a/src/widgets/private/settings/shortcutedit.cpp 2022-01-30 10:04:32.367168273 +0800
|
||||
+++ b/src/widgets/private/settings/shortcutedit.cpp 2022-01-30 10:07:01.525810819 +0800
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <QPainter>
|
||||
#include <QKeySequence>
|
||||
#include <QKeyEvent>
|
||||
+#include <QPainterPath>
|
||||
|
||||
namespace
|
||||
{
|
||||
Loading…
x
Reference in New Issue
Block a user