media-video/vlc: Fix build with Qt 5.15

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

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 (file)
index 0000000..7bdc24d
--- /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 <QPainterPath>
+ #include <QWidget>
+ 
+ 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 <QListView>
+ #include <QListWidget>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOptionViewItem>
+ #include <QKeyEvent>
+ #include <QPushButton>
+--- 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 <QPainter>
++#include <QPainterPath>
+ #include <QRect>
+ #include <QStyleOptionViewItem>
+ #include <QFontMetrics>

diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index ff05a37e121ecc8017a3002c60966e65051be717..090c04ddbb201fc94567d59a7a0ea56a43172d79 100644 (file)
--- 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 46be52b9fc5b3388305f1155bccc6e41613f68eb..8af1fe6e259edb2b2f173073d636a0384e1720e1 100644 (file)
--- 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 )