gentoo resync : 25.04.2020

4 files changed, 35 insertions, 2 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index da55fdbb5787..f366239203f5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,9 +2,10 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
+AUX vlc-3.0.8-qt-5.15.patch 1003 BLAKE2B 44a64b0448a235ce1dcf7100d084c85f9ffe6cdebf6cf0b5561e915a2ab6fbf348c152ff6e3c9beb1f073157a8ce8b15f3317a29c5410d3131462aac8d7c1ea4 SHA512 ff61fdc64e2bf4bc19536e76d7b824b0f77d8aa7a1fe61578f57b400ccda1bb51a5f5d97486c42ca6760b137ada68faedc73697dc39005babc839428fafee731
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13037 BLAKE2B e67ffdddb924f32f470c461eb2ab5295eca4878180531143e682a8b78668baff0fadfcfead1693c67967615a1992dac0160df45451eda77bc211f67e4cddcab3 SHA512 8e64e22dcf18e89db4180e9d2788865066a6702bfa3c7869d4b5744e5b95beb86ed33f8338fc0d86d2d9e5ac4fac80e2460a7f8f971fb383931e77e479417759
-EBUILD vlc-3.0.9999.ebuild 13079 BLAKE2B 4b990f9c567af87aaa69fe2c6fe3cfa3a17045524be5aad425973a01c168fadf3d56db1c81af2ebef59166174aa8f443e79ae2a2874da0dd2e7c8a7f9c1c8b0d SHA512 4eab0d636646f1a78b1d9cbfca7b4a6899561216cdaf732da5741caf88bfdf32f6ef63a8c0a13b25c723f782d979ab30572c5cefc398c8558040cc7b8ba68c3a
+EBUILD vlc-3.0.8.ebuild 13071 BLAKE2B 3a9d9a25f13a2bee1fbde33f96d58869e15dfe45d45395586e5ded8bd516361165bf72c22ec89bdd8655b8c159652ee5f10adfe3339532c7705183cdcfb7a202 SHA512 8a4fb45dcf660a18a3f77da1bcaef72b91360ce53dc8c5cab0b43975aac65681613bfd3035a86e6d8a00c3991794782ba465572cad3519e751e8f576a555215b
+EBUILD vlc-3.0.9999.ebuild 13137 BLAKE2B 1935bc3011f01d26b825562d5544709190428240f44c0881339087cfd94e26202e8423875be20ac5cbe6f743f54d79f0c18a747b111fc0e6168183ab3495cf87 SHA512 c58cd0be92ddd9e8c43d54afd7daa806d25f8cd7b05999b95322f9daaedabfa26b8fe152bd3ad9df40fd2bbf69dbc86c0009102507b7a61ece06da1138b0bd50
 EBUILD vlc-9999.ebuild 13018 BLAKE2B c2f1ac10246d77bd6a0b71bfa243dd1fa63fa9ba7d02c9862fb4868f9e2941002e733eea19d7eceb9514b0121101e59bfda3cf817e3345a60155810bb465c8cb SHA512 5df5798ddf32b894c230f51f311f02baf38a2f28e1dbdac5cc2ede39a05776374e9c99b8313068fc8ca92a65d881bd17da08530fb5c5d39a146881ccc187de1c
 MISC metadata.xml 4839 BLAKE2B 287526d901bb5868a0cf1a8212a3afeb61d32a9d8ee87352a569fdfaf159ce09448ee4d5b759c06f380e04a6fe241e3ab28637fcbcb9cf25ec9d163d54adf1a1 SHA512 9898bff1e5a183f722010348d8f47ea9a02a8067bdea7ed61347091e212bb3bb94fd6f76fe093eecfe0b95d061cd88e6be9e00d4ee38b6362f460fb5bd5b455d
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 )