summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-21 10:31:42 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-21 11:22:15 +0200
commitf9ed1719f97b18dc04892cc08b5d0324c152a150 (patch)
treef3cab415b2d8c35453a9777c0151fcd203061007 /media-video/vlc
parentmedia-libs/mlt: Fix build with Qt 5.15 (diff)
downloadgentoo-f9ed1719f97b18dc04892cc08b5d0324c152a150.tar.gz
gentoo-f9ed1719f97b18dc04892cc08b5d0324c152a150.tar.bz2
gentoo-f9ed1719f97b18dc04892cc08b5d0324c152a150.zip
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>
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/files/vlc-3.0.8-qt-5.15.patch30
-rw-r--r--media-video/vlc/vlc-3.0.8.ebuild1
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild1
3 files changed, 32 insertions, 0 deletions
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 000000000000..7bdc24de4afc
--- /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 ff05a37e121e..090c04ddbb20 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 46be52b9fc5b..8af1fe6e259e 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 )