summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-18 21:09:21 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-18 21:32:47 +0200
commit88f036d302734f8ca783fa807788786ceba04240 (patch)
tree4bac3c616aa3ae187501c381aa9ec03a2bd90b91 /www-client
parentdev-python/tagpy: Drop 2018.1 (r0) (diff)
downloadgentoo-88f036d302734f8ca783fa807788786ceba04240.tar.gz
gentoo-88f036d302734f8ca783fa807788786ceba04240.tar.bz2
gentoo-88f036d302734f8ca783fa807788786ceba04240.zip
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@gentoo.org>
Diffstat (limited to 'www-client')
-rw-r--r--www-client/falkon/falkon-3.1.0-r1.ebuild1
-rw-r--r--www-client/falkon/files/falkon-3.1.0-qt-5.15.patch26
2 files changed, 27 insertions, 0 deletions
diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild
index 687be8779fbe..3534c91a317e 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 000000000000..2ca9783f2ac2
--- /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 <heirecka@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
+