From 968e4ec47def7f561b759ef54ff67334055b9278 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Sep 11 2020 19:13:36 +0000 Subject: Fix build against Qt 5.15 --- diff --git a/deepin-qt5integration-fix-build-qt-5.15.patch b/deepin-qt5integration-fix-build-qt-5.15.patch new file mode 100644 index 0000000..c463ea0 --- /dev/null +++ b/deepin-qt5integration-fix-build-qt-5.15.patch @@ -0,0 +1,72 @@ +diff --git a/dstyleplugin/painterhelper.cpp b/dstyleplugin/painterhelper.cpp +index 3db216d..66d548f 100644 +--- a/dstyleplugin/painterhelper.cpp ++++ b/dstyleplugin/painterhelper.cpp +@@ -18,6 +18,7 @@ + #include "painterhelper.h" + + #include ++#include + #include + + namespace dstyle { +diff --git a/dstyleplugin/painterhelper.h b/dstyleplugin/painterhelper.h +index 6a0aa0e..9235781 100644 +--- a/dstyleplugin/painterhelper.h ++++ b/dstyleplugin/painterhelper.h +@@ -19,6 +19,7 @@ + #define PAINTERHELPER_H + + #include ++#include + + #include "common.h" + +diff --git a/dstyleplugin/pushbuttonhelper.cpp b/dstyleplugin/pushbuttonhelper.cpp +index 8069070..168b009 100644 +--- a/dstyleplugin/pushbuttonhelper.cpp ++++ b/dstyleplugin/pushbuttonhelper.cpp +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + DWIDGET_USE_NAMESPACE + +diff --git a/dstyleplugin/tabbarhelper.cpp b/dstyleplugin/tabbarhelper.cpp +index 51f677b..e0ef36c 100644 +--- a/dstyleplugin/tabbarhelper.cpp ++++ b/dstyleplugin/tabbarhelper.cpp +@@ -33,6 +33,7 @@ DWIDGET_USE_NAMESPACE + #include + #include + #include ++#include + #include + #include + #include +diff --git a/dstyleplugin/tabwidgethelper.cpp b/dstyleplugin/tabwidgethelper.cpp +index a2b6756..c5a7d65 100644 +--- a/dstyleplugin/tabwidgethelper.cpp ++++ b/dstyleplugin/tabwidgethelper.cpp +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + + namespace dstyle { +diff --git a/styles/norwegianwoodstyle.h b/styles/norwegianwoodstyle.h +index 8bcb846..de2baa6 100644 +--- a/styles/norwegianwoodstyle.h ++++ b/styles/norwegianwoodstyle.h +@@ -43,6 +43,7 @@ + + #include + #include ++#include + + QT_BEGIN_NAMESPACE + class QPainterPath; diff --git a/deepin-qt5integration.spec b/deepin-qt5integration.spec index 2029f3f..b3b6c17 100644 --- a/deepin-qt5integration.spec +++ b/deepin-qt5integration.spec @@ -14,6 +14,7 @@ Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz Patch0: deepin-qt5integration-qt5.13.patch # https://git.archlinux.org/svntogit/community.git/plain/trunk/deepin-qt5integration-qt5.14.patch?h=packages/deepin-qt5integration&id=b9bad53f20d27a15f9587f39db3e1a0243ec6880 Patch1: deepin-qt5integration-qt5.14.patch +Patch2: deepin-qt5integration-fix-build-qt-5.15.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(atk) @@ -53,6 +54,7 @@ Multiple Qt plugins to provide better Qt5 integration for DDE is included. %patch0 -p1 -b .fix-build-with-qt5-13 %patch1 -p1 -b .fix-build-with-qt5-14 +%patch2 -p1 -b .fix-build-qt-5.15 %build %qmake_qt5 PREFIX=%{_prefix}