[olive] Rebuilt for new ffmpeg snapshot Add olive-0.1.2-qt5.15.patch

commit 8edf6ff3aa22fb7a83f61544ec2f4d04c27d0030 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Fri Jan 1 13:46:02 2021 +0100 Rebuilt for new ffmpeg snapshot Add olive-0.1.2-qt5.15.patch olive-0.1.2-qt5.15.patch | 40 ++++++++++++++++++++++++++++++++++++++++ olive.spec | 12 +++++++----- 2 files changed, 47 insertions(+), 5 deletions(-) --- diff --git a/olive-0.1.2-qt5.15.patch b/olive-0.1.2-qt5.15.patch new file mode 100644 index 0000000..0ba64f6 --- /dev/null +++ b/olive-0.1.2-qt5.15.patch @@ -0,0 +1,40 @@ +--- olive-0.1.2/effects/internal/texteffect.cpp.orig 2021-01-01 12:02:53.808228887 +0100 ++++ olive-0.1.2/effects/internal/texteffect.cpp 2021-01-01 12:03:29.551168827 +0100 +@@ -25,6 +25,7 @@ + #include <QOpenGLTexture> + #include <QTextEdit> + #include <QPainter> ++#include <QPainterPath> + #include <QPushButton> + #include <QColorDialog> + #include <QFontDatabase> +--- olive-0.1.2/effects/internal/timecodeeffect.cpp.orig 2021-01-01 13:18:03.597706937 +0100 ++++ olive-0.1.2/effects/internal/timecodeeffect.cpp 2021-01-01 13:18:38.725643649 +0100 +@@ -25,6 +25,7 @@ + #include <QOpenGLTexture> + #include <QTextEdit> + #include <QPainter> ++#include <QPainterPath> + #include <QPushButton> + #include <QColorDialog> + #include <QFontDatabase> +--- olive-0.1.2/ui/graphview.cpp.orig 2021-01-01 13:26:15.729814018 +0100 ++++ olive-0.1.2/ui/graphview.cpp 2021-01-01 13:27:10.035713140 +0100 +@@ -21,6 +21,7 @@ + #include "graphview.h" + + #include <QPainter> ++#include <QPainterPath> + #include <QMouseEvent> + #include <QtMath> + #include <cfloat> +--- olive-0.1.2/ui/timelineheader.cpp.orig 2021-01-01 13:35:17.228804660 +0100 ++++ olive-0.1.2/ui/timelineheader.cpp 2021-01-01 13:36:05.999712798 +0100 +@@ -21,6 +21,7 @@ + #include "timelineheader.h" + + #include <QPainter> ++#include <QPainterPath> + #include <QMouseEvent> + #include <QScrollBar> + #include <QtMath> diff --git a/olive.spec b/olive.spec index be0b354..715c3ce 100644 --- a/olive.spec +++ b/olive.spec @@ -1,10 +1,10 @@ #For git snapshots, set to 0 to use release instead: %global usesnapshot 0 %if 0%{?usesnapshot} -# https://github.com/olive-editor/olive/commit/7975ef11abb3cd35f226c4e4e9e7... -%global commit0 7975ef11abb3cd35f226c4e4e9e7aaf1a49fcd65 +# https://github.com/olive-editor/olive/commit/19eabf283062ed0d046b8ce8dee8... +%global commit0 19eabf283062ed0d046b8ce8dee8a14af7c6de31 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global gitdate 20191111 +%global gitdate 20201230 %endif %global unique_name org.olivevideoeditor.Olive %global appl_name application-vnd.olive-project @@ -14,7 +14,7 @@ Name: olive Version: 0.1.2 %if 0%{?usesnapshot} -Release: 0.9.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} %else Release: 5%{?dist} %endif @@ -26,6 +26,7 @@ Source0: https://github.com/olive-editor/%{name}/archive/%{commit0}/%{nam %else Source0: https://github.com/olive-editor/%{name}/archive/%{version}.tar.gz#/%{name... %endif +Patch0: %{name}-%{version}-qt5.15.patch BuildRequires: cmake3 BuildRequires: frei0r-devel @@ -63,7 +64,7 @@ A Feature list is a the moment not available. %if 0%{?usesnapshot} %autosetup -n %{name}-%{commit0} %else -%autosetup -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %endif # Override the pathetic ffmpeg test @@ -100,6 +101,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{unique_name %changelog * Fri Jan 1 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 0.1.2-5 - Rebuilt for new ffmpeg snapshot +- Add olive-0.1.2-qt5.15.patch * Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild