[neon/backports-jammy/qcustomplot/Neon/release] debian/patches: drop upstreamed patch
Carlos De Maine
null at kde.org
Tue Aug 22 04:37:21 BST 2023
Git commit b2b8ad4008e880ea1857e9b4926103a1ec49e37f by Carlos De Maine.
Committed on 22/08/2023 at 05:37.
Pushed by carlosdem into branch 'Neon/release'.
drop upstreamed patch
D +0 -81 debian/patches/02_fix_header_build.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/backports-jammy/qcustomplot/-/commit/b2b8ad4008e880ea1857e9b4926103a1ec49e37f
diff --git a/debian/patches/02_fix_header_build.patch b/debian/patches/02_fix_header_build.patch
deleted file mode 100644
index 526225a..0000000
--- a/debian/patches/02_fix_header_build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-This patch fixes the build with Qt6. Works also for Qt5.
---- a/qcustomplot.h
-+++ b/qcustomplot.h
-@@ -153,29 +153,11 @@
- /*!
- The QCP Namespace contains general enums, QFlags and functions used throughout the QCustomPlot
- library.
--
-+
- It provides QMetaObject-based reflection of its enums and flags via \a QCP::staticMetaObject.
- */
--#ifndef Q_MOC_RUN
- namespace QCP {
--#else
--class QCP { // when in moc-run, make it look like a class, so we get Q_GADGET, Q_ENUMS/Q_FLAGS features in namespace
-- Q_GADGET
-- Q_ENUMS(ExportPen)
-- Q_ENUMS(ResolutionUnit)
-- Q_ENUMS(SignDomain)
-- Q_ENUMS(MarginSide)
-- Q_FLAGS(MarginSides)
-- Q_ENUMS(AntialiasedElement)
-- Q_FLAGS(AntialiasedElements)
-- Q_ENUMS(PlottingHint)
-- Q_FLAGS(PlottingHints)
-- Q_ENUMS(Interaction)
-- Q_FLAGS(Interactions)
-- Q_ENUMS(SelectionRectMode)
-- Q_ENUMS(SelectionType)
--public:
--#endif
-+ Q_NAMESPACE
-
- /*!
- Defines the different units in which the image resolution can be specified in the export
-@@ -318,6 +300,20 @@
- ,stMultipleDataRanges ///< Any combination of data points/ranges can be selected
- };
-
-+ Q_ENUM_NS(ExportPen)
-+ Q_ENUM_NS(ResolutionUnit)
-+ Q_ENUM_NS(SignDomain)
-+ Q_ENUM_NS(MarginSide)
-+ Q_FLAG_NS(MarginSides)
-+ Q_ENUM_NS(AntialiasedElement)
-+ Q_FLAG_NS(AntialiasedElements)
-+ Q_ENUM_NS(PlottingHint)
-+ Q_FLAG_NS(PlottingHints)
-+ Q_ENUM_NS(Interaction)
-+ Q_FLAG_NS(Interactions)
-+ Q_ENUM_NS(SelectionRectMode)
-+ Q_ENUM_NS(SelectionType)
-+
- /*! \internal
-
- Returns whether the specified \a value is considered an invalid data value for plottables (i.e.
-@@ -378,23 +374,12 @@
- return 0;
- }
-
--
--extern const QMetaObject staticMetaObject; // in moc-run we create a static meta object for QCP "fake" object. This line is the link to it via QCP::staticMetaObject in normal operation as namespace
--
- } // end of namespace QCP
- Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::AntialiasedElements)
- Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::PlottingHints)
- Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::MarginSides)
- Q_DECLARE_OPERATORS_FOR_FLAGS(QCP::Interactions)
--Q_DECLARE_METATYPE(QCP::ExportPen)
--Q_DECLARE_METATYPE(QCP::ResolutionUnit)
--Q_DECLARE_METATYPE(QCP::SignDomain)
--Q_DECLARE_METATYPE(QCP::MarginSide)
--Q_DECLARE_METATYPE(QCP::AntialiasedElement)
--Q_DECLARE_METATYPE(QCP::PlottingHint)
--Q_DECLARE_METATYPE(QCP::Interaction)
--Q_DECLARE_METATYPE(QCP::SelectionRectMode)
--Q_DECLARE_METATYPE(QCP::SelectionType)
-+//no need to use Q_DECLARE_METATYPE on enum since Q_ENUM_NS adds enum as metatype automatically
-
- /* end of 'src/global.h' */
-
diff --git a/debian/patches/series b/debian/patches/series
index 651d2ea..398a3cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_add_CMake_config_material.patch
-02_fix_header_build.patch
More information about the Neon-commits
mailing list