[neon/backports-focal/mlt/Neon/release-lts] debian/patches: add include patch from upstream

Jonathan Riddell null at kde.org
Mon Oct 26 14:08:01 GMT 2020


Git commit 1cab921874a22d22ead285bf14c74f806626de2e by Jonathan Riddell.
Committed on 26/10/2020 at 14:07.
Pushed by jriddell into branch 'Neon/release-lts'.

add include patch from upstream

A  +45   -0    debian/patches/github_qt_include.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/backports-focal/mlt/commit/1cab921874a22d22ead285bf14c74f806626de2e

diff --git a/debian/patches/github_qt_include.diff b/debian/patches/github_qt_include.diff
new file mode 100644
index 0000000..e4e226a
--- /dev/null
+++ b/debian/patches/github_qt_include.diff
@@ -0,0 +1,45 @@
+commit f58b44d73442986eeffec7431e59b7d19d214c1b
+Author: Heiko Becker <heirecka at exherbo.org>
+Date:   Tue Mar 24 21:17:05 2020 +0100
+
+    Fix build with Qt 5.15.0
+    
+    QPainterPath is no longer included via qtransform.h (since
+    5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp
+index c3de1fad..c3e10f1a 100644
+--- a/src/modules/qt/filter_qtext.cpp
++++ b/src/modules/qt/filter_qtext.cpp
+@@ -21,6 +21,7 @@
+ #include <framework/mlt.h>
+ #include <framework/mlt_log.h>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QString>
+ 
+ static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale )
+diff --git a/src/modules/qt/graph.cpp b/src/modules/qt/graph.cpp
+index 6d4d669c..7e91bb12 100644
+--- a/src/modules/qt/graph.cpp
++++ b/src/modules/qt/graph.cpp
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include "graph.h"
++#include <QPainterPath>
+ #include <QVector>
+ #include <math.h>
+ 
+diff --git a/src/modules/qt/producer_qtext.cpp b/src/modules/qt/producer_qtext.cpp
+index 603c2b78..ff95a8e2 100644
+--- a/src/modules/qt/producer_qtext.cpp
++++ b/src/modules/qt/producer_qtext.cpp
+@@ -26,6 +26,7 @@
+ #include <QImage>
+ #include <QColor>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFont>
+ #include <QString>
+ #include <QTextCodec>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5812aec
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+github_qt_include.diff


More information about the Neon-commits mailing list