From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB9D11382C5 for ; Tue, 2 Jun 2020 21:52:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB5B7E0830; Tue, 2 Jun 2020 21:52:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1039E0830 for ; Tue, 2 Jun 2020 21:52:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C889134EF8A for ; Tue, 2 Jun 2020 21:52:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80CDE23B for ; Tue, 2 Jun 2020 21:52:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1591134709.5923dcabd01b0fbf953faa4173d593f84ebf91b0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/, media-sound/mumble/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch media-sound/mumble/mumble-1.3.1_rc1.ebuild X-VCS-Directories: media-sound/mumble/files/ media-sound/mumble/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5923dcabd01b0fbf953faa4173d593f84ebf91b0 X-VCS-Branch: master Date: Tue, 2 Jun 2020 21:52:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e63fb2d0-2f88-4c80-bbc6-12f81ceee955 X-Archives-Hash: 4ccad54ddf99c671ded8c0d3132291bb commit: 5923dcabd01b0fbf953faa4173d593f84ebf91b0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 2 21:03:53 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 2 21:51:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5923dcab media-sound/mumble: Fix build with Qt 5.15 Thanks-to: Marco Genasci gmail.com> Closes: https://bugs.gentoo.org/726692 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../mumble/files/mumble-1.3.1_rc1-qt-5.15.patch | 28 ++++++++++++++++++++++ media-sound/mumble/mumble-1.3.1_rc1.ebuild | 2 ++ 2 files changed, 30 insertions(+) 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 00000000000..4268d56e829 --- /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 +Date: Mon, 1 Jun 2020 21:01:00 +0200 +Subject: [PATCH] src/mumble/OverlayText.h: add missing + 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 + #include + #include + diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild index 69f5d7055e0..f23f44786ac 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() {