[neon/qt/pyside2/Neon/release] debian: Add a patch to modify sendCommand signatures to use 0 as default value.

Dmitry Shachnev null at kde.org
Thu Jul 25 03:06:04 BST 2024


Git commit 46111b30f4b4f01bed7b55dc7cc9a800809b2cb4 by Dmitry Shachnev.
Committed on 04/02/2024 at 13:55.
Pushed by carlosdem into branch 'Neon/release'.

Add a patch to modify sendCommand signatures to use 0 as default value.

M  +1    -0    debian/changelog
A  +41   -0    debian/patches/Modify-sendCommand-signatures.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/pyside2/-/commit/46111b30f4b4f01bed7b55dc7cc9a800809b2cb4

diff --git a/debian/changelog b/debian/changelog
index 0bd0fa16..049a319c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pyside2 (5.15.12-5) UNRELEASED; urgency=medium
 
   * Backport 9 upstream patches for LLVM 16 support.
+  * Modify sendCommand signatures to use 0 as default value.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 03 Feb 2024 20:39:50 +0300
 
diff --git a/debian/patches/Modify-sendCommand-signatures.patch b/debian/patches/Modify-sendCommand-signatures.patch
new file mode 100644
index 00000000..7465b109
--- /dev/null
+++ b/debian/patches/Modify-sendCommand-signatures.patch
@@ -0,0 +1,41 @@
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Sun, 4 Feb 2024 00:29:00 +0300
+Subject: Modify sendCommand signatures to use 0 as default value
+
+The original default value was QNodeCommand::CommandId(), and shiboken
+copies it verbatim from the header file, however it does not work because
+we do not generate "using namespace Qt3DCore;".
+
+0 is the same as QNodeCommand::CommandId().
+---
+ sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
+index 8696a12..310595f 100644
+--- a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
++++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
+@@ -58,6 +58,11 @@
+         <object-type name="QAspectJob"/>
+         <object-type name="QBackendNode">
+             <enum-type name="Mode"/>
++            <modify-function signature="sendCommand(const QString&,const QVariant&,unsigned long long)">
++              <modify-argument index="3">
++                <replace-default-expression with="0"/>
++              </modify-argument>
++            </modify-function>
+         </object-type>
+         <!-- TODO: Solve issues related to windows and a unresolved
+             external symbol
+@@ -82,6 +87,11 @@
+         </object-type>
+         <object-type name="QNode">
+             <enum-type name="PropertyTrackingMode"/>
++            <modify-function signature="sendCommand(const QString&,const QVariant&,unsigned long long)">
++              <modify-argument index="3">
++                <replace-default-expression with="0"/>
++              </modify-argument>
++            </modify-function>
+         </object-type>
+         <object-type name="QNodeCommand" since="5.10"/>
+         <object-type name="QNodeCreatedChangeBase"/>
diff --git a/debian/patches/series b/debian/patches/series
index 77b6838a..8f6e3f18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ shiboken2-clang-Fix-build-with-clang-16.patch
 shiboken2-clang-Record-scope-resolution-of-arguments-func.patch
 shiboken2-clang-Suppress-class-scope-look-up-for-paramete.patch
 shiboken2-clang-Write-scope-resolution-for-all-parameters.patch
+Modify-sendCommand-signatures.patch



More information about the Neon-commits mailing list