Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/
Date: Fri, 31 Aug 2018 17:58:16
Message-Id: 1535738275.33b1c1ac0d45debe40f797d843574ea7f8aee93a.asturm@gentoo
1 commit: 33b1c1ac0d45debe40f797d843574ea7f8aee93a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 31 17:55:18 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 31 17:57:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b1c1ac
7
8 media-gfx/kxstitch: Fix build with Qt 5.11
9
10 Closes: https://bugs.gentoo.org/664974
11 Package-Manager: Portage-2.3.48, Repoman-2.3.10
12
13 .../kxstitch/files/kxstitch-2.1.1-qt-5.11.patch | 37 ++++++++++++++++++++++
14 media-gfx/kxstitch/kxstitch-2.1.1.ebuild | 2 ++
15 2 files changed, 39 insertions(+)
16
17 diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
18 new file mode 100644
19 index 00000000000..70022fe9c8f
20 --- /dev/null
21 +++ b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
22 @@ -0,0 +1,37 @@
23 +From 9db3fcf9cd367681c0864238dc5009a604f3896c Mon Sep 17 00:00:00 2001
24 +From: Jonathan Riddell <jr@××××××××.org>
25 +Date: Wed, 27 Jun 2018 16:45:16 +0100
26 +Subject: fix build with Qt 5.11
27 +
28 +---
29 + src/LibraryPatternPropertiesDlg.cpp | 2 ++
30 + src/TextElementDlg.cpp | 1 +
31 + 2 files changed, 3 insertions(+)
32 +
33 +diff --git a/src/LibraryPatternPropertiesDlg.cpp b/src/LibraryPatternPropertiesDlg.cpp
34 +index 8d2e24c..c10da3f 100644
35 +--- a/src/LibraryPatternPropertiesDlg.cpp
36 ++++ b/src/LibraryPatternPropertiesDlg.cpp
37 +@@ -11,6 +11,8 @@
38 +
39 + #include "LibraryPatternPropertiesDlg.h"
40 +
41 ++#include <QIcon>
42 ++
43 + #include <KConfigGroup>
44 + #include <KHelpClient>
45 + #include <KLocalizedString>
46 +diff --git a/src/TextElementDlg.cpp b/src/TextElementDlg.cpp
47 +index 4d88b1e..fb545d1 100644
48 +--- a/src/TextElementDlg.cpp
49 ++++ b/src/TextElementDlg.cpp
50 +@@ -16,6 +16,7 @@
51 + #include "TextElementDlg.h"
52 +
53 + #include <QColorDialog>
54 ++#include <QButtonGroup>
55 +
56 + #include <KHelpClient>
57 + #include <KLocalizedString>
58 +--
59 +cgit v0.11.2
60
61 diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
62 index 3e24a1c98c3..e9ec0691e3f 100644
63 --- a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
64 +++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
65 @@ -39,3 +39,5 @@ DEPEND="${COMMON_DEPEND}
66 RDEPEND="${COMMON_DEPEND}
67 !media-gfx/kxstitch:4
68 "
69 +
70 +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )