[neon/qt6/qt6-quick3d/Neon/release] debian/patches: patch gone

[Jonathan Riddell]

Git commit c5570b381de679fd0358b63f97a47a87c3502cd4 by Jonathan Riddell.
Committed on 03/04/2024 at 17:10.
Pushed by jriddell into branch 'Neon/release'.

patch gone

D  +0    -95   debian/patches/backport_unity_build_fix_qtquick3d-536528
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-quick3d/-/commit/c5570b381de679fd0358b63f97a47a87c3502cd4

diff --git a/debian/patches/backport_unity_build_fix_qtquick3d-536528 b/debian/patches/backport_unity_build_fix_qtquick3d-536528
deleted file mode 100644
index 3d0e8e5..0000000
--- a/debian/patches/backport_unity_build_fix_qtquick3d-536528
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Tim Blechmann <tim at klingt.org>
-Date: Thu, 1 Feb 2024 12:29:31 +0000 (+0800)
-Subject: fix unity builds
-X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtquick3d.git;a=commitdiff_plain;h=918e778e2a3c96d2591e666e1f94473fc857fe01;hp=68e3a3a3a90e6bc4c3993081c0a4d74b5c75d51c
-
-fix unity builds
-
-* `Q_DECLARE_OPAQUE_POINTER` in header to avoid 'specialisation after
-instantiation'
-* prevent name clash of `ensureNormalized`
-
-Pick-to: 6.7
-Change-Id: I3fcbff6a16b29e2105d094c33944021a1a1afe24
-Reviewed-by: Christian Strømme <christian.stromme at qt.io>
----
-
---- a/src/quick3d/CMakeLists.txt
-+++ b/src/quick3d/CMakeLists.txt
-@@ -71,8 +71,6 @@
-         qquick3dlightmapbaker.cpp qquick3dlightmapbaker_p.h
-         extensions/qquick3drenderextensions.cpp extensions/qquick3drenderextensions_p.h
-         extensions/qquick3dextensionhelpers.cpp extensions/qquick3dextensionhelpers_p.h
--    NO_UNITY_BUILD_SOURCES
--        qquick3dspecularglossymaterial.cpp # redefinition of 'ensureNormalized' (from qquick3dprincipledmaterial.cpp)
-     DEFINES
-         QT_BUILD_QUICK3D_LIB
-     LIBRARIES
---- a/src/quick3d/qquick3dcustommaterial.cpp
-+++ b/src/quick3d/qquick3dcustommaterial.cpp
-@@ -11,8 +11,6 @@
- #include "qquick3dviewport_p.h"
- #include "qquick3dscenemanager_p.h"
- 
--Q_DECLARE_OPAQUE_POINTER(QQuick3DShaderUtilsTextureInput)
--
- QT_BEGIN_NAMESPACE
- 
- /*!
---- a/src/quick3d/qquick3dprincipledmaterial.cpp
-+++ b/src/quick3d/qquick3dprincipledmaterial.cpp
-@@ -712,8 +712,6 @@
-     material. The default value is true.
- */
- 
--inline static float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
--
- QQuick3DPrincipledMaterial::QQuick3DPrincipledMaterial(QQuick3DObject *parent)
-     : QQuick3DMaterial(*(new QQuick3DObjectPrivate(QQuick3DObjectPrivate::Type::PrincipledMaterial)), parent)
- {}
---- a/src/quick3d/qquick3dprincipledmaterial_p.h
-+++ b/src/quick3d/qquick3dprincipledmaterial_p.h
-@@ -385,6 +385,8 @@
- 
-     quint32 m_dirtyAttributes = 0xffffffff; // all dirty by default
-     void markDirty(DirtyType type);
-+
-+    static constexpr float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
- };
- 
- QT_END_NAMESPACE
---- a/src/quick3d/qquick3dshaderutils_p.h
-+++ b/src/quick3d/qquick3dshaderutils_p.h
-@@ -278,4 +278,6 @@
- 
- QT_END_NAMESPACE
- 
-+Q_DECLARE_OPAQUE_POINTER(QQuick3DShaderUtilsTextureInput)
-+
- #endif // QQUICK3DSHADERUTILS_H
---- a/src/quick3d/qquick3dspecularglossymaterial.cpp
-+++ b/src/quick3d/qquick3dspecularglossymaterial.cpp
-@@ -581,8 +581,6 @@
-     material. The default value is true.
- */
- 
--inline static float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
--
- QQuick3DSpecularGlossyMaterial::QQuick3DSpecularGlossyMaterial(QQuick3DObject *parent)
-     : QQuick3DMaterial(*(new QQuick3DObjectPrivate(QQuick3DObjectPrivate::Type::SpecularGlossyMaterial)), parent)
- {}
---- a/src/quick3d/qquick3dspecularglossymaterial_p.h
-+++ b/src/quick3d/qquick3dspecularglossymaterial_p.h
-@@ -340,9 +340,11 @@
-     float m_attenuationDistance = std::numeric_limits<float>::infinity();
-     QColor m_attenuationColor = Qt::white;
-     bool m_vertexColorsEnabled = true;
--
-+    private:
-     quint32 m_dirtyAttributes = 0xffffffff; // all dirty by default
-     void markDirty(DirtyType type);
-+
-+    static constexpr float ensureNormalized(float val) { return qBound(0.0f, val, 1.0f); }
- };
- 
- QT_END_NAMESPACE
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6f07937..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-backport_unity_build_fix_qtquick3d-536528