[neon/backports-focal/mlt/Neon/unstable] debian/patches: remove patch now included
Jonathan Riddell
null at kde.org
Mon Nov 23 12:12:17 GMT 2020
Git commit ae4fb8a56e404ee443f2633d1930c2b1f7219cd0 by Jonathan Riddell.
Committed on 23/11/2020 at 12:12.
Pushed by jriddell into branch 'Neon/unstable'.
remove patch now included
D +0 -45 debian/patches/github_qt_include.diff
D +0 -1 debian/patches/series
https://invent.kde.org/neon/backports-focal/mlt/commit/ae4fb8a56e404ee443f2633d1930c2b1f7219cd0
diff --git a/debian/patches/github_qt_include.diff b/debian/patches/github_qt_include.diff
deleted file mode 100644
index e4e226a..0000000
--- a/debian/patches/github_qt_include.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 5812aec..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-github_qt_include.diff
More information about the Neon-commits
mailing list