diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-02 23:03:53 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-02 23:51:49 +0200 |
| commit | 5923dcabd01b0fbf953faa4173d593f84ebf91b0 (patch) | |
| tree | 10934dd340d2f0dc5cd752ef3688f5db0c8d1931 | |
| parent | dev-libs/vala-common: remove old (diff) | |
| download | gentoo-5923dcab.tar.gz gentoo-5923dcab.tar.bz2 gentoo-5923dcab.zip | |
media-sound/mumble: Fix build with Qt 5.15
Thanks-to: Marco Genasci <fedeliallalinea@gmail.com>
Closes: https://bugs.gentoo.org/726692
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch | 28 | ||||
| -rw-r--r-- | media-sound/mumble/mumble-1.3.1_rc1.ebuild | 2 |
2 files changed, 30 insertions, 0 deletions
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 new file mode 100644 index 000000000000..4268d56e8290 --- /dev/null +++ b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch @@ -0,0 +1,28 @@ +From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001 +From: Marco Genasci <fedeliallalinea@gmail.com> +Date: Mon, 1 Jun 2020 21:01:00 +0200 +Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath> + include for Qt 5.15 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’ + 42 | QPainterPath qpp; + | ^~~ +--- + src/mumble/OverlayText.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h +index f06f2b63a8..c1cd9efdd7 100644 +--- a/src/mumble/OverlayText.h ++++ b/src/mumble/OverlayText.h +@@ -6,6 +6,7 @@ + #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_ + #define MUMBLE_MUMBLE_OVERLAYTEXT_H_ + ++#include <QtGui/QPainterPath> + #include <QtGui/QPixmap> + #include <QtGui/QFont> + diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild index 69f5d7055e0d..f23f44786ac9 100644 --- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild +++ b/media-sound/mumble/mumble-1.3.1_rc1.ebuild @@ -64,6 +64,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692 + # NB: qmake does not support multilib but it's fine to configure # for the native ABI here src_configure() { |