[neon/extras/qtcurve/Neon/release] debian/patches: drop old patches

Carlos De Maine null at kde.org
Sat Feb 18 01:45:48 GMT 2023


Git commit 81fba21907c7605107465528104175abe8a21df4 by Carlos De Maine.
Committed on 18/02/2023 at 01:45.
Pushed by carlosdem into branch 'Neon/release'.

drop old patches

D  +0    -21   debian/patches/constexpr.diff
D  +0    -15   debian/patches/fix-build-with-gcc-9.patch
D  +0    -19   debian/patches/qt-5.15.diff

https://invent.kde.org/neon/extras/qtcurve/commit/81fba21907c7605107465528104175abe8a21df4

diff --git a/debian/patches/constexpr.diff b/debian/patches/constexpr.diff
deleted file mode 100644
index 9758d3a..0000000
--- a/debian/patches/constexpr.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-commit ee2228ea2f18ac5da9b434ee6089381df815aa94
-Author: Yichao Yu <yyc1992 at gmail.com>
-Date:   Wed Jun 5 09:03:40 2019 -0400
-
-    [utils/gtkprops] Remove unnecessary constexpr, this is not allowed in C++14
-    
-    BUG: 408286
-
-diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h
-index abc06752..e2482558 100644
---- a/lib/utils/gtkprops.h
-+++ b/lib/utils/gtkprops.h
-@@ -74,7 +74,7 @@ class GtkWidgetProps {
-         };
- #define DEF_WIDGET_SIG_CONN_PROPS(name)                                 \
-         struct _SigConn_##name##_ObjGetter {                            \
--            constexpr inline GObject*                                   \
-+            inline GObject*                                             \
-             operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const   \
-             {                                                           \
-                 return (GObject*)qtcContainerOf(p, Props, name)->m_w;   \
diff --git a/debian/patches/fix-build-with-gcc-9.patch b/debian/patches/fix-build-with-gcc-9.patch
deleted file mode 100644
index 5eccaf5..0000000
--- a/debian/patches/fix-build-with-gcc-9.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: remove unnecessary constexpr, this is not allowed in C++14
-Origin: upstream, https://cgit.kde.org/qtcurve.git/commit/?id=ee2228ea2f18ac5d
-Last-Update: 2019-07-08
-
---- a/lib/utils/gtkprops.h
-+++ b/lib/utils/gtkprops.h
-@@ -74,7 +74,7 @@ class GtkWidgetProps {
-         };
- #define DEF_WIDGET_SIG_CONN_PROPS(name)                                 \
-         struct _SigConn_##name##_ObjGetter {                            \
--            constexpr inline GObject*                                   \
-+            inline GObject*                                             \
-             operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const   \
-             {                                                           \
-                 return (GObject*)qtcContainerOf(p, Props, name)->m_w;   \
diff --git a/debian/patches/qt-5.15.diff b/debian/patches/qt-5.15.diff
deleted file mode 100644
index 994a3a4..0000000
--- a/debian/patches/qt-5.15.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 44e2a35ebb164dcab0bad1a9158b1219a3ff6504
-Author: Andreas Sturmlechner <asturm at gentoo.org>
-Date:   Sun May 31 23:33:30 2020 +0200
-
-    Fix build with Qt 5.15 (missing QPainterPath include)
-
-diff --git a/qt5/style/qtcurve.h b/qt5/style/qtcurve.h
-index 9a50db00..00072d4e 100644
---- a/qt5/style/qtcurve.h
-+++ b/qt5/style/qtcurve.h
-@@ -31,6 +31,8 @@
- #include <QCache>
- #include <QColor>
- #include <QFont>
-+#include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOption>
- #include <QtGlobal>
- #include <QCommonStyle>


More information about the Neon-commits mailing list