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 813DA138351 for ; Tue, 21 Apr 2020 09:22:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 237FDE08EF; Tue, 21 Apr 2020 09:22:43 +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 EA024E08EF for ; Tue, 21 Apr 2020 09:22:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 85CFE34F11A for ; Tue, 21 Apr 2020 09:22:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEC2D1E8 for ; Tue, 21 Apr 2020 09:22:39 +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: <1587460935.f9ed1719f97b18dc04892cc08b5d0324c152a150.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/files/vlc-3.0.8-qt-5.15.patch media-video/vlc/vlc-3.0.8.ebuild media-video/vlc/vlc-3.0.9999.ebuild X-VCS-Directories: media-video/vlc/ media-video/vlc/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f9ed1719f97b18dc04892cc08b5d0324c152a150 X-VCS-Branch: master Date: Tue, 21 Apr 2020 09:22:39 +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: 6edf62e0-492f-4cec-b3db-2b35c717ad4f X-Archives-Hash: 5a1b634bb53171f605673d04596914d5 commit: f9ed1719f97b18dc04892cc08b5d0324c152a150 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 21 08:31:42 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 21 09:22:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ed1719 media-video/vlc: Fix build with Qt 5.15 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/vlc/files/vlc-3.0.8-qt-5.15.patch | 30 +++++++++++++++++++++++++++ media-video/vlc/vlc-3.0.8.ebuild | 1 + media-video/vlc/vlc-3.0.9999.ebuild | 1 + 3 files changed, 32 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch new file mode 100644 index 00000000000..7bdc24de4af --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch @@ -0,0 +1,30 @@ +--- a/modules/gui/qt/util/timetooltip.hpp 2018-05-03 14:03:21.000000000 +0200 ++++ b/modules/gui/qt/util/timetooltip.hpp 2020-04-21 00:57:48.570508113 +0200 +@@ -24,6 +24,7 @@ + + #include "qt.hpp" + ++#include + #include + + class TimeTooltip : public QWidget +--- a/modules/gui/qt/dialogs/plugins.cpp 2017-11-24 16:29:17.000000000 +0100 ++++ b/modules/gui/qt/dialogs/plugins.cpp 2020-04-21 01:10:14.916737405 +0200 +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/modules/gui/qt/components/playlist/views.cpp 2017-11-24 16:29:17.000000000 +0100 ++++ b/modules/gui/qt/components/playlist/views.cpp 2020-04-21 01:12:28.002665729 +0200 +@@ -27,6 +27,7 @@ + #include "input_manager.hpp" /* THEMIM */ + + #include ++#include + #include + #include + #include diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild index ff05a37e121..090c04ddbb2 100644 --- a/media-video/vlc/vlc-3.0.8.ebuild +++ b/media-video/vlc/vlc-3.0.8.ebuild @@ -231,6 +231,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${P}-qt-5.15.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 46be52b9fc5..8af1fe6e259 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -232,6 +232,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )