Bug#972676: dde-qt5integration: FTBFS with Qt 5.15: error: aggregate ‘QPainterPath path’ has incomplete type and cannot be defined

[Dmitry Shachnev]

Control: tags -1 + pending

On Thu, Oct 22, 2020 at 01:55:09PM +0300, Dmitry Shachnev wrote:
> Dear Maintainer,
>
> dde-qt5integration fails to build with Qt 5.15, currently available in
> experimental.
>
> After rebuilding dde-qt-dbus-factory, dtkcore and libqtxdg, and building a
> fixed version of dtkwidget (see #972155), I get this error:
>
>   pushbuttonhelper.cpp: In member function ‘bool 
> dstyle::Style::drawPushButtonFrame(QPainter*, const QRect&, const QBrush&, 
> const QBrush&, const QColor&, const QWidget*) const’:
>   pushbuttonhelper.cpp:221:18: error: aggregate ‘QPainterPath path’ has 
> incomplete type and cannot be defined
>     221 |     QPainterPath path;
>         |                  ^~~~
>   pushbuttonhelper.cpp:231:26: error: aggregate ‘QPainterPath rightHalf’ has 
> incomplete type and cannot be defined
>     231 |             QPainterPath rightHalf;
>         |                          ^~~~~~~~~
>   pushbuttonhelper.cpp:235:26: error: aggregate ‘QPainterPath leftHalf’ has 
> incomplete type and cannot be defined
>     235 |             QPainterPath leftHalf;
>         |                          ^~~~~~~~
>
> This is fixed upstream, see the linked pull request.

I have just uploaded the NMU fixing this to DELAYED/5.

The debdiff is attached.

This change is also available in qt-5.15 branch on my fork on salsa:
https://salsa.debian.org/mitya57/dde-qt5integration/-/commits/qt-5.15

(I couldn't make a merge request because there is no branch for unstable
version.)

--
Dmitry Shachnev

diff -Nru dde-qt5integration-5.0.0/debian/changelog dde-qt5integration-5.0.0/debian/changelog
--- dde-qt5integration-5.0.0/debian/changelog	2020-06-06 18:27:34.000000000 +0300
+++ dde-qt5integration-5.0.0/debian/changelog	2020-10-25 13:21:15.000000000 +0300
@@ -1,3 +1,10 @@
+dde-qt5integration (5.0.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream patch to fix build with Qt 5.15 (closes: #972676).
+
+ -- Dmitry Shachnev <mity...@debian.org>  Sun, 25 Oct 2020 13:21:15 +0300
+
 dde-qt5integration (5.0.0-2) unstable; urgency=medium
 
   [ Dmitry Shachnev ]
diff -Nru dde-qt5integration-5.0.0/debian/patches/qt-5.15.patch dde-qt5integration-5.0.0/debian/patches/qt-5.15.patch
--- dde-qt5integration-5.0.0/debian/patches/qt-5.15.patch	1970-01-01 03:00:00.000000000 +0300
+++ dde-qt5integration-5.0.0/debian/patches/qt-5.15.patch	2020-10-25 13:21:15.000000000 +0300
@@ -0,0 +1,60 @@
+From: Felix Yan <felixonm...@archlinux.org>
+Date: Thu, 11 Jun 2020 16:19:53 +0800
+Subject: Fix build failures under Qt 5.15+
+
+(cherry picked from commit 5d2fbe972f495ec5ddadf9062612e042cf0ea07a)
+---
+ dstyleplugin/painterhelper.cpp    | 1 +
+ dstyleplugin/pushbuttonhelper.cpp | 1 +
+ dstyleplugin/tabbarhelper.cpp     | 1 +
+ dstyleplugin/tabwidgethelper.cpp  | 1 +
+ 4 files changed, 4 insertions(+)
+
+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 <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ 
+ namespace dstyle {
+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 <QDebug>
+ #include <QStyleOptionButton>
++#include <QPainterPath>
+ 
+ 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 <QStyleOptionTabBarBase>
+ #include <QStyleOptionToolButton>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QToolButton>
+ #include <QLinearGradient>
+ #include <QDebug>
+diff --git a/dstyleplugin/tabwidgethelper.cpp b/dstyleplugin/tabwidgethelper.cpp
+index a2b6756..f51d43d 100644
+--- a/dstyleplugin/tabwidgethelper.cpp
++++ b/dstyleplugin/tabwidgethelper.cpp
+@@ -20,6 +20,7 @@
+ #include "painterhelper.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTabWidget>
+ #include <QDebug>
+ 
diff -Nru dde-qt5integration-5.0.0/debian/patches/series dde-qt5integration-5.0.0/debian/patches/series
--- dde-qt5integration-5.0.0/debian/patches/series	2020-06-06 18:27:34.000000000 +0300
+++ dde-qt5integration-5.0.0/debian/patches/series	2020-10-25 13:21:15.000000000 +0300
@@ -1 +1,2 @@
 qt-5.14.patch
+qt-5.15.patch

signature.asc
Description: PGP signature