Control: tags -1 + pending On Tue, Oct 13, 2020 at 03:05:37PM +0300, Dmitry Shachnev wrote: > Dear Maintainer, > > kylin-video fails to build with Qt 5.15, currently available in experimental: > > timetip.cpp: In member function 'virtual void > TimeTip::paintEvent(QPaintEvent*)': > timetip.cpp:109:18: error: aggregate 'QPainterPath bg_path' has incomplete > type and cannot be defined > 109 | QPainterPath bg_path; > | ^~~~~~~ > timetip.cpp:114:18: error: aggregate 'QPainterPath border_path' has > incomplete type and cannot be defined > 114 | QPainterPath border_path; > | ^~~~~~~~~~~ > > The full build log is attached.
I have just uploaded an NMU fixing this to DELAYED/5. The debdiff is attached. -- Dmitry Shachnev
From 1bab605b44b00d697b6056e3480170445d513f17 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mity...@debian.org>
Date: Thu, 22 Oct 2020 20:01:16 +0300
Subject: [PATCH] Backport upstream patch to fix build with Qt 5.15.
---
debian/changelog | 7 +++++++
debian/patches/qt_5.15.patch | 33 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 41 insertions(+)
create mode 100644 debian/patches/qt_5.15.patch
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index f3bfd81..c56477b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kylin-video (2.1.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream patch to fix build with Qt 5.15.
+
+ -- Dmitry Shachnev <mity...@debian.org> Thu, 22 Oct 2020 20:00:58 +0300
+
kylin-video (2.1.0-1) unstable; urgency=medium
* New upstream bugfix release:
diff --git a/debian/patches/qt_5.15.patch b/debian/patches/qt_5.15.patch
new file mode 100644
index 0000000..a4341b4
--- /dev/null
+++ b/debian/patches/qt_5.15.patch
@@ -0,0 +1,33 @@
+From: Aylinux <cihan...@gmail.com>
+Date: Mon, 6 Jul 2020 14:11:57 +0300
+Subject: Add missing includes to fix build with Qt 5.15
+
+---
+ src/esctip.cpp | 1 +
+ src/timetip.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/esctip.cpp b/src/esctip.cpp
+index 351c234..bd4815f 100644
+--- a/src/esctip.cpp
++++ b/src/esctip.cpp
+@@ -23,6 +23,7 @@
+ #include <QHBoxLayout>
+ #include <QLabel>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGraphicsDropShadowEffect>
+ #include <QPropertyAnimation>
+ #include <QGraphicsOpacityEffect>
+diff --git a/src/timetip.cpp b/src/timetip.cpp
+index 581328f..8f8ee7a 100644
+--- a/src/timetip.cpp
++++ b/src/timetip.cpp
+@@ -24,6 +24,7 @@
+ #include <QVBoxLayout>
+ #include <QLabel>
+ #include <QPainter>
++#include <QPainterPath>
+
+ TimeTip::TimeTip(const QString &text, QWidget *parent) : QFrame(parent)
+ {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1188a59
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+qt_5.15.patch
--
2.28.0
signature.asc
Description: PGP signature
