sync KDPySide2ModuleBuild.py and KDFixupShiboken2.py to upstream

cmake/KDAB/modules/KDFixupShiboken2.py

@@ -0,0 +1,36 @@
+#
+# SPDX-FileCopyrightText: 2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+# Author: Renato Araujo Oliveira Filho <renato.araujo@kdab.com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+"""
+Script to fix bugs in code generated by shiboken-generator vr2
+"""
+
+import sys
+import re
+
+
+def removeExtraNamespaceForDefaultEnumValue(filename):
+    """
+    Remove namespace from default flag value
+    this is a shiboken2 bug fixed on shiboken6
+    """
+    regex = re.compile(r"\s=\s[^\s]+::{}")
+    newContent = ""
+    with open(filename, encoding='utf-8') as f:
+        for line in f:
+            newContent += re.sub(regex, ' = {}', line)
+
+    with open(filename, "w", encoding='utf-8') as f:
+        f.write(newContent)
+
+
+# Usage: <script> <list-of-files>
+# It will fix the file inplace
+if __name__ == '__main__':
+    for fileToFix in sys.argv[1:]:
+        print("Fixup: {}".format(fileToFix))
+        removeExtraNamespaceForDefaultEnumValue(fileToFix)

cmake/KDAB/modules/KDPySide2ModuleBuild.cmake

@@ -5,6 +5,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# Save path to this cmake file (so it can be used later in the macros)
+set(THIS_CMAKE_LIST_DIR ${CMAKE_CURRENT_LIST_DIR})
+
 if(NOT ${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX)
     # cmake-lint: disable=C0103
     set(${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX
@@ -129,6 +132,7 @@ macro(
             $<TARGET_PROPERTY:Shiboken2::shiboken,LOCATION> ${GENERATOR_EXTRA_FLAGS} ${globalInclude}
             --include-paths=${shiboken_include_dirs} --typesystem-paths=${shiboken_typesystem_dirs}
             ${shiboken_framework_include_dirs_option} --output-directory=${CMAKE_CURRENT_BINARY_DIR} ${typesystemXML}
+        COMMAND ${Python3_EXECUTABLE} ${THIS_CMAKE_LIST_DIR}/KDFixupShiboken2.py ${outputSource}
         DEPENDS ${typesystemXML} ${dependsArg}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Running generator for ${libraryName} binding..."