diff --git a/fix-qtbase-QPainterPath.patch b/fix-qtbase-QPainterPath.patch new file mode 100644 index 0000000000000000000000000000000000000000..c398bd4692888886a6ed0b4cf9227374119f0a9c --- /dev/null +++ b/fix-qtbase-QPainterPath.patch @@ -0,0 +1,68 @@ +diff --color -Naur a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp +--- a/platformthemeplugin/qdeepintheme.cpp 2022-02-11 15:49:14.634625052 +0800 ++++ b/platformthemeplugin/qdeepintheme.cpp 2022-02-11 16:29:14.918077063 +0800 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -612,10 +613,10 @@ + } + + QHighDpiScaling::updateHighDpiScaling(); +- qDebug() << QHighDpiScaling::logicalDpi(); ++ qDebug() << QHighDpiScaling::logicalDpi(nullptr); + updateScaleLogcailDpi(s->scaleLogicalDpi()); + +- qDebug() << QHighDpiScaling::logicalDpi(); ++ qDebug() << QHighDpiScaling::logicalDpi(nullptr); + + return true; + } +diff --color -Naur a/styleplugins/dstyleplugin/painterhelper.cpp b/styleplugins/dstyleplugin/painterhelper.cpp +--- a/styleplugins/dstyleplugin/painterhelper.cpp 2022-02-11 15:07:09.230398247 +0800 ++++ b/styleplugins/dstyleplugin/painterhelper.cpp 2022-02-11 15:16:44.782154534 +0800 +@@ -18,6 +18,7 @@ + #include "painterhelper.h" + + #include ++#include + #include + + namespace dstyle { +diff --color -Naur a/styleplugins/dstyleplugin/pushbuttonhelper.cpp b/styleplugins/dstyleplugin/pushbuttonhelper.cpp +--- a/styleplugins/dstyleplugin/pushbuttonhelper.cpp 2022-02-11 15:07:09.226398214 +0800 ++++ b/styleplugins/dstyleplugin/pushbuttonhelper.cpp 2022-02-11 15:08:41.515121700 +0800 +@@ -29,6 +29,7 @@ + #endif + + #include ++#include + #include + + DWIDGET_USE_NAMESPACE +diff --color -Naur a/styleplugins/dstyleplugin/tabbarhelper.cpp b/styleplugins/dstyleplugin/tabbarhelper.cpp +--- a/styleplugins/dstyleplugin/tabbarhelper.cpp 2022-02-11 15:07:09.230398247 +0800 ++++ b/styleplugins/dstyleplugin/tabbarhelper.cpp 2022-02-11 15:41:19.894749052 +0800 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --color -Naur a/styleplugins/dstyleplugin/tabwidgethelper.cpp b/styleplugins/dstyleplugin/tabwidgethelper.cpp +--- a/styleplugins/dstyleplugin/tabwidgethelper.cpp 2022-02-11 15:07:09.230398247 +0800 ++++ b/styleplugins/dstyleplugin/tabwidgethelper.cpp 2022-02-11 15:24:18.016384617 +0800 +@@ -20,6 +20,7 @@ + #include "painterhelper.h" + + #include ++#include + #include + #include + diff --git a/qt5integration.spec b/qt5integration.spec index febff0f1c71eb15391d7be09793df3e9d47a971e..fc5d8540679c303de05aebdea72ac3fc0049a886 100644 --- a/qt5integration.spec +++ b/qt5integration.spec @@ -8,10 +8,11 @@ Name: dde-qt5integration Version: 5.0.16 -Release: 2 +Release: 3 Summary: Qt platform theme integration plugins for DDE License: GPLv3+ Source0: %{repo}_%{version}.orig.tar.xz +Patch0: fix-qtbase-QPainterPath.patch BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-static @@ -23,6 +24,7 @@ BuildRequires: qt5-qtsvg-devel BuildRequires: mtdev-devel BuildRequires: qt5-qtmultimedia-devel BuildRequires: libqtxdg libqtxdg-devel +BuildRequires: qt5-qtbase-private-devel %description @@ -30,7 +32,7 @@ Qt platform theme integration plugins for DDE Multiple Qt plugins to provide better Qt5 integration for DDE is included. %prep -%setup -q -n %{repo}-%{version} +%autosetup -n %{repo}-%{version} -p1 %build mkdir build && cd build @@ -54,6 +56,9 @@ popd %{_libdir}/qt5/plugins/styles/libchameleon.so %changelog +* Fri Feb 11 2022 liweigang - 5.0.16-3 +- fix buildRequires and build error + * Thu Oct 15 2020 weidong - 5.0.16-2 - Fixed BuildRequires