[gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/

[Andreas Sturmlechner]

commit:     88f036d302734f8ca783fa807788786ceba04240
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:09:21 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:32:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f036d3

www-client/falkon: Fix build with Qt 5.15

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 www-client/falkon/falkon-3.1.0-r1.ebuild           |  1 +
 www-client/falkon/files/falkon-3.1.0-qt-5.15.patch | 26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild 
b/www-client/falkon/falkon-3.1.0-r1.ebuild
index 687be8779fb..3534c91a317 100644
--- a/www-client/falkon/falkon-3.1.0-r1.ebuild
+++ b/www-client/falkon/falkon-3.1.0-r1.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
        "${FILESDIR}/${P}-use-cmake-find-intl.patch"
        "${FILESDIR}/${P}-fix-warn-registering-schemes.patch"
        "${FILESDIR}/${P}-qt-5.14.patch"
+       "${FILESDIR}/${P}-qt-5.15.patch"
 )
 
 # bug 653046

diff --git a/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch 
b/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch
new file mode 100644
index 00000000000..2ca9783f2ac
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch
@@ -0,0 +1,26 @@
+From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heire...@exherbo.org>
+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).
+---
+ 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 <QByteArray>
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QBuffer>
+ #include <QFile>
+ #include <QDir>
+-- 
+cgit v1.1
+