Control: tags -1 + pending
On Tue, Oct 13, 2020 at 03:25:23PM +0300, Dmitry Shachnev wrote:
> Dear Maintainer,
>
> falkon fails to build with Qt 5.15, currently available in experimental.
>
> After successfully rebuilding kguiaddons and kxmlgui, I get this error:
>
> /<>/src/lib/tools/qztools.cpp:413:18: error: aggregate
> ‘QPainterPath path’ has incomplete type and cannot be defined
> 413 | QPainterPath path;
> | ^~~~
>
> This is fixed upstream, see the linked merge request.
I have now uploaded the NMU fixing this to DELAYED/5.
The debdiff is attached, and I have also created a merge request on salsa:
https://salsa.debian.org/georgesk/falkon/-/merge_requests/2
--
Dmitry Shachnev
diff -Nru falkon-3.1.0+dfsg1/debian/changelog falkon-3.1.0+dfsg1/debian/changelog
--- falkon-3.1.0+dfsg1/debian/changelog 2020-08-24 10:55:39.0 +0300
+++ falkon-3.1.0+dfsg1/debian/changelog 2020-10-24 13:51:42.0 +0300
@@ -1,3 +1,10 @@
+falkon (3.1.0+dfsg1-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream patch to fix build with Qt 5.15 (closes: #972158).
+
+ -- Dmitry Shachnev Sat, 24 Oct 2020 13:51:42 +0300
+
falkon (3.1.0+dfsg1-8) unstable; urgency=medium
* backported the last version of networkmanages.cpp. Closes: #964775
diff -Nru falkon-3.1.0+dfsg1/debian/patches/Fix-build-with-Qt-5.15.patch falkon-3.1.0+dfsg1/debian/patches/Fix-build-with-Qt-5.15.patch
--- falkon-3.1.0+dfsg1/debian/patches/Fix-build-with-Qt-5.15.patch 1970-01-01 03:00:00.0 +0300
+++ falkon-3.1.0+dfsg1/debian/patches/Fix-build-with-Qt-5.15.patch 2020-10-24 13:51:42.0 +0300
@@ -0,0 +1,24 @@
+From: Heiko Becker
+Date: Sun, 29 Mar 2020 12:53:00 +0200
+Subject: Fix build with Qt 5.15
+
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+(cherry picked from commit 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a)
+---
+ src/lib/tools/qztools.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp
+index 499b225..04f19b7 100644
+--- a/src/lib/tools/qztools.cpp
b/src/lib/tools/qztools.cpp
+@@ -25,6 +25,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff -Nru falkon-3.1.0+dfsg1/debian/patches/series falkon-3.1.0+dfsg1/debian/patches/series
--- falkon-3.1.0+dfsg1/debian/patches/series 2020-08-24 10:52:18.0 +0300
+++ falkon-3.1.0+dfsg1/debian/patches/series 2020-10-24 13:51:42.0 +0300
@@ -1,3 +1,4 @@
registerSchemes.patch
add-source-minified-js.patch
verticaltabsplugin.cpp.patch
+Fix-build-with-Qt-5.15.patch
signature.asc
Description: PGP signature