1 |
commit: 811b41c7bf7417326e393a1157ce6587b9f6f21e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 10 07:43:00 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 10 08:01:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811b41c7 |
7 |
|
8 |
dev-vcs/kdesvn: Fix build with Qt 5.11 |
9 |
|
10 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
11 |
|
12 |
dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch | 25 +++++++++++++++++++++++++ |
13 |
dev-vcs/kdesvn/kdesvn-2.0.0.ebuild | 3 ++- |
14 |
2 files changed, 27 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..019d2271001 |
19 |
--- /dev/null |
20 |
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch |
21 |
@@ -0,0 +1,25 @@ |
22 |
+From 605484fd9fc873b9b8d571f398c3cab05c68d860 Mon Sep 17 00:00:00 2001 |
23 |
+From: Luca Beltrame <lbeltrame@×××.org> |
24 |
+Date: Thu, 10 May 2018 09:28:15 +0200 |
25 |
+Subject: Fix build with Qt 5.11 |
26 |
+ |
27 |
+Some includes added transitively previously now need to be explicitly |
28 |
+put. |
29 |
+--- |
30 |
+ src/svnfrontend/blamedisplay.cpp | 1 + |
31 |
+ 1 file changed, 1 insertion(+) |
32 |
+ |
33 |
+diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp |
34 |
+index 2d87502..5673181 100644 |
35 |
+--- a/src/svnfrontend/blamedisplay.cpp |
36 |
++++ b/src/svnfrontend/blamedisplay.cpp |
37 |
+@@ -30,6 +30,7 @@ |
38 |
+ #include <KTextEdit> |
39 |
+ #include <KTreeWidgetSearchLine> |
40 |
+ |
41 |
++#include <QAction> |
42 |
+ #include <QBrush> |
43 |
+ #include <QFontDatabase> |
44 |
+ #include <QInputDialog> |
45 |
+-- |
46 |
+cgit v0.11.2 |
47 |
|
48 |
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild |
49 |
index 483633ed6ea..b89d778a3a1 100644 |
50 |
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild |
51 |
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild |
52 |
@@ -1,4 +1,4 @@ |
53 |
-# Copyright 1999-2017 Gentoo Foundation |
54 |
+# Copyright 1999-2018 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=6 |
58 |
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND} |
59 |
PATCHES=( |
60 |
"${FILESDIR}/${P}-desktop.patch" |
61 |
"${FILESDIR}/${P}-deps.patch" |
62 |
+ "${FILESDIR}/${P}-qt-5.11.patch" |
63 |
) |
64 |
|
65 |
src_prepare(){ |