- fix building with latest cmake/ninja and qt 5.15

diff --git a/c11.patch b/c11.patch
new file mode 100644 (file)
index 0000000..dbadbed
--- /dev/null
+++ b/c11.patch
@@ -0,0 +1,16 @@
+--- kdenlive-19.04.0/src/lib/external/media_ctrl/CMakeLists.txt~       2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/lib/external/media_ctrl/CMakeLists.txt        2020-07-12 14:01:09.936884911 +0200
+@@ -7,4 +7,5 @@
+   add_library(media_ctrl STATIC
+     mediactrl.c
+   )
++  set_property(TARGET media_ctrl PROPERTY C_STANDARD 11)
+ endif()
+--- kdenlive-19.04.0/src/lib/external/kiss_fft/CMakeLists.txt~ 2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/lib/external/kiss_fft/CMakeLists.txt  2020-07-12 14:02:20.586846261 +0200
+@@ -9,4 +9,5 @@
+   kiss_fft.c
+   tools/kiss_fftr.c
+ )
++set_property(TARGET kiss_fft PROPERTY C_STANDARD 11)
+ target_link_libraries(kiss_fft Qt5::Core)

diff --git a/kdenlive.spec b/kdenlive.spec
index fabb8032bd3a34ce7877fd1a01ed1a1c600a3dc1..a02902fbf0c81c6d3f991690faec20970a3b6499 100644 (file)
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -10,6 +10,8 @@ License:      GPL
 Group:         X11/Applications/Multimedia
 Source0:       http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
 # Source0-md5: 1386b04b1aef5832ae21525aaf4fc8b7
+Patch0:                c11.patch
+Patch1:                qt-5.15.patch
 URL:           http://kdenlive.org/
 BuildRequires: Qt5Concurrent-devel
 BuildRequires: Qt5Core-devel
@@ -92,9 +94,11 @@ Obsługiwany jest zapis/odczyt pełnego projektu.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-mkdir build
+mkdir -p build
 cd build
 %cmake .. \
        -G Ninja \

diff --git a/qt-5.15.patch b/qt-5.15.patch
new file mode 100644 (file)
index 0000000..63b55da
--- /dev/null
+++ b/qt-5.15.patch
@@ -0,0 +1,75 @@
+--- kdenlive-19.04.0/src/definitions.h~        2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/definitions.h 2020-07-12 14:06:45.856724124 +0200
+@@ -252,10 +252,12 @@
+ 
+ // we provide hash function for qstring and QPersistentModelIndex
+ namespace std {
++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ template <> struct hash<QString>
+ {
+     std::size_t operator()(const QString &k) const { return qHash(k); }
+ };
++#endif
+ template <> struct hash<QPersistentModelIndex>
+ {
+     std::size_t operator()(const QPersistentModelIndex &k) const { return qHash(k); }
+--- kdenlive-19.04.0/src/assets/model/assetparametermodel.cpp~ 2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/assets/model/assetparametermodel.cpp  2020-07-12 14:09:14.477267939 +0200
+@@ -26,6 +26,7 @@
+ #include "klocalizedstring.h"
+ #include "profiles/profilemodel.hpp"
+ #include <QDebug>
++#include <QDir>
+ #include <QJsonArray>
+ #include <QJsonObject>
+ #include <QLocale>
+--- kdenlive-19.04.0/src/assets/view/widgets/curves/bezier/beziersplineeditor.cpp~     2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/assets/view/widgets/curves/bezier/beziersplineeditor.cpp      2020-07-12 14:10:44.997929204 +0200
+@@ -24,6 +24,7 @@
+ 
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ BezierSplineEditor::BezierSplineEditor(QWidget *parent)
+     : AbstractCurveWidget(parent)
+--- kdenlive-19.04.0/src/bin/abstractprojectitem.cpp~  2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/bin/abstractprojectitem.cpp   2020-07-12 14:11:11.618104727 +0200
+@@ -33,6 +33,7 @@
+ 
+ #include <QDomElement>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QVariant>
+ #include <utility>
+ AbstractProjectItem::AbstractProjectItem(PROJECTITEMTYPE type, QString id, const std::shared_ptr<ProjectItemModel> &model, bool isRoot)
+--- kdenlive-19.04.0/src/titler/gradientwidget.cpp~    2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/titler/gradientwidget.cpp     2020-07-12 14:11:31.398230030 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <QLinearGradient>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QtMath>
+ 
+--- kdenlive-19.04.0/src/doc/kdenlivedoc.h~    2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/doc/kdenlivedoc.h     2020-07-12 14:12:50.342023558 +0200
+@@ -25,6 +25,7 @@
+ #ifndef KDENLIVEDOC_H
+ #define KDENLIVEDOC_H
+ 
++#include <QAction>
+ #include <QDir>
+ #include <QList>
+ #include <QMap>
+--- kdenlive-19.04.0/src/monitor/glwidget.cpp~ 2019-04-15 13:02:03.000000000 +0200
++++ kdenlive-19.04.0/src/monitor/glwidget.cpp  2020-07-12 14:14:09.482427764 +0200
+@@ -25,6 +25,7 @@
+ #include <QApplication>
+ #include <QOpenGLFunctions_3_2_Core>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QQmlContext>
+ #include <QQuickItem>
+ #include <kdeclarative_version.h>