Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-python/files/, dev-util/kdevelop-python/
Date: Thu, 10 May 2018 08:01:40
Message-Id: 1525939269.68decc065ca312b10e9af2c7fb3d682bfc740d67.asturm@gentoo
1 commit: 68decc065ca312b10e9af2c7fb3d682bfc740d67
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 10 06:59:08 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=68decc06
7
8 dev-util/kdevelop-python: Fix build with Qt 5.11
9
10 Package-Manager: Portage-2.3.36, Repoman-2.3.9
11
12 .../files/kdevelop-python-5.2.1-qt-5.11.patch | 24 ++++++++++++++++++++++
13 .../kdevelop-python/kdevelop-python-5.2.1.ebuild | 2 ++
14 2 files changed, 26 insertions(+)
15
16 diff --git a/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch b/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch
17 new file mode 100644
18 index 00000000000..67528c55850
19 --- /dev/null
20 +++ b/dev-util/kdevelop-python/files/kdevelop-python-5.2.1-qt-5.11.patch
21 @@ -0,0 +1,24 @@
22 +From a4a3cfb040054e7ca938bdd593c6c3c80d80807f Mon Sep 17 00:00:00 2001
23 +From: Luca Beltrame <lbeltrame@×××.org>
24 +Date: Thu, 10 May 2018 06:55:07 +0200
25 +Subject: Fix build with Qt 5.11
26 +
27 +Some includes were added transitively, now they need to be explicit.
28 +---
29 + codegen/correctionfilegenerator.cpp | 1 +
30 + 1 file changed, 1 insertion(+)
31 +
32 +diff --git a/codegen/correctionfilegenerator.cpp b/codegen/correctionfilegenerator.cpp
33 +index bb79a25..53ebec4 100644
34 +--- a/codegen/correctionfilegenerator.cpp
35 ++++ b/codegen/correctionfilegenerator.cpp
36 +@@ -20,6 +20,7 @@
37 +
38 + #include "correctionfilegenerator.h"
39 +
40 ++#include <QAction>
41 + #include <QTemporaryFile>
42 +
43 + #include <language/backgroundparser/backgroundparser.h>
44 +--
45 +cgit v0.11.2
46
47 diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
48 index ba7fd2bc14f..11bbd220000 100644
49 --- a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
50 +++ b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
51 @@ -39,6 +39,8 @@ RDEPEND="${DEPEND}
52
53 RESTRICT+=" test"
54
55 +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
56 +
57 pkg_setup() {
58 python-single-r1_pkg_setup
59 kde5_pkg_setup