CVS commit: pkgsrc/multimedia/olive-editor

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun 18 14:52:12 UTC 2020

Modified Files:
        pkgsrc/multimedia/olive-editor: Makefile distinfo
Added Files:
        pkgsrc/multimedia/olive-editor/patches:
            patch-effects_internal_texteffect.cpp
            patch-effects_internal_timecodeeffect.cpp patch-ui_graphview.cpp
            patch-ui_timelineheader.cpp patch-ui_timelinewidget.cpp

Log Message:
olive-editor: fix Qt 5.15 fallout


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/olive-editor/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/olive-editor/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-ui_graphview.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp \
    pkgsrc/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/olive-editor/Makefile
diff -u pkgsrc/multimedia/olive-editor/Makefile:1.7 pkgsrc/multimedia/olive-editor/Makefile:1.8
--- pkgsrc/multimedia/olive-editor/Makefile:1.7 Tue Jun  2 08:24:27 2020
+++ pkgsrc/multimedia/olive-editor/Makefile     Thu Jun 18 14:52:12 2020
@@ -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=${BUILDLI
 .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"

Index: pkgsrc/multimedia/olive-editor/distinfo
diff -u pkgsrc/multimedia/olive-editor/distinfo:1.1 pkgsrc/multimedia/olive-editor/distinfo:1.2
--- pkgsrc/multimedia/olive-editor/distinfo:1.1 Thu Sep 19 14:28:15 2019
+++ pkgsrc/multimedia/olive-editor/distinfo     Thu Jun 18 14:52:12 2020
@@ -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) = 72a
 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

Added files:

Index: pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp:1.1
--- /dev/null   Thu Jun 18 14:52:12 2020
+++ pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_texteffect.cpp        Thu Jun 18 14:52:12 2020
@@ -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>
Index: pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp:1.1
--- /dev/null   Thu Jun 18 14:52:12 2020
+++ pkgsrc/multimedia/olive-editor/patches/patch-effects_internal_timecodeeffect.cpp    Thu Jun 18 14:52:12 2020
@@ -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>
Index: pkgsrc/multimedia/olive-editor/patches/patch-ui_graphview.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-ui_graphview.cpp:1.1
--- /dev/null   Thu Jun 18 14:52:12 2020
+++ pkgsrc/multimedia/olive-editor/patches/patch-ui_graphview.cpp       Thu Jun 18 14:52:12 2020
@@ -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>
Index: pkgsrc/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp:1.1
--- /dev/null   Thu Jun 18 14:52:12 2020
+++ pkgsrc/multimedia/olive-editor/patches/patch-ui_timelineheader.cpp  Thu Jun 18 14:52:12 2020
@@ -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>
Index: pkgsrc/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp:1.1
--- /dev/null   Thu Jun 18 14:52:12 2020
+++ pkgsrc/multimedia/olive-editor/patches/patch-ui_timelinewidget.cpp  Thu Jun 18 14:52:12 2020
@@ -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>