[neon/qt6/qt6-quick3d/Neon/release] debian/patches: refresh patch with quilt

[Carlos De Maine]

Git commit 8accea89f2ec8e618436f4b3834e20e1077eabeb by Carlos De Maine.
Committed on 29/03/2024 at 09:32.
Pushed by carlosdem into branch 'Neon/release'.

refresh patch with quilt

R  +16   -26   debian/patches/backport_unity_build_fix_qtquick3d-536528 [from: debian/patches/backport_inity_build_fix_qtquick3d-536528 - 070% similarity]
M  +1    -1    debian/patches/series

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

diff --git a/debian/patches/backport_inity_build_fix_qtquick3d-536528 b/debian/patches/backport_unity_build_fix_qtquick3d-536528
similarity index 70%
rename from debian/patches/backport_inity_build_fix_qtquick3d-536528
rename to debian/patches/backport_unity_build_fix_qtquick3d-536528
index 2174522..3d0e8e5 100644
--- a/debian/patches/backport_inity_build_fix_qtquick3d-536528
+++ b/debian/patches/backport_unity_build_fix_qtquick3d-536528
@@ -14,21 +14,17 @@ Change-Id: I3fcbff6a16b29e2105d094c33944021a1a1afe24
 Reviewed-by: Christian Strømme <christian.stromme at qt.io>
 ---
 
-diff --git a/src/quick3d/CMakeLists.txt b/src/quick3d/CMakeLists.txt
-index 085e24669..6345c442e 100644
 --- a/src/quick3d/CMakeLists.txt
 +++ b/src/quick3d/CMakeLists.txt
-@@ -63,8 +63,6 @@ qt_internal_add_module(Quick3D
+@@ -71,8 +71,6 @@
          qquick3dlightmapbaker.cpp qquick3dlightmapbaker_p.h
-         extensions/qquick3drenderextensions.cpp extensions/qquick3drenderextensions.h
-         extensions/qquick3dextensionhelpers.cpp extensions/qquick3dextensionhelpers.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)
-     SSG_HEADER_FILTERS
-         "(^|/)qquick3dextensionhelpers\\.h$"
      DEFINES
-diff --git a/src/quick3d/qquick3dcustommaterial.cpp b/src/quick3d/qquick3dcustommaterial.cpp
-index 7e7f6d69f..2964cc5d2 100644
+         QT_BUILD_QUICK3D_LIB
+     LIBRARIES
 --- a/src/quick3d/qquick3dcustommaterial.cpp
 +++ b/src/quick3d/qquick3dcustommaterial.cpp
 @@ -11,8 +11,6 @@
@@ -40,11 +36,9 @@ index 7e7f6d69f..2964cc5d2 100644
  QT_BEGIN_NAMESPACE
  
  /*!
-diff --git a/src/quick3d/qquick3dprincipledmaterial.cpp b/src/quick3d/qquick3dprincipledmaterial.cpp
-index 30cf7fda2..823cb9228 100644
 --- a/src/quick3d/qquick3dprincipledmaterial.cpp
 +++ b/src/quick3d/qquick3dprincipledmaterial.cpp
-@@ -712,8 +712,6 @@ QT_BEGIN_NAMESPACE
+@@ -712,8 +712,6 @@
      material. The default value is true.
  */
  
@@ -53,11 +47,9 @@ index 30cf7fda2..823cb9228 100644
  QQuick3DPrincipledMaterial::QQuick3DPrincipledMaterial(QQuick3DObject *parent)
      : QQuick3DMaterial(*(new QQuick3DObjectPrivate(QQuick3DObjectPrivate::Type::PrincipledMaterial)), parent)
  {}
-diff --git a/src/quick3d/qquick3dprincipledmaterial_p.h b/src/quick3d/qquick3dprincipledmaterial_p.h
-index 93c2760d3..b01e58a9b 100644
 --- a/src/quick3d/qquick3dprincipledmaterial_p.h
 +++ b/src/quick3d/qquick3dprincipledmaterial_p.h
-@@ -385,6 +385,8 @@ private:
+@@ -385,6 +385,8 @@
  
      quint32 m_dirtyAttributes = 0xffffffff; // all dirty by default
      void markDirty(DirtyType type);
@@ -66,22 +58,18 @@ index 93c2760d3..b01e58a9b 100644
  };
  
  QT_END_NAMESPACE
-diff --git a/src/quick3d/qquick3dshaderutils_p.h b/src/quick3d/qquick3dshaderutils_p.h
-index 8f9c92c86..abec6dfa9 100644
 --- a/src/quick3d/qquick3dshaderutils_p.h
 +++ b/src/quick3d/qquick3dshaderutils_p.h
-@@ -278,4 +278,6 @@ Q_SIGNALS:
+@@ -278,4 +278,6 @@
  
  QT_END_NAMESPACE
  
 +Q_DECLARE_OPAQUE_POINTER(QQuick3DShaderUtilsTextureInput)
 +
  #endif // QQUICK3DSHADERUTILS_H
-diff --git a/src/quick3d/qquick3dspecularglossymaterial.cpp b/src/quick3d/qquick3dspecularglossymaterial.cpp
-index b164c5812..bdd67ce00 100644
 --- a/src/quick3d/qquick3dspecularglossymaterial.cpp
 +++ b/src/quick3d/qquick3dspecularglossymaterial.cpp
-@@ -581,8 +581,6 @@ QT_BEGIN_NAMESPACE
+@@ -581,8 +581,6 @@
      material. The default value is true.
  */
  
@@ -90,16 +78,18 @@ index b164c5812..bdd67ce00 100644
  QQuick3DSpecularGlossyMaterial::QQuick3DSpecularGlossyMaterial(QQuick3DObject *parent)
      : QQuick3DMaterial(*(new QQuick3DObjectPrivate(QQuick3DObjectPrivate::Type::SpecularGlossyMaterial)), parent)
  {}
-diff --git a/src/quick3d/qquick3dspecularglossymaterial_p.h b/src/quick3d/qquick3dspecularglossymaterial_p.h
-index af3c9b25f..16e0d4957 100644
 --- a/src/quick3d/qquick3dspecularglossymaterial_p.h
 +++ b/src/quick3d/qquick3dspecularglossymaterial_p.h
-@@ -343,6 +343,8 @@ private:
- 
+@@ -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
\ No newline at end of file
+ QT_END_NAMESPACE
diff --git a/debian/patches/series b/debian/patches/series
index 7b4502c..6f07937 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-backport_inity_build_fix_qtquick3d-536528
\ No newline at end of file
+backport_unity_build_fix_qtquick3d-536528