[neon/extras/gammaray/Neon/release-lts] debian/patches: drop patches which I guess are backports
Harald Sitter
null at kde.org
Fri Sep 25 13:00:40 BST 2020
Git commit 8638980e59764284fe2dda02b312800163839600 by Harald Sitter.
Committed on 25/09/2020 at 12:00.
Pushed by sitter into branch 'Neon/release-lts'.
drop patches which I guess are backports
there's no comments so who knows
D +0 -18 debian/patches/qt-515-2.diff
D +0 -23 debian/patches/qt-515.diff
M +0 -2 debian/patches/series
https://invent.kde.org/neon/extras/gammaray/commit/8638980e59764284fe2dda02b312800163839600
diff --git a/debian/patches/qt-515-2.diff b/debian/patches/qt-515-2.diff
deleted file mode 100644
index 1902864..0000000
--- a/debian/patches/qt-515-2.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-commit ec9fe40808e094b3ee6283256ae18f1a3bb95bb7
-Author: Volker Krause <volker.krause at kdab.com>
-Date: Wed Mar 18 09:07:11 2020 +0100
-
- Fix build with Qt 5.15
-
-diff --git a/plugins/widgetinspector/overlaywidget.h b/plugins/widgetinspector/overlaywidget.h
-index 5e0bb135..ca102a9e 100644
---- a/plugins/widgetinspector/overlaywidget.h
-+++ b/plugins/widgetinspector/overlaywidget.h
-@@ -30,6 +30,7 @@
- #define GAMMARAY_WIDGETINSPECTOR_OVERLAYWIDGET_H
-
- #include <QLayout>
-+#include <QPainterPath>
- #include <QPointer>
- #include <QWidget>
-
diff --git a/debian/patches/qt-515.diff b/debian/patches/qt-515.diff
deleted file mode 100644
index 69b3601..0000000
--- a/debian/patches/qt-515.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 7cd17bca4fb8369b5e1c5822ac1c79574766d3e7
-Author: Eike Ziller <eike.ziller at qt.io>
-Date: Wed May 6 10:34:01 2020 +0200
-
- Fix build against Qt 5.15
-
- After qtbase/487dd80bce9c6006f349ccb09222e1c308200f0a which adds
- a meta type declaration
-
-diff --git a/plugins/network/networksupport.cpp b/plugins/network/networksupport.cpp
-index 32191d0c..97db5422 100644
---- a/plugins/network/networksupport.cpp
-+++ b/plugins/network/networksupport.cpp
-@@ -89,7 +89,9 @@ Q_DECLARE_METATYPE(QNetworkInterface::InterfaceFlags)
- #endif
- Q_DECLARE_METATYPE(QNetworkProxy::Capabilities)
- Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- Q_DECLARE_METATYPE(QSocketNotifier::Type)
-+#endif
- #ifndef QT_NO_SSL
- Q_DECLARE_METATYPE(QSsl::KeyAlgorithm)
- Q_DECLARE_METATYPE(QSsl::KeyType)
diff --git a/debian/patches/series b/debian/patches/series
index 976ebd1..b6020e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
debian-archs-fix-build.patch
qt-system-paths.patch
-qt-515.diff
-qt-515-2.diff
More information about the Neon-commits
mailing list