summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-19 13:21:35 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-19 14:01:48 +0200
commit4a6a2f87aaedb9e3451c88a2e1c05f3c8f606b3c (patch)
treea856016b98cc08ea6af3398eface8a7d70b7318a /mail-client
parentsys-fs/udiskie: drop old (diff)
downloadgentoo-4a6a2f87aaedb9e3451c88a2e1c05f3c8f606b3c.tar.gz
gentoo-4a6a2f87aaedb9e3451c88a2e1c05f3c8f606b3c.tar.bz2
gentoo-4a6a2f87aaedb9e3451c88a2e1c05f3c8f606b3c.zip
mail-client/trojita: 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 'mail-client')
-rw-r--r--mail-client/trojita/files/trojita-0.7-qt-5.15.patch28
-rw-r--r--mail-client/trojita/trojita-0.7-r2.ebuild3
2 files changed, 30 insertions, 1 deletions
diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.15.patch b/mail-client/trojita/files/trojita-0.7-qt-5.15.patch
new file mode 100644
index 000000000000..f6ce4cc938d4
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-qt-5.15.patch
@@ -0,0 +1,28 @@
+From 2869c385e72932cbed7398742b8a4d5e3feda765 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 24 Mar 2020 13:14:43 +0100
+Subject: Fix build with Qt 5.15.0
+
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef
+---
+ src/Gui/Window.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
+index 65ba246..8d74874 100644
+--- a/src/Gui/Window.cpp
++++ b/src/Gui/Window.cpp
+@@ -32,6 +32,7 @@
+ #include <QKeyEvent>
+ #include <QMenuBar>
+ #include <QMessageBox>
++#include <QPainterPath>
+ #include <QProgressBar>
+ #include <QRegularExpression>
+ #include <QScopedPointer>
+--
+cgit v1.1
+
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
index 19df3d885167..a5904f016e3a 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -49,6 +49,7 @@ PATCHES=(
"${FILESDIR}/${P}-gpgme.patch"
"${FILESDIR}/${P}-gpg-tests.patch"
"${FILESDIR}/${P}-qt-5.11b3.patch"
+ "${FILESDIR}/${P}-qt-5.15.patch"
)
src_prepare() {