1 |
commit: 5923dcabd01b0fbf953faa4173d593f84ebf91b0 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 2 21:03:53 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 2 21:51:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5923dcab |
7 |
|
8 |
media-sound/mumble: Fix build with Qt 5.15 |
9 |
|
10 |
Thanks-to: Marco Genasci <fedeliallalinea <AT> gmail.com> |
11 |
Closes: https://bugs.gentoo.org/726692 |
12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../mumble/files/mumble-1.3.1_rc1-qt-5.15.patch | 28 ++++++++++++++++++++++ |
16 |
media-sound/mumble/mumble-1.3.1_rc1.ebuild | 2 ++ |
17 |
2 files changed, 30 insertions(+) |
18 |
|
19 |
diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..4268d56e829 |
22 |
--- /dev/null |
23 |
+++ b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch |
24 |
@@ -0,0 +1,28 @@ |
25 |
+From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001 |
26 |
+From: Marco Genasci <fedeliallalinea@×××××.com> |
27 |
+Date: Mon, 1 Jun 2020 21:01:00 +0200 |
28 |
+Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath> |
29 |
+ include for Qt 5.15 |
30 |
+MIME-Version: 1.0 |
31 |
+Content-Type: text/plain; charset=UTF-8 |
32 |
+Content-Transfer-Encoding: 8bit |
33 |
+ |
34 |
+../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’ |
35 |
+ 42 | QPainterPath qpp; |
36 |
+ | ^~~ |
37 |
+--- |
38 |
+ src/mumble/OverlayText.h | 1 + |
39 |
+ 1 file changed, 1 insertion(+) |
40 |
+ |
41 |
+diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h |
42 |
+index f06f2b63a8..c1cd9efdd7 100644 |
43 |
+--- a/src/mumble/OverlayText.h |
44 |
++++ b/src/mumble/OverlayText.h |
45 |
+@@ -6,6 +6,7 @@ |
46 |
+ #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_ |
47 |
+ #define MUMBLE_MUMBLE_OVERLAYTEXT_H_ |
48 |
+ |
49 |
++#include <QtGui/QPainterPath> |
50 |
+ #include <QtGui/QPixmap> |
51 |
+ #include <QtGui/QFont> |
52 |
+ |
53 |
|
54 |
diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild |
55 |
index 69f5d7055e0..f23f44786ac 100644 |
56 |
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild |
57 |
+++ b/media-sound/mumble/mumble-1.3.1_rc1.ebuild |
58 |
@@ -64,6 +64,8 @@ BDEPEND=" |
59 |
virtual/pkgconfig |
60 |
" |
61 |
|
62 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692 |
63 |
+ |
64 |
# NB: qmake does not support multilib but it's fine to configure |
65 |
# for the native ABI here |
66 |
src_configure() { |