diff options
| author | Erin van der Veen <erin@erinvanderveen.nl> | 2022-12-28 21:00:14 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-29 21:35:07 +0000 |
| commit | 9a4534b40507b2332c17abcf72d1d1a285f0579e (patch) | |
| tree | 723a1eadf7eabb8f4d85c665e6f25193deec5b97 | |
| parent | Merge pull request #208191 from NixOS/backport-207983-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-208150-to-release-22.11.tar.gz | |
olive-editor: resolve missing QPainterPath issueorigin/backport-208150-to-release-22.11
An update to the QT dependencies made is so that additional includes on
QPainterPath were required.
(cherry picked from commit 94b9bb2bc69576a54861d7a2871d786f93e2ad1e)
| -rw-r--r-- | pkgs/applications/video/olive-editor/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/olive-editor/q-painter-path.patch | 48 |
2 files changed, 52 insertions, 0 deletions
diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index c9e1c8343c29..c3306e5250fb 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "151g6jwhipgbq4llwib92sq23p1s9hm6avr7j4qq3bvykzrm8z1a"; }; + patches = [ + ./q-painter-path.patch + ]; + nativeBuildInputs = [ pkg-config which diff --git a/pkgs/applications/video/olive-editor/q-painter-path.patch b/pkgs/applications/video/olive-editor/q-painter-path.patch new file mode 100644 index 000000000000..232f157e7cdd --- /dev/null +++ b/pkgs/applications/video/olive-editor/q-painter-path.patch @@ -0,0 +1,48 @@ +diff --git a/effects/internal/texteffect.cpp b/effects/internal/texteffect.cpp +index 279f406d9..7fe9e8e72 100644 +--- a/effects/internal/texteffect.cpp ++++ b/effects/internal/texteffect.cpp +@@ -20,6 +20,7 @@ + + #include "texteffect.h" + ++#include <QPainterPath> + #include <QGridLayout> + #include <QLabel> + #include <QOpenGLTexture> +diff --git a/effects/internal/timecodeeffect.cpp b/effects/internal/timecodeeffect.cpp +index 4de3e3497..fd0fa6224 100644 +--- a/effects/internal/timecodeeffect.cpp ++++ b/effects/internal/timecodeeffect.cpp +@@ -20,6 +20,7 @@ + + #include "timecodeeffect.h" + ++#include <QPainterPath> + #include <QGridLayout> + #include <QLabel> + #include <QOpenGLTexture> +diff --git a/ui/graphview.cpp b/ui/graphview.cpp +index 3e13075cd..c441133a8 100644 +--- a/ui/graphview.cpp ++++ b/ui/graphview.cpp +@@ -20,6 +20,7 @@ +
+ #include "graphview.h"
+
++#include <QPainterPath>
+ #include <QPainter>
+ #include <QMouseEvent>
+ #include <QtMath>
+diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp +index f39065b4f..aa7fd638d 100644 +--- a/ui/timelineheader.cpp ++++ b/ui/timelineheader.cpp +@@ -20,6 +20,7 @@ +
+ #include "timelineheader.h"
+
++#include <QPainterPath>
+ #include <QPainter>
+ #include <QMouseEvent>
+ #include <QScrollBar>
|