Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
Date: Thu, 10 May 2018 08:01:43
Message-Id: 1525939270.028175e62748f872494c2422deef19c2f5c69734.asturm@gentoo
1 commit: 028175e62748f872494c2422deef19c2f5c69734
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 10 07:57:32 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu May 10 08:01:10 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028175e6
7
8 app-office/kmymoney: Fix build with Qt 5.11
9
10 Package-Manager: Portage-2.3.36, Repoman-2.3.9
11
12 .../kmymoney/files/kmymoney-5.0.1-qt-5.11.patch | 23 ++++++++++++++++++++++
13 app-office/kmymoney/kmymoney-5.0.1-r2.ebuild | 5 ++++-
14 2 files changed, 27 insertions(+), 1 deletion(-)
15
16 diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
17 new file mode 100644
18 index 00000000000..4158e0f8ed5
19 --- /dev/null
20 +++ b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
21 @@ -0,0 +1,23 @@
22 +From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001
23 +From: Luca Beltrame <lbeltrame@×××.org>
24 +Date: Thu, 10 May 2018 09:35:34 +0200
25 +Subject: Fix build with Qt 5.11
26 +
27 +---
28 + kmymoney/plugins/kbanking/widgets/chiptandialog.cpp | 1 +
29 + 1 file changed, 1 insertion(+)
30 +
31 +diff --git a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
32 +index 928e7a8..53fb2a3 100644
33 +--- a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
34 ++++ b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
35 +@@ -28,6 +28,7 @@
36 + #include <QQuickView>
37 + #include <QQuickItem>
38 + #include <QPushButton>
39 ++#include <QRegExpValidator>
40 + #include <QStandardPaths>
41 +
42 + #include <KLocalizedString>
43 +--
44 +cgit v0.11.2
45
46 diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
47 index 44363179fe0..7891db19927 100644
48 --- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
49 +++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
50 @@ -87,7 +87,10 @@ RDEPEND="${COMMON_DEPEND}
51 quotes? ( dev-perl/Finance-Quote )
52 "
53
54 -PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
55 +PATCHES=(
56 + "${FILESDIR}/${P}-cmake.patch"
57 + "${FILESDIR}/${P}-qt-5.11.patch"
58 +)
59
60 pkg_setup() {
61 use weboob && python_setup