diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-11-21 11:17:32 +0200 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2020-11-21 12:54:25 +0200 |
commit | 5ab7eaa96d5f46c94e8e309b5de8ce119bc8b423 (patch) | |
tree | 47fb1ffee6d9c33e0a56e6d5d11c730f7e2ba5e3 /pkgs/applications/video/vlc | |
parent | 1b04eac101f24015fc787bf4341a885e0216f74e (diff) |
vlc: Use qt515 (add QPainterPath patch from OpenSUSE)
Diffstat (limited to 'pkgs/applications/video/vlc')
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch | 37 |
2 files changed, 43 insertions, 1 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 58df85332ea03..1c52a89e98d4c 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"; }; + patches = [ + # Couldn't find an upstream version of this patch + # https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1 + ./fix-missing-includes-with-qt-5.15.patch + ]; + # VLC uses a *ton* of libraries for various pieces of functionality, many of # which are not included here for no other reason that nobody has mentioned # needing them @@ -99,6 +105,5 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false; }; } diff --git a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch new file mode 100644 index 0000000000000..d980fd2f6da87 --- /dev/null +++ b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch @@ -0,0 +1,37 @@ +Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp ++++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp +@@ -25,6 +25,7 @@ + #include "qt.hpp" + + #include <QWidget> ++#include <QPainterPath> + + class TimeTooltip : public QWidget + { +Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp ++++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp +@@ -27,6 +27,7 @@ + #include "input_manager.hpp" /* THEMIM */ + + #include <QPainter> ++#include <QPainterPath> + #include <QRect> + #include <QStyleOptionViewItem> + #include <QFontMetrics> +Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp ++++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp +@@ -53,6 +53,7 @@ + #include <QListView> + #include <QListWidget> + #include <QPainter> ++#include <QPainterPath> + #include <QStyleOptionViewItem> + #include <QKeyEvent> + #include <QPushButton> + |