Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kitemviews/, kde-frameworks/kitemviews/files/
Date: Mon, 23 Dec 2019 11:12:54
Message-Id: 1577099548.fe41c1c20b0d864a6399ac72bc3aa6dabac6b9e1.asturm@gentoo
1 commit: fe41c1c20b0d864a6399ac72bc3aa6dabac6b9e1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 11:12:28 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 11:12:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe41c1c2
7
8 kde-frameworks/kitemviews: Fix 5.64.0 build with Qt 5.14.0
9
10 Upstream commit 69b9ac0575d905ded79ed013c6e2374d9ebeb841
11
12 Reported-by: Scott Alfter <scott <AT> alfter.us>
13 Closes: https://bugs.gentoo.org/703586
14 Package-Manager: Portage-2.3.82, Repoman-2.3.20
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 .../files/kitemviews-5.64.0-qt-5.14.0.patch | 23 ++++++++++++++++++++++
18 kde-frameworks/kitemviews/kitemviews-5.64.0.ebuild | 2 ++
19 2 files changed, 25 insertions(+)
20
21 diff --git a/kde-frameworks/kitemviews/files/kitemviews-5.64.0-qt-5.14.0.patch b/kde-frameworks/kitemviews/files/kitemviews-5.64.0-qt-5.14.0.patch
22 new file mode 100644
23 index 00000000000..a714554ac00
24 --- /dev/null
25 +++ b/kde-frameworks/kitemviews/files/kitemviews-5.64.0-qt-5.14.0.patch
26 @@ -0,0 +1,23 @@
27 +From 69b9ac0575d905ded79ed013c6e2374d9ebeb841 Mon Sep 17 00:00:00 2001
28 +From: Roman Gilg <subdiff@×××××.com>
29 +Date: Fri, 22 Nov 2019 17:48:20 +0100
30 +Subject: Add missing include for Qt 5.14 build
31 +
32 +---
33 + src/kwidgetitemdelegatepool_p.h | 1 +
34 + 1 file changed, 1 insertion(+)
35 +
36 +diff --git a/src/kwidgetitemdelegatepool_p.h b/src/kwidgetitemdelegatepool_p.h
37 +index 206ee0e..9d0147b 100644
38 +--- a/src/kwidgetitemdelegatepool_p.h
39 ++++ b/src/kwidgetitemdelegatepool_p.h
40 +@@ -24,6 +24,7 @@
41 +
42 + #include <QHash>
43 + #include <QList>
44 ++#include <QPersistentModelIndex>
45 +
46 + class QWidget;
47 + class QStyleOptionViewItem;
48 +--
49 +cgit v1.1
50
51 diff --git a/kde-frameworks/kitemviews/kitemviews-5.64.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.64.0.ebuild
52 index 748451a9b43..61cdfe5533f 100644
53 --- a/kde-frameworks/kitemviews/kitemviews-5.64.0.ebuild
54 +++ b/kde-frameworks/kitemviews/kitemviews-5.64.0.ebuild
55 @@ -22,3 +22,5 @@ DEPEND="
56 >=dev-qt/qtwidgets-${QTMIN}:5
57 "
58 RDEPEND="${DEPEND}"
59 +
60 +PATCHES=( "${FILESDIR}/${P}-qt-5.14.0.patch" )