olive-editor: fix Qt 5.15 fallout

7 files changed, 81 insertions, 5 deletions

diff --git a/multimedia/olive-editor/Makefile b/multimedia/olive-editor/Makefile
index 8bc123e980c..d90015cc96e 100644
--- a/multimedia/olive-editor/Makefile
+++ b/multimedia/olive-editor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2020/06/02 08:24:27 adam Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/18 14:52:12 nia Exp $
 
 DISTNAME=	olive-editor-0.1.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=olive-editor/}
 GITHUB_PROJECT=	olive
@@ -11,10 +11,12 @@ HOMEPAGE=	https://olivevideoeditor.org/
 COMMENT=	Non-linear video editor
 LICENSE=	gnu-gpl-v3
 
+TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
+
 WRKSRC=		${WRKDIR}/olive-${PKGVERSION_NOREV}
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++11
+USE_LANGUAGES=	c c++
 
 # C++11
 GCC_REQD+=	4.7
@@ -30,5 +32,4 @@ CMAKE_ARGS+=	-DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg4
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/olive-editor/distinfo b/multimedia/olive-editor/distinfo
index 2e9b7b5013b..3aa4c8ff735 100644
--- a/multimedia/olive-editor/distinfo
+++ b/multimedia/olive-editor/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/09/19 14:28:15 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/06/18 14:52:12 nia Exp $
 
 SHA1 (olive-editor-0.1.1.tar.gz) = 0a20262158ce5c94a6301537e486e1bcda2385d8
 RMD160 (olive-editor-0.1.1.tar.gz) = 7e68543a4642bad659960dc6a6d73f9e54f8bb58
@@ -6,3 +6,8 @@ SHA512 (olive-editor-0.1.1.tar.gz) = 72aefc03956b3a64d4fb69d15f9a5c88429e8988dac
 Size (olive-editor-0.1.1.tar.gz) = 2237511 bytes
 SHA1 (patch-CMakeLists.txt) = c38f07520052a40dd235768f4ccb7d34885a121a
 SHA1 (patch-cmake_FindFFMPEG.cmake) = 2f2aef426f7a3e93e66ff500840dcadec5e499e3
+SHA1 (patch-effects_internal_texteffect.cpp) = 0bc1d2b67980ca3168c6e355cdd9740f44c9bc74
+SHA1 (patch-effects_internal_timecodeeffect.cpp) = fbd5ff65f8019f7b863d3ea4dc9f3fc2c184d317
+SHA1 (patch-ui_graphview.cpp) = aeaaeda9cf43117dcb18a00e130fe007cd060771
+SHA1 (patch-ui_timelineheader.cpp) = b0e188363d0d08e2edb9973320378c1efd0a2edf
+SHA1 (patch-ui_timelinewidget.cpp) = 9c86fa424437a06f0db2e1a719f9bf074630250e
diff --git a/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp b/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp
new file mode 100644
index 00000000000..84d7f4d8444
--- /dev/null
+++ b/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-effects_internal_texteffect.cpp,v 1.1 2020/06/18 14:52:12 nia Exp $
+
+Fix Qt 5.15 build issues
+
+--- effects/internal/texteffect.cpp.orig	2019-07-09 15:16:17.000000000 +0000
++++ effects/internal/texteffect.cpp
+@@ -25,6 +25,7 @@
+ #include <QOpenGLTexture>
+ #include <QTextEdit>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPushButton>
+ #include <QColorDialog>
+ #include <QFontDatabase>
diff --git a/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp b/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp
new file mode 100644
index 00000000000..b35df7a30a6
--- /dev/null
+++ b/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-effects_internal_timecodeeffect.cpp,v 1.1 2020/06/18 14:52:12 nia Exp $
+
+Fix Qt 5.15 build issues
+
+--- effects/internal/timecodeeffect.cpp.orig	2019-07-09 15:16:17.000000000 +0000
++++ effects/internal/timecodeeffect.cpp
+@@ -25,6 +25,7 @@
+ #include <QOpenGLTexture>
+ #include <QTextEdit>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPushButton>
+ #include <QColorDialog>
+ #include <QFontDatabase>
diff --git a/multimedia/olive-editor/patches/patch-ui_graphview.cpp b/multimedia/olive-editor/patches/patch-ui_graphview.cpp
new file mode 100644
index 00000000000..a9f4f67a424
--- /dev/null
+++ b/multimedia/olive-editor/patches/patch-ui_graphview.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui_graphview.cpp,v 1.1 2020/06/18 14:52:12 nia Exp $
+
+Fix Qt 5.15 build issues
+
+--- ui/graphview.cpp.orig	2019-07-09 15:16:17.000000000 +0000
++++ ui/graphview.cpp
+@@ -21,6 +21,7 @@
+ #include "graphview.h"

+ 

+ #include <QPainter>

++#include <QPainterPath>

+ #include <QMouseEvent>

+ #include <QtMath>

+ #include <cfloat>

diff --git a/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp b/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp
new file mode 100644
index 00000000000..57f90cd57f2
--- /dev/null
+++ b/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui_timelineheader.cpp,v 1.1 2020/06/18 14:52:12 nia Exp $
+
+Fix Qt 5.15 build issues
+
+--- ui/timelineheader.cpp.orig	2019-07-09 15:16:17.000000000 +0000
++++ ui/timelineheader.cpp
+@@ -21,6 +21,7 @@
+ #include "timelineheader.h"

+ 

+ #include <QPainter>

++#include <QPainterPath>

+ #include <QMouseEvent>

+ #include <QScrollBar>

+ #include <QtMath>

diff --git a/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp b/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp
new file mode 100644
index 00000000000..52bfca4fac6
--- /dev/null
+++ b/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui_timelinewidget.cpp,v 1.1 2020/06/18 14:52:12 nia Exp $
+
+Fix Qt 5.15 build issues
+
+--- ui/timelinewidget.cpp.orig	2019-07-09 15:16:17.000000000 +0000
++++ ui/timelinewidget.cpp
+@@ -21,6 +21,7 @@
+ #include "timelinewidget.h"

+ 

+ #include <QPainter>

++#include <QPainterPath>

+ #include <QColor>

+ #include <QMouseEvent>

+ #include <QObject>