]> git.pld-linux.org Git - packages/vlc.git/commitdiff
- rel 5, fix building with qt 5.15 auto/th/vlc-3.0.10-5
authorJan Rękorajski <baggins@pld-linux.org>
Tue, 2 Jun 2020 07:17:31 +0000 (09:17 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Tue, 2 Jun 2020 07:17:31 +0000 (09:17 +0200)
qt-5.15.patch [new file with mode: 0644]
vlc.spec

diff --git a/qt-5.15.patch b/qt-5.15.patch
new file mode 100644 (file)
index 0000000..940823a
--- /dev/null
@@ -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
index 75e5535e80c6667b2a7a321e34c022481c00dbe5..4ca9a8d5cb23d58ed95835c7034785bfc3a861d1 100644 (file)
--- 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}
This page took 0.201015 seconds and 4 git commands to generate.