Bug#972354: deepin-screenshot: FTBFS with Qt 5.15: error: aggregate ‘QPainterPath rectPath’ has incomplete type and cannot be defined

2020-10-24 Thread Dmitry Shachnev
Control: tags -1 + pending

On Fri, Oct 16, 2020 at 08:49:38PM +0300, Dmitry Shachnev wrote:
> Dear Maintainer,
>
> deepin-screenshot fails to build with Qt 5.15, currently available in
> experimental.

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

The debdiff is attached, and I also created a merge request:

https://salsa.debian.org/pkg-deepin-team/deepin-screenshot/-/merge_requests/2

--
Dmitry Shachnev
diff --git a/debian/changelog b/debian/changelog
index 308832b..97730fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+deepin-screenshot (5.0.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Debian Janitor ]
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+Repository-Browse.
+
+  [ Dmitry Shachnev ]
+  * Add a patch to fix build with Qt 5.15 (closes: #972354).
+
+ -- Dmitry Shachnev   Sat, 24 Oct 2020 13:07:59 +0300
+
 deepin-screenshot (5.0.0-1) unstable; urgency=medium
 
   * New upstream release 5.0.0.
diff --git a/debian/patches/0002-Add-missing-QPainterPath-include.patch b/debian/patches/0002-Add-missing-QPainterPath-include.patch
new file mode 100644
index 000..c7d0499
--- /dev/null
+++ b/debian/patches/0002-Add-missing-QPainterPath-include.patch
@@ -0,0 +1,20 @@
+From: Dmitry Shachnev 
+Date: Sat, 24 Oct 2020 13:05:51 +0300
+Subject: Add missing QPainterPath include to fix build with Qt 5.15
+
+---
+ src/widgets/shapeswidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/widgets/shapeswidget.cpp b/src/widgets/shapeswidget.cpp
+index 3421937..5d346b4 100644
+--- a/src/widgets/shapeswidget.cpp
 b/src/widgets/shapeswidget.cpp
+@@ -21,6 +21,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "src/utils/calculaterect.h"
diff --git a/debian/patches/series b/debian/patches/series
index 4cd7e70..da7f854 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-bypass-deepin-turbo-invoker.patch
+0002-Add-missing-QPainterPath-include.patch
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 000..028eeda
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/linuxdeepin/deepin-screenshot/issues
+Bug-Submit: https://github.com/linuxdeepin/deepin-screenshot/issues/new
+Repository: https://github.com/linuxdeepin/deepin-screenshot.git
+Repository-Browse: https://github.com/linuxdeepin/deepin-screenshot


signature.asc
Description: PGP signature


Bug#972354: deepin-screenshot: FTBFS with Qt 5.15: error: aggregate ‘QPainterPath rectPath ’ has incomplete type and cannot be defined

2020-10-16 Thread Diederik de Haas
On Fri, 16 Oct 2020 20:49:38 +0300 Dmitry Shachnev  wrote:
> Source: deepin-screenshot

Upstream's repo (https://github.com/linuxdeepin/deepin-screenshot) has been 
archived/deprecated with the message "migrated into deepin-screen-recorder 
after v20"

That repo has a PR which fixes the issue:
https://github.com/linuxdeepin/deepin-screen-recorder/pull/45

But since it's technically another repo, I'll not mark it as 'forwarded'.

signature.asc
Description: This is a digitally signed message part.


Bug#972354: deepin-screenshot: FTBFS with Qt 5.15: error: aggregate ‘QPainterPath rectPath’ has incomplete type and cannot be defined

2020-10-16 Thread Dmitry Shachnev
Source: deepin-screenshot
Version: 5.0.0-1
Severity: important
Tags: ftbfs
User: debian-qt-...@lists.debian.org
Usertags: qt5.15
Control: block 972278 by -1

Dear Maintainer,

deepin-screenshot fails to build with Qt 5.15, currently available in
experimental.

After building a fixed version of dtkwidget (see #972155), I get this error:

  /<>/src/widgets/shapeswidget.cpp: In member function ‘void 
ShapesWidget::paintRect(QPainter&, FourPoints, int, 
ShapesWidget::ShapeBlurStatus, bool, bool)’:
  /<>/src/widgets/shapeswidget.cpp:1262:18: error: aggregate 
‘QPainterPath rectPath’ has incomplete type and cannot be defined
   1262 | QPainterPath rectPath;
|  ^~~~
  /<>/src/widgets/shapeswidget.cpp: In member function ‘void 
ShapesWidget::paintEllipse(QPainter&, FourPoints, int, 
ShapesWidget::ShapeBlurStatus, bool, bool)’:
  /<>/src/widgets/shapeswidget.cpp:1300:18: error: aggregate 
‘QPainterPath ellipsePath’ has incomplete type and cannot be defined
   1300 | QPainterPath ellipsePath;
|  ^~~
  /<>/src/widgets/shapeswidget.cpp: In member function ‘void 
ShapesWidget::paintArrow(QPainter&, QList, int, bool)’:
  /<>/src/widgets/shapeswidget.cpp:1328:26: error: aggregate 
‘QPainterPath path’ has incomplete type and cannot be defined
   1328 | QPainterPath path;
|  ^~~~
  /<>/src/widgets/shapeswidget.cpp: In member function ‘void 
ShapesWidget::paintLine(QPainter&, QList)’:
  /<>/src/widgets/shapeswidget.cpp:1346:18: error: aggregate 
‘QPainterPath linePaths’ has incomplete type and cannot be defined
   1346 | QPainterPath linePaths;
|  ^

Adding #include  should fix it.

--
Dmitry Shachnev


signature.asc
Description: PGP signature