commit df58171fbab55d71f09207be95b5814bbcb8e1f6
Author: Jan Rękorajski <[email protected]>
Date: Tue Jun 2 09:17:31 2020 +0200
- rel 5, fix building with qt 5.15
qt-5.15.patch | 30 ++++++++++++++++++++++++++++++
vlc.spec | 4 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 75e5535..4ca9a8d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -70,7 +70,7 @@ Summary: VLC - a multimedia player and stream server
Summary(pl.UTF-8): VLC - odtwarzacz multimedialny oraz serwer strumieni
Name: vlc
Version: 3.0.10
-Release: 4
+Release: 5
License: GPL v2+
Group: X11/Applications/Multimedia
Source0:
http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
@@ -83,6 +83,7 @@ Patch4: no-cache.patch
Patch5: %{name}-fdk_aac.patch
Patch6: %{name}-extern.patch
Patch7: %{name}-vsxu.patch
+Patch8: qt-5.15.patch
URL: http://www.videolan.org/vlc/
# 1.0 for X11 or GLESv1, 1.1 for GLESv2
BuildRequires: EGL-devel >= %{?with_glesv2:1.1}%{!?with_glesv2:1.0}
@@ -422,6 +423,7 @@ Akcje klienta VLC dla Solid.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
%{__libtoolize}
diff --git a/qt-5.15.patch b/qt-5.15.patch
new file mode 100644
index 0000000..940823a
--- /dev/null
+++ b/qt-5.15.patch
@@ -0,0 +1,30 @@
+--- vlc-3.0.10/modules/gui/qt/dialogs/plugins.hpp~ 2017-11-24
16:29:17.000000000 +0100
++++ vlc-3.0.10/modules/gui/qt/dialogs/plugins.hpp 2020-06-02
09:11:52.586760706 +0200
+@@ -32,6 +32,7 @@
+
+ #include <QStringList>
+ #include <QTreeWidgetItem>
++#include <QPainterPath>
+ #include <QPushButton>
+ #include <QAbstractListModel>
+ #include <QSortFilterProxyModel>
+--- vlc-3.0.10/modules/gui/qt/components/playlist/views.hpp~ 2017-11-24
16:29:17.000000000 +0100
++++ vlc-3.0.10/modules/gui/qt/components/playlist/views.hpp 2020-06-02
09:13:07.692655049 +0200
+@@ -26,6 +26,7 @@
+
+ #include <QStyledItemDelegate>
+ #include <QListView>
++#include <QPainterPath>
+ #include <QTreeView>
+ #include <QAbstractItemView>
+ #include "util/pictureflow.hpp"
+--- vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp~ 2018-05-03
14:03:21.000000000 +0200
++++ vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp 2020-06-02
09:14:04.892066840 +0200
+@@ -24,6 +24,7 @@
+
+ #include "qt.hpp"
+
++#include <QPainterPath>
+ #include <QWidget>
+
+ class TimeTooltip : public QWidget
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vlc.git/commitdiff/df58171fbab55d71f09207be95b5814bbcb8e1f6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
