Explorar o código

3P Build Script Update for Pyside2 5.15.2.1 (#124)

- Updates to pyside2 for version 5.15.2.1 with python 3.10
- Update linux host file with new version
- Update Linux build package dependencies
- Fixes to build pyside2 with python 3.10 against local files (not system shiboken/pyside)
- Fix packaging structure
- Add additional patch for pyside-tools
- Fix to archive_downloader to support 3.7 (backwards compatbility)
- Fix path for 'ly_pip_install_local_package_editable'
- Fix location of where to copy setup.py and __init__.py
- Fix setup.py to handle windows and non-windows situations to look for README.md
- Update Find*.cmake to include the pyside bin tools
- Updated Linux to support shiboken2 tools as a dependency on Linux
- Remove deprecated pyside2-qt in favor od pyside2
- Update python 3.x messaging and variable name
- Update python package dependencies for Linux and bump the rev number
- Add LICENSE.TXT from the libclang library that was downloaded and used for the shiboken tools

Signed-off-by: Steve Pham <[email protected]>
Steve Pham %!s(int64=3) %!d(string=hai) anos
pai
achega
45b66527c8

+ 3 - 2
Scripts/extras/archive_downloader.py

@@ -86,7 +86,8 @@ def download_and_verify(src_url: str, src_zip_hash:str, src_zip_hash_algorithm:s
         return str(tgt_filename)
 
     print(f"{INDENT}Downloading {src_url}")
-    tgt_filename.unlink(missing_ok=True)
+    if tgt_filename.exists():
+        tgt_filename.unlink()
 
     urllib.request.urlretrieve(src_url, tgt_filename)
 
@@ -94,7 +95,7 @@ def download_and_verify(src_url: str, src_zip_hash:str, src_zip_hash_algorithm:s
     downloaded_hash = hash_file(file_path=str(tgt_filename),
                                 hash_algorithm=src_zip_hash_algorithm)
     if src_zip_hash and src_zip_hash != downloaded_hash:
-        raise RuntimeError(f"Hash {src_zip_hash_algorithm} verification failed for {tgt_filename}")
+        raise RuntimeError(f"Hash {src_zip_hash_algorithm} verification failed for {tgt_filename} (downloaded hash: {downloaded_hash}")
 
     print(f"{INDENT}Package hash : ({src_zip_hash_algorithm}) {downloaded_hash}")
 

+ 0 - 30
package-system/pyside2-qt/Findpyside2.cmake.Linux

@@ -1,30 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-     
-set(MY_NAME "pyside2")
-set(TARGET_WITH_NAMESPACE "3rdParty::${MY_NAME}")
-if (TARGET ${TARGET_WITH_NAMESPACE})
-    return()
-endif()
-
-add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
-
-set(PYSIDE_BASE_PATH ${CMAKE_CURRENT_LIST_DIR}/pyside2)
-
-ly_pip_install_local_package_editable(${PYSIDE_BASE_PATH} pyside2)
-
-set(${MY_NAME}_RUNTIME_DEPENDENCIES
-    ${PYSIDE_BASE_PATH}/PySide2/libpyside2.abi3.so.5.14
-    ${PYSIDE_BASE_PATH}/PySide2/libpyside2.abi3.so.5.14.2.3
-    ${PYSIDE_BASE_PATH}/shiboken2/shiboken2.abi3.so
-    ${PYSIDE_BASE_PATH}/shiboken2/libshiboken2.abi3.so.5.14
-    ${PYSIDE_BASE_PATH}/shiboken2/libshiboken2.abi3.so.5.14.2.3
-)
-ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES})
-
-set(${MY_NAME}_FOUND True)
-

+ 0 - 28
package-system/pyside2-qt/build_config.json

@@ -1,28 +0,0 @@
-{
-    "git_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
-    "git_tag": "v5.14.2.3",
-    "package_name": "pyside2",
-    "package_version": "5.15.2-rev2",
-    "package_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
-    "package_license": "custom",
-    "package_license_file": "pyside2/LICENSE.LGPLv3",
-    "patch_file": "pyside_o3de-v5.14.2.3.patch",
-    "cmake_find_target": "Findpyside2.cmake",
-    "Platforms": {
-        "Linux": {
-            "Linux": {
-                "depends_on_packages" :[ 
-                    ["python-3.7.10-rev2-linux", "6b9cf455e6190ec38836194f4454bb9db6bfc6890b4baff185cc5520aa822f05", ""],
-                    ["qt-5.15.2-rev6-linux", "a37bd9989f1e8fe57d94b98cbf9bd5c3caaea740e2f314e5162fa77300551531", ""]
-                ],
-                "cmake_find_source": "Findpyside2.cmake.Linux",
-                "custom_build_cmd": [
-                    "./build_linux.sh"
-                ],
-                "custom_install_cmd": [
-                    "./package_linux.sh"
-                ]
-            }
-        }
-    }
-}

+ 0 - 53
package-system/pyside2-qt/build_linux.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-
-# Get the python executable from the package dependency
-LOCAL_PYTHON37_BIN=$TEMP_FOLDER/python-3.7.10-rev2-linux/python/bin/python3
-
-SCRIPT_PATH=`dirname $0`
-
-
-if [ ! -f "$LOCAL_PYTHON37_BIN" ]
-then
-    echo "Missing 3P dependency of python3.7 $LOCAL_PYTHON37_BIN"
-    echo "You will need to build the 3P version of python under the '`readlink -f ../python`'' folder"
-    echo "with the following command:"
-    echo
-    echo "python3 build_package_image.py"
-    echo
-    exit 1
-fi
-
-# Get the qt package's qmake location
-LOCAL_3P_QTBUILD_PATH=$TEMP_FOLDER/qt-5.15.2-rev6-linux/qt
-LOCAL_3P_QTBUILD_QMAKE_PATH=`readlink -f $LOCAL_3P_QTBUILD_PATH/bin/qmake`
-LOCAL_3P_QTBUILD_LIB_PATH=`readlink -f $LOCAL_3P_QTBUILD_PATH/lib`
-if [ ! -f "$LOCAL_3P_QTBUILD_QMAKE_PATH" ]
-then
-    echo "Missing 3P dependency of Qt $LOCAL_3P_QTBUILD_PATH"
-    echo
-    exit 1
-fi
-
-
-# TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script
-echo Building source
-pushd $TEMP_FOLDER/src
-
-LD_LIBRARY_PATH=$LOCAL_3P_QTBUILD_LIB_PATH/
-export LD_LIBRARY_PATH
-
-echo "$LOCAL_PYTHON37_BIN setup.py install --qmake=$LOCAL_3P_QTBUILD_QMAKE_PATH --build-type=all --limited-api=yes --skip-modules=Qml,Quick,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer"
-$LOCAL_PYTHON37_BIN setup.py install --qmake=$LOCAL_3P_QTBUILD_QMAKE_PATH --build-type=all --limited-api=yes --skip-modules=Qml,Quick,QuickWidgets,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer
-
-popd
-
-exit 0

+ 0 - 42
package-system/pyside2-qt/package_linux.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-# TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script
-
-PACKAGE_BASE=$TARGET_INSTALL_ROOT
-
-INSTALL_SOURCE=$TEMP_FOLDER/src/pyside3a_install/`ls $TEMP_FOLDER/src/pyside3a_install`
-echo INSTALL_SOURCE=$INSTALL_SOURCE
-
-# Copy the LICENSE and README files
-cp $TEMP_FOLDER/src/LICENSE.* $PACKAGE_BASE/
-cp $TEMP_FOLDER/src/README.* $PACKAGE_BASE/
-
-# Copy the Pyside2 package, and create major version sylmink
-cp -r $INSTALL_SOURCE/lib/python3.7/site-packages/PySide2 $PACKAGE_BASE
-cp $INSTALL_SOURCE/lib/libpyside2.abi3.so.5.14.2.3 $PACKAGE_BASE/PySide2/
-ln -s libpyside2.abi3.so.5.14.2.3 $PACKAGE_BASE/PySide2/libpyside2.abi3.so.5.14
-
-# Copy the shiboken2 package, and create major version sylmink
-cp -r $INSTALL_SOURCE/lib/python3.7/site-packages/shiboken2 $PACKAGE_BASE
-cp $INSTALL_SOURCE/lib/libshiboken2.abi3.so.5.14.2.3 $PACKAGE_BASE/shiboken2/
-ln -s libshiboken2.abi3.so.5.14.2.3 $PACKAGE_BASE/shiboken2/libshiboken2.abi3.so.5.14
-
-# Patch the Pyside2 shared library to resolve shiboken2
-$TEMP_FOLDER/src/patchelf --set-rpath ../shiboken2:\$ORIGIN $PACKAGE_BASE/PySide2/libpyside2.abi3.so.5.14.2.3
-
-# Patch the shiboken2.abi.so module to resolve the libshiboken at ORIGIN
-$TEMP_FOLDER/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/shiboken2/shiboken2.abi3.so
-
-# Add additional files needed for pip install
-cp $TEMP_FOLDER/../__init__.py $PACKAGE_BASE/
-cp $TEMP_FOLDER/../setup.py $PACKAGE_BASE/
-
-exit 0

+ 59 - 0
package-system/pyside2/Findpyside2.cmake.Linux

@@ -0,0 +1,59 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+     
+set(MY_NAME "pyside2")
+set(TARGET_WITH_NAMESPACE "3rdParty::${MY_NAME}")
+if (TARGET ${TARGET_WITH_NAMESPACE})
+    return()
+endif()
+
+add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
+
+set(PYSIDE_BASE_PATH ${CMAKE_CURRENT_LIST_DIR}/pyside2)
+
+ly_pip_install_local_package_editable(${PYSIDE_BASE_PATH}/lib/python3.10/site-packages pyside2)
+
+set(${MY_NAME}_RUNTIME_DEPENDENCIES
+    ${PYSIDE_BASE_PATH}/lib/libpyside2.abi3.so.5.15.2.1
+    ${PYSIDE_BASE_PATH}/lib/libpyside2.abi3.so.5.15
+    ${PYSIDE_BASE_PATH}/lib/libpyside2.abi3.so
+    ${PYSIDE_BASE_PATH}/lib/libshiboken2.abi3.so.5.15.2.1
+    ${PYSIDE_BASE_PATH}/lib/libshiboken2.abi3.so.5.15
+    ${PYSIDE_BASE_PATH}/lib/libshiboken2.abi3.so
+)
+ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES})
+
+# In addition to the libraries, create a Pyside2::Tools library that handles the shiboken and pyside2-lupdate executables that are part o
+# of the pyside2 package
+set(${MY_NAME}_BIN_DIR ${CMAKE_CURRENT_LIST_DIR}/pyside2/bin)
+
+set(${MY_NAME}_TOOLS_BINARIES
+    ${${MY_NAME}_BIN_DIR}/pyside2-lupdate${CMAKE_EXECUTABLE_SUFFIX}
+    ${${MY_NAME}_BIN_DIR}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}
+)
+
+set(${MY_NAME}_TOOLS_PYTHON_SCRIPTS
+    ${${MY_NAME}_BIN_DIR}/pyside_tool.py
+    ${${MY_NAME}_BIN_DIR}/shiboken_tool.py
+)
+
+set(${MY_NAME}_TOOLS_DEPENDENCIES
+    ${${MY_NAME}_BIN_DIR}/libclang.so.13
+)
+
+add_library(${MY_NAME}::Tools INTERFACE IMPORTED GLOBAL)
+
+ly_add_target_files(TARGETS ${MY_NAME}::Tools FILES
+    ${${MY_NAME}_TOOLS_BINARIES}
+    ${${MY_NAME}_TOOLS_DEPENDENCIES}
+    ${${MY_NAME}_TOOLS_PYTHON_SCRIPTS}
+)
+
+add_library(${TARGET_WITH_NAMESPACE}::Tools ALIAS ${MY_NAME}::Tools)
+
+set(${MY_NAME}_FOUND True)
+

+ 47 - 0
package-system/pyside2/Findpyside2.cmake.Windows

@@ -0,0 +1,47 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+     
+set(MY_NAME "pyside2")
+set(TARGET_WITH_NAMESPACE "3rdParty::${MY_NAME}")
+if (TARGET ${TARGET_WITH_NAMESPACE})
+    return()
+endif()
+
+# Install the pyside2 site-packages into Python
+add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
+
+ly_pip_install_local_package_editable(${CMAKE_CURRENT_LIST_DIR}/pyside2/lib/site-packages pyside2)
+
+# In addition to the libraries, create a Pyside2::Tools library that handles the shiboken and pyside2-lupdate executables that are part o
+# of the pyside2 package
+set(${MY_NAME}_BIN_DIR ${CMAKE_CURRENT_LIST_DIR}/pyside2/bin)
+
+set(${MY_NAME}_TOOLS_BINARIES
+    ${${MY_NAME}_BIN_DIR}/pyside2-lupdate${CMAKE_EXECUTABLE_SUFFIX}
+    ${${MY_NAME}_BIN_DIR}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}
+)
+
+set(${MY_NAME}_TOOLS_PYTHON_SCRIPTS
+    ${${MY_NAME}_BIN_DIR}/pyside_tool.py
+    ${${MY_NAME}_BIN_DIR}/shiboken_tool.py
+)
+
+set(${MY_NAME}_TOOLS_DEPENDENCIES
+    ${${MY_NAME}_BIN_DIR}/libclang.dll
+)
+
+add_library(${MY_NAME}::Tools INTERFACE IMPORTED GLOBAL)
+
+ly_add_target_files(TARGETS ${MY_NAME}::Tools FILES
+    ${${MY_NAME}_TOOLS_BINARIES}
+    ${${MY_NAME}_TOOLS_DEPENDENCIES}
+    ${${MY_NAME}_TOOLS_PYTHON_SCRIPTS}
+)
+
+add_library(${TARGET_WITH_NAMESPACE}::Tools ALIAS ${MY_NAME}::Tools)
+
+set(${MY_NAME}_FOUND True)

+ 1341 - 0
package-system/pyside2/LICENSES.txt

@@ -0,0 +1,1341 @@
+ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
+ Contact: http://www.qt.io/licensing/
+
+ You may use, distribute and copy the Qt Toolkit under the terms of
+ GNU Lesser General Public License version 3, which is displayed below.
+ This license makes reference to the version 3 of the GNU General
+ Public License, which you can find in the LICENSE.GPLv3 file.
+
+-------------------------------------------------------------------------
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+This is the GNU General Public License version 3, annotated with The
+Qt Company GPL Exception 1.0:
+
+-------------------------------------------------------------------------
+
+The Qt Company GPL Exception 1.0
+
+Exception 1:
+
+As a special exception you may create a larger work which contains the
+output of this application and distribute that work under terms of your
+choice, so long as the work is not otherwise derived from or based on
+this application and so long as the work does not in itself generate
+output that contains the output from this application in its original
+or modified form.
+
+Exception 2:
+
+As a special exception, you have permission to combine this application
+with Plugins licensed under the terms of your choice, to produce an
+executable, and to copy and distribute the resulting executable under
+the terms of your choice. However, the executable must be accompanied
+by a prominent notice offering all users of the executable the entire
+source code to this application, excluding the source code of the
+independent modules, but including any changes you have made to this
+application, under the terms of this license.
+
+
+-------------------------------------------------------------------------
+
+
+                GNU Free Documentation License
+                 Version 1.3, 3 November 2008
+
+
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+     <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject.  (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
+
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.  If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+11. RELICENSING
+
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works.  A
+public wiki that anybody can edit is an example of such a server.  A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 
+license published by Creative Commons Corporation, a not-for-profit 
+corporation with a principal place of business in San Francisco, 
+California, as well as future copyleft versions of that license 
+published by that same organization.
+
+"Incorporate" means to publish or republish a Document, in whole or in 
+part, as part of another Document.
+
+An MMC is "eligible for relicensing" if it is licensed under this 
+License, and if all works that were first published under this License 
+somewhere other than this MMC, and subsequently incorporated in whole or 
+in part into the MMC, (1) had no cover texts or invariant sections, and 
+(2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.3
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+                    
+
+ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
+ Contact: http://www.qt.io/licensing/
+
+ You may use, distribute and copy the Qt Toolkit under the terms of
+ GNU Lesser General Public License version 3. That license references
+ the General Public License version 3, that is displayed below. Other
+ portions of the Qt Toolkit may be licensed directly under this license.

+ 5 - 0
package-system/pyside2/README.md

@@ -0,0 +1,5 @@
+
+Python 3.10 support
+
+
+- _Py_Mangle is no longer exposed for use with PySide2 . 

+ 0 - 0
package-system/pyside2-qt/__init__.py → package-system/pyside2/__init__.py


+ 49 - 0
package-system/pyside2/build_config.json

@@ -0,0 +1,49 @@
+{
+    "git_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
+    "git_tag": "v5.15.2.1",
+    "package_name": "pyside2",
+    "package_version": "5.15.2.1-py3.10-rev3",
+    "package_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
+    "package_license": "custom",
+    "package_license_file": "pyside2/LICENSE.LGPLv3",
+    "cmake_find_target": "Findpyside2.cmake",
+    "patch_file": "pyside2-5.15.2.1.patch",
+    "Platforms": {
+        "Windows": {
+            "Windows": {
+                "depends_on_packages" :[ 
+                    ["python-3.10.5-rev1-windows", "c012e7c8fd20e632446d2cd689a9472e4e4495da7534d484d0f1c63840222cbb", ""],
+                    ["qt-5.15.2-rev7-windows", "4343a04130657e740795e50a25ab5fe6e41100fa3c58a212c86bed612dde7775", ""]
+                ],
+                "additional_download_packages":[ 
+                    ["https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-windows-vs2019_64.7z", "1c7eb369d74ea5ea0580d71ca2b89d16a241294fd6cfc80eae572c646aad850e", "sha256"]
+                ],
+                "cmake_find_source": "Findpyside2.cmake.Windows",
+                "custom_build_cmd": [
+                    "build_windows.bat"
+                ],
+                "custom_install_cmd": [
+                    "package_windows.bat"
+                ]
+            }
+        },
+        "Linux": {
+            "Linux": {
+                "depends_on_packages" :[ 
+                    ["python-3.10.5-rev2-linux", "eda1fdc9129fb70df2d63bd21d0876c83c4f7021864f22c85850f4a8ff8cf1bf", ""],
+                    ["qt-5.15.2-rev6-linux", "a37bd9989f1e8fe57d94b98cbf9bd5c3caaea740e2f314e5162fa77300551531", ""]
+                ],
+                "additional_download_packages":[ 
+                    ["https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z", "414f923b39515ef562ff8217e57b02889deabf02ca7350c8612e4a5aa93503e8", "sha256"]
+                ],
+                "cmake_find_source": "Findpyside2.cmake.Linux",
+                "custom_build_cmd": [
+                    "./build_linux.sh"
+                ],
+                "custom_install_cmd": [
+                    "./package_linux.sh"
+                ]
+            }
+        }
+    }
+}

+ 75 - 0
package-system/pyside2/build_linux.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+
+# Get the python executable from the package dependency
+LOCAL_PYTHON3_BIN=$TEMP_FOLDER/python-3.10.5-rev2-linux/python/bin/python3
+
+SCRIPT_PATH=`dirname $0`
+
+
+if [ ! -f "$LOCAL_PYTHON3_BIN" ]
+then
+    echo "Missing 3P dependency of python-3.10.5 $LOCAL_PYTHON3_BIN"
+    echo "You will need to build the 3P version of python under the '`readlink -f ../python`'' folder"
+    echo "with the following command:"
+    echo
+    echo "python3 build_package_image.py"
+    echo
+    exit 1
+fi
+
+# Set the dependent clang compiler for the build script to use
+LLVM_INSTALL_DIR=$TEMP_FOLDER/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64/libclang
+PATH=$LLVM_INSTALL_DIR/bin:$PATH
+
+# Get the qt package's qmake location
+LOCAL_3P_QTBUILD_PATH=$TEMP_FOLDER/qt-5.15.2-rev6-linux/qt
+LOCAL_3P_QTBUILD_QMAKE_PATH=`readlink -f $LOCAL_3P_QTBUILD_PATH/bin/qmake`
+LOCAL_3P_QTBUILD_LIB_PATH=`readlink -f $LOCAL_3P_QTBUILD_PATH/lib`
+if [ ! -f "$LOCAL_3P_QTBUILD_QMAKE_PATH" ]
+then
+    echo "Missing 3P dependency of Qt $LOCAL_3P_QTBUILD_PATH"
+    echo
+    exit 1
+fi
+
+# An additional patch needs to be applied since pyside-tools in the pyside2 repo is a ref 
+pushd $TEMP_FOLDER/src/sources/pyside2-tools
+PYSIDE_TOOLS_PATCH_FILE=$TEMP_FOLDER/../pyside2-tools.patch
+echo Applying patch $PYSIDE_TOOLS_PATCH_FILE to pyside-tools 
+git apply --ignore-whitespace $PYSIDE_TOOLS_PATCH_FILE
+if [ $? -eq 0 ]; then
+    echo "Patch applied"
+else
+    echo "Git apply failed"
+    popd
+    exit $retVal
+fi
+popd
+
+
+echo Building source
+pushd $TEMP_FOLDER/src
+
+LD_LIBRARY_PATH=$LOCAL_3P_QTBUILD_LIB_PATH/
+export LD_LIBRARY_PATH
+
+# Build shiboken2 library first since it is 
+echo "$LOCAL_PYTHON3_BIN setup.py install --qmake=$LOCAL_3P_QTBUILD_QMAKE_PATH --build-type=shiboken2 --limited-api=yes --skip-modules=Qml,Quick,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer"
+$LOCAL_PYTHON3_BIN setup.py install --qmake=$LOCAL_3P_QTBUILD_QMAKE_PATH --build-type=shiboken2 --limited-api=yes --skip-modules=Qml,Quick,QuickWidgets,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer
+
+
+echo "$LOCAL_PYTHON3_BIN setup.py install --qmake=$LOCAL_3P_QTBUILD_QMAKE_PATH --build-type=pyside2 --no-examples --skip-docs --standalone --limited-api=yes --skip-modules=Qml,Quick,QtQuickControls2,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer" --shiboken-config-dir=$TEMP_FOLDER/src/pyside3a_install/py3.10-qt5.15.1-64bit-release/lib/cmake/Shiboken2-5.15.2.1
+$LOCAL_PYTHON3_BIN setup.py install --qmake=$LOCAL_3P_QTBUILD_QMAKE_PATH --build-type=pyside2 --no-examples --skip-docs --standalone  --limited-api=yes --skip-modules=Qml,Quick,QuickWidgets,QtQuickControls2,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer --shiboken-config-dir=$TEMP_FOLDER/src/pyside3a_install/py3.10-qt5.15.1-64bit-release/lib/cmake/Shiboken2-5.15.2.1
+
+popd
+
+exit 0

+ 102 - 0
package-system/pyside2/build_windows.bat

@@ -0,0 +1,102 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM 
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
+
+REM https://doc.qt.io/qtforpython/gettingstarted-windows.html
+
+echo.
+echo TEMP_FOLDER=%TEMP_FOLDER%
+echo.
+
+SET CURRENT_PATH=%CD%
+
+REM Set these before running the script
+if not defined VCVARS_PATH set VCVARS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
+
+REM TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script
+set CHECKS_FAILED=0
+for %%P IN (VCVARS_PATH,TEMP_FOLDER,TARGET_INSTALL_ROOT) do (
+    if not exist !%%P! (
+        echo %%P not found at !%%P!
+        set CHECKS_FAILED=1
+    )
+)
+
+echo Setting up VS2019
+call %VCVARS_PATH% amd64
+
+
+REM Get the python executable from the package dependency
+
+SET LOCAL_PYTHON37_BIN=%TEMP_FOLDER%\\python-3.10.5-rev1-windows\python\python.exe
+IF EXIST %LOCAL_PYTHON37_BIN% (
+    echo Using Python located at %LOCAL_PYTHON37_BIN%
+) ELSE (
+    echo ERROR: Unable to find Python at %LOCAL_PYTHON37_BIN%
+    exit /b 1
+)
+
+
+SET LOCAL_3P_QTBUILD_PATH=%TEMP_FOLDER%\qt-5.15.2-rev7-windows\qt
+IF EXIST %LOCAL_3P_QTBUILD_PATH% (
+    echo Using Qt located at %LOCAL_3P_QTBUILD_PATH%
+) ELSE (
+    echo ERROR: Unable to find Qt at %LOCAL_3P_QTBUILD_PATH%
+    exit /b 1
+)
+SET LOCAL_3P_QTBUILD_QMAKE_PATH=%LOCAL_3P_QTBUILD_PATH%\bin\qmake.exe
+SET LOCAL_3P_QTBUILD_LIB_PATH=%LOCAL_3P_QTBUILD_PATH%\lib
+
+SET LLVM_INSTALL_DIR=%TEMP_FOLDER%\libclang-release_130-based-windows-vs2019_64\libclang
+SET PATH=%LLVM_INSTALL_DIR%\bin;%PATH%
+
+echo Created Python Virtual ENV
+
+cd temp
+%LOCAL_PYTHON37_BIN% -m venv testenv
+call testenv\Scripts\activate
+call testenv\Scripts\pip.exe install -r src\requirements.txt
+if %ERRORLEVEL% NEQ 0 (
+    echo "Failed to create venv"
+    exit /B 1
+)
+
+cd src
+
+echo call ..\testenv\Scripts\activate.bat
+call ..\testenv\Scripts\activate.bat
+
+ECHO Building Pyside2 (Debug)
+
+SET PYTHON_LIBRARIES==%TEMP_FOLDER%\python-3.10.5-rev1-windows\python\libs\python39_d.lib
+SET PYTHON_DEBUG_LIBRARIES==%TEMP_FOLDER%\python-3.10.5-rev1-windows\python\libs\python39_d.lib
+
+echo call ..\testenv\Scripts\python_d.exe setup.py install --qmake=%LOCAL_3P_QTBUILD_QMAKE_PATH% --build-type=all --debug --limited-api=no --skip-modules=Qml,Quick,QuickWidgets,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer
+call ..\testenv\Scripts\python_d.exe setup.py install --qmake=%LOCAL_3P_QTBUILD_QMAKE_PATH% --build-type=all --debug --limited-api=no --skip-modules=Qml,Quick,QuickWidgets,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer
+if %ERRORLEVEL% NEQ 0 (
+    echo "Failed to build pyside2 (debug)"
+    exit /B 1
+)
+
+ECHO Building Pyside2 (Release)
+
+echo call ..\testenv\Scripts\python.exe setup.py install --qmake=%LOCAL_3P_QTBUILD_QMAKE_PATH% --build-type=all --limited-api=yes --skip-modules=Qml,Quick,QuickWidgets,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer
+call ..\testenv\Scripts\python.exe setup.py install --qmake=%LOCAL_3P_QTBUILD_QMAKE_PATH% --build-type=all --limited-api=yes --skip-modules=Qml,Quick,QuickWidgets,Positioning,Location,RemoteObjects,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,Multimedia,MultimediaWidgets,AxContainer
+if %ERRORLEVEL% NEQ 0 (
+    echo "Failed to build pyside2 (release)"
+    exit /B 1
+)
+
+echo call ..\testenv\Scripts\deactivate.bat
+call ..\testenv\Scripts\deactivate.bat
+
+cd %CURRENT_PATH%
+
+exit /B 0

+ 55 - 0
package-system/pyside2/package_linux.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+# TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script
+
+PACKAGE_BASE=$TARGET_INSTALL_ROOT
+echo PACKAGE_BASE=$PACKAGE_BASE
+INSTALL_SOURCE=$TEMP_FOLDER/src/pyside3a_install/`ls $TEMP_FOLDER/src/pyside3a_install`
+echo INSTALL_SOURCE=$INSTALL_SOURCE
+
+# Copy the LICENSE and README files
+echo cp $TEMP_FOLDER/src/LICENSE.FDL $PACKAGE_BASE/
+cp $TEMP_FOLDER/src/LICENSE.FDL $PACKAGE_BASE/
+echo copy $TEMP_FOLDER/src/LICENSE.GPLv3 $PACKAGE_BASE/
+cp $TEMP_FOLDER/src/LICENSE.GPLv3 $PACKAGE_BASE/
+echo copy $TEMP_FOLDER/src/LICENSE.GPLv3-EXCEPT $PACKAGE_BASE/
+cp $TEMP_FOLDER/src/LICENSE.GPLv3-EXCEPT $PACKAGE_BASE/
+echo copy $TEMP_FOLDER/src/LICENSE.LGPLv3 $PACKAGE_BASE/
+cp $TEMP_FOLDER/src/LICENSE.LGPLv3 $PACKAGE_BASE/
+echo copy $TEMP_FOLDER/../LICENSES.txt $PACKAGE_BASE/
+cp $TEMP_FOLDER/../LICENSES.txt $PACKAGE_BASE/
+echo copy $TEMP_FOLDER/src/README.* $PACKAGE_BASE/
+cp $TEMP_FOLDER/src/README.* $PACKAGE_BASE/
+
+cp -r $INSTALL_SOURCE/bin $PACKAGE_BASE
+cp -r $INSTALL_SOURCE/include $PACKAGE_BASE
+cp -r $INSTALL_SOURCE/lib $PACKAGE_BASE
+cp -r $INSTALL_SOURCE/share $PACKAGE_BASE
+
+# Copy the dependent libclang.so.13 from the downloaded dependent package
+cp $TEMP_FOLDER/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64/libclang/lib/libclang.so.13.0.0 $PACKAGE_BASE/bin
+pushd $PACKAGE_BASE/bin
+ln -s libclang.so.13.0.0 libclang.so.13.0
+ln -s libclang.so.13.0.0 libclang.so.13
+popd
+
+# RPATH fixes
+$TEMP_FOLDER/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/lib/libpyside2.abi3.so.5.15.2.1
+$TEMP_FOLDER/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/lib/libshiboken2.abi3.so.5.15.2.1
+$TEMP_FOLDER/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/lib/python3.10/site-packages/shiboken2/shiboken2.abi3.so
+$TEMP_FOLDER/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/bin/shiboken2
+$TEMP_FOLDER/src/patchelf --set-rpath \$ORIGIN $PACKAGE_BASE/bin/pyside2-lupdate
+
+# Add additional files needed for pip install
+cp $TEMP_FOLDER/../__init__.py $PACKAGE_BASE/lib/python3.10/site-packages/
+cp $TEMP_FOLDER/../setup.py $PACKAGE_BASE/lib/python3.10/site-packages/
+
+exit 0

+ 121 - 0
package-system/pyside2/package_windows.bat

@@ -0,0 +1,121 @@
+@echo off
+
+REM 
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM  
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM 
+REM 
+
+REM TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script
+
+echo TEMP_FOLDER=%TEMP_FOLDER%
+echo TARGET_INSTALL_ROOT=%TARGET_INSTALL_ROOT%
+
+SET PACKAGE_BASE=%TARGET_INSTALL_ROOT%
+
+SET INSTALL_SOURCE_RELEASE=%TEMP_FOLDER%\src\testenv3a_install\py3.10-qt5.15.1-64bit-release
+SET INSTALL_SOURCE_DEBUG=%TEMP_FOLDER%\src\testenv3dp_install\py3.10-qt5.15.1-64bit-debug
+SET BUILD_SOURCE_DEBUG=%TEMP_FOLDER%\\src\testenv3dp_build\py3.10-qt5.15.1-64bit-debug
+
+REM Copy the LICENSE and README files
+
+ECHO copy %TEMP_FOLDER%\src\LICENSE.FDL %PACKAGE_BASE%\
+copy %TEMP_FOLDER%\src\LICENSE.FDL %PACKAGE_BASE%\
+ECHO copy %TEMP_FOLDER%\src\LICENSE.GPLv3 %PACKAGE_BASE%\
+copy %TEMP_FOLDER%\src\LICENSE.GPLv3 %PACKAGE_BASE%\
+ECHO copy %TEMP_FOLDER%\src\LICENSE.GPLv3-EXCEPT %PACKAGE_BASE%\
+copy %TEMP_FOLDER%\src\LICENSE.GPLv3-EXCEPT %PACKAGE_BASE%\
+ECHO copy %TEMP_FOLDER%\src\LICENSE.LGPLv3 %PACKAGE_BASE%\
+copy %TEMP_FOLDER%\src\LICENSE.LGPLv3 %PACKAGE_BASE%\
+ECHO copy %TEMP_FOLDER%\..\LICENSES.TXT %PACKAGE_BASE%\
+copy %TEMP_FOLDER%\..\LICENSES.TXT %PACKAGE_BASE%\
+ECHO copy %TEMP_FOLDER%\src\README.* %PACKAGE_BASE%\
+copy %TEMP_FOLDER%\src\README.* %PACKAGE_BASE%\
+
+
+REM Copy the bin (release) folder 
+mkdir %PACKAGE_BASE%\bin
+robocopy %INSTALL_SOURCE_RELEASE%\bin %PACKAGE_BASE%\bin *.* /E
+REM Copy over libclang and its license file
+copy %TEMP_FOLDER%\libclang-release_130-based-windows-vs2019_64\libclang\bin\libclang.dll %PACKAGE_BASE%\bin\
+copy %TEMP_FOLDER%\libclang-release_130-based-windows-vs2019_64\libclang\include\llvm\Support\LICENSE.TXT %PACKAGE_BASE%\LICENSE.LIBCLANG.TXT
+
+REM Copy the include (release) folder
+mkdir %PACKAGE_BASE%\include
+robocopy %INSTALL_SOURCE_RELEASE%\include %PACKAGE_BASE%\include *.* /E
+
+REM Copy the lib (release) folder
+mkdir %PACKAGE_BASE%\lib
+robocopy %INSTALL_SOURCE_RELEASE%\lib %PACKAGE_BASE%\lib *.* /E
+copy %INSTALL_SOURCE_RELEASE%\lib\pyside2.abi3.lib %PACKAGE_BASE%\lib\site-packages\PySide2\
+copy %INSTALL_SOURCE_RELEASE%\bin\pyside2.abi3.dll %PACKAGE_BASE%\lib\site-packages\PySide2\
+copy %INSTALL_SOURCE_RELEASE%\lib\shiboken2.abi3.lib %PACKAGE_BASE%\lib\site-packages\shiboken2\
+copy %INSTALL_SOURCE_RELEASE%\bin\shiboken2.abi3.dll %PACKAGE_BASE%\lib\site-packages\shiboken2\
+
+REM Overlay debug versions
+robocopy %INSTALL_SOURCE_DEBUG%\lib\site-packages\PySide2 %PACKAGE_BASE%\lib\site-packages\PySide2 *.pyd /E
+robocopy %INSTALL_SOURCE_DEBUG%\lib\site-packages\shiboken2 %PACKAGE_BASE%\lib\site-packages\shiboken2 *.pyd /E
+copy %INSTALL_SOURCE_DEBUG%\lib\pyside2_d.cp310-win_amd64.lib %PACKAGE_BASE%\lib\site-packages\PySide2\
+copy %INSTALL_SOURCE_DEBUG%\bin\pyside2_d.cp310-win_amd64.dll %PACKAGE_BASE%\lib\site-packages\PySide2\
+copy %INSTALL_SOURCE_DEBUG%\lib\shiboken2_d.cp310-win_amd64.lib %PACKAGE_BASE%\lib\site-packages\shiboken2\
+copy %INSTALL_SOURCE_DEBUG%\bin\shiboken2_d.cp310-win_amd64.dll %PACKAGE_BASE%\lib\site-packages\shiboken2\
+
+REM Copy necessary files to register for pip install
+cp %TEMP_FOLDER%\..\__init__.py %PACKAGE_BASE%\lib\site-packages\
+cp %TEMP_FOLDER%\..\setup.py %PACKAGE_BASE%\lib\site-packages\
+
+REM Copy the share folder
+mkdir %PACKAGE_BASE%\share
+robocopy %INSTALL_SOURCE_RELEASE%\share %PACKAGE_BASE%\share *.* /E
+
+
+
+REM ##############################################################################################################################
+GOTO skipcopy
+REM Copy the egg-info for Pyside2
+mkdir %PACKAGE_BASE%\PySide2.egg-info
+robocopy %TEMP_FOLDER%\src\PySide2.egg-info %PACKAGE_BASE%\PySide2.egg-info /E
+
+
+REM Copy the PySide2 module
+mkdir %PACKAGE_BASE%\PySide2
+
+copy %INSTALL_SOURCE_RELEASE%\lib\pyside2.abi3.lib %PACKAGE_BASE%\PySide2\
+copy %INSTALL_SOURCE_RELEASE%\bin\pyside2.abi3.dll %PACKAGE_BASE%\PySide2\
+robocopy %INSTALL_SOURCE_RELEASE%\lib\site-packages\PySide2 %PACKAGE_BASE%\PySide2 *.py *.pyd /E
+
+copy %INSTALL_SOURCE_DEBUG%\lib\pyside2_d.cp310-win_amd64.lib %PACKAGE_BASE%\PySide2\
+copy %INSTALL_SOURCE_DEBUG%\bin\pyside2_d.cp310-win_amd64.dll %PACKAGE_BASE%\PySide2\
+copy %BUILD_SOURCE_DEBUG%\pyside2\pyside2_d.cp310-win_amd64.pdb %PACKAGE_BASE%\shiboken2\
+
+
+robocopy %INSTALL_SOURCE_DEBUG%\lib\site-packages\PySide2 %PACKAGE_BASE%\PySide2 *.pyd /E
+
+
+REM Copy the shiboken2 module
+mkdir %PACKAGE_BASE%\shiboken2
+
+copy %INSTALL_SOURCE_RELEASE%\lib\shiboken2.abi3.lib %PACKAGE_BASE%\shiboken2\
+copy %INSTALL_SOURCE_RELEASE%\bin\shiboken2.abi3.dll %PACKAGE_BASE%\shiboken2\
+robocopy %INSTALL_SOURCE_RELEASE%\lib\site-packages\shiboken2 %PACKAGE_BASE%\shiboken2 *.py *.pyd /E
+                                
+copy %INSTALL_SOURCE_DEBUG%\lib\shiboken2_d.cp310-win_amd64.lib %PACKAGE_BASE%\shiboken2\
+copy %INSTALL_SOURCE_DEBUG%\bin\shiboken2_d.cp310-win_amd64.dll %PACKAGE_BASE%\shiboken2\
+copy %BUILD_SOURCE_DEBUG%\shiboken2\libshiboken\shiboken2_d.cp310-win_amd64.pdb %PACKAGE_BASE%\shiboken2\
+robocopy %INSTALL_SOURCE_DEBUG%\lib\site-packages\shiboken2 %PACKAGE_BASE%\shiboken2 *.pyd /E
+
+REM Add additional files needed for pip install
+cp %TEMP_FOLDER%\..\__init__.py %PACKAGE_BASE%\
+cp %TEMP_FOLDER%\..\setup.py %PACKAGE_BASE%\
+
+:skipcopy
+REM ##############################################################################################################################
+
+
+
+
+
+
+exit /b 0

+ 71 - 85
package-system/pyside2-qt/pyside_o3de-v5.14.2.3.patch → package-system/pyside2/pyside2-5.15.2.1.patch

@@ -1,52 +1,35 @@
-diff --git a/build_scripts/main.py b/build_scripts/main.py
-index cf56850df..0e1a0fa4b 100644
---- a/build_scripts/main.py
-+++ b/build_scripts/main.py
-@@ -544,6 +544,9 @@ class PysideBuild(_build):
-                 py_include_dir = os.path.join(py_prefix, "include")
-             else:
-                 py_include_dir = os.path.join(py_prefix, "include/python{}".format(py_version))
-+                if not os.path.isdir(py_include_dir):
-+                    py_include_dir = os.path.join(py_prefix, "include/python{}m".format(py_version))
-+
-         dbg_postfix = ""
-         if build_type == "Debug":
-             dbg_postfix = "_d"
 diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt
-index 7493a453a..f67196815 100644
+index e31c87eef..a8fdf731a 100644
 --- a/sources/pyside2/libpyside/CMakeLists.txt
 +++ b/sources/pyside2/libpyside/CMakeLists.txt
 @@ -1,13 +1,5 @@
  project(libpyside)
  
--if(${Qt5Qml_FOUND})
--    if(NOT "${Qt5Qml_PRIVATE_INCLUDE_DIRS}" MATCHES "/QtQml/")
--        string(REPLACE "/QtCore" "/QtQml" replaceme "${Qt5Core_PRIVATE_INCLUDE_DIRS}")
--        list(APPEND Qt5Qml_PRIVATE_INCLUDE_DIRS ${replaceme})
--        list(REMOVE_DUPLICATES Qt5Qml_PRIVATE_INCLUDE_DIRS)
+-if(${Qt${QT_MAJOR_VERSION}Qml_FOUND})
+-    if(NOT "${Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS}" MATCHES "/QtQml/")
+-        string(REPLACE "/QtCore" "/QtQml" replaceme "${Qt${QT_MAJOR_VERSION}Core_PRIVATE_INCLUDE_DIRS}")
+-        list(APPEND Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS ${replaceme})
+-        list(REMOVE_DUPLICATES Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS)
 -    endif()
 -endif()
 -
- if(${Qt5Quick_FOUND})
-     if(NOT "${Qt5Quick_PRIVATE_INCLUDE_DIRS}" MATCHES "/QtQuick/")
-         string(REPLACE "/QtCore" "/QtQuick" replaceme "${Qt5Core_PRIVATE_INCLUDE_DIRS}")
-@@ -17,26 +9,11 @@ if(${Qt5Quick_FOUND})
-     endif()
+ if(${Qt${QT_MAJOR_VERSION}Quick_FOUND})
+     if(NOT "${Qt${QT_MAJOR_VERSION}Quick_PRIVATE_INCLUDE_DIRS}" MATCHES "/QtQuick/")
+         string(REPLACE "/QtCore" "/QtQuick" replaceme "${Qt${QT_MAJOR_VERSION}Core_PRIVATE_INCLUDE_DIRS}")
+@@ -18,25 +10,9 @@ if(${Qt${QT_MAJOR_VERSION}Quick_FOUND})
  endif()
  
-+# Disable QML support
-+set(QML_SUPPORT 0)
  set(QML_PRIVATE_API_SUPPORT 0)
--if(Qt5Qml_FOUND)
+-if(Qt${QT_MAJOR_VERSION}Qml_FOUND)
 -    # Used for registering custom QQuickItem classes defined in Python code.
 -    set(QML_SUPPORT 1)
--    set(QML_INCLUDES ${Qt5Qml_INCLUDE_DIRS})
--    set(QML_LIBRARIES ${Qt5Qml_LIBRARIES})
+-    set(QML_INCLUDES ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS})
+-    set(QML_LIBRARIES ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES})
 -
--    if(Qt5Qml_PRIVATE_INCLUDE_DIRS)
+-    if(Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS)
 -        # Used for transforming QML exceptions into Python exceptions.
 -        set(QML_PRIVATE_API_SUPPORT 1)
--        set(QML_INCLUDES ${QML_INCLUDES} ${Qt5Qml_PRIVATE_INCLUDE_DIRS})
+-        set(QML_INCLUDES ${QML_INCLUDES} ${Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS})
 -    else()
 -        message(WARNING "QML private API include files could not be found, support for catching QML exceptions inside Python code will not work.")
 -    endif()
@@ -56,16 +39,17 @@ index 7493a453a..f67196815 100644
 -    set(QML_INCLUDES "")
 -    set(QML_LIBRARIES "")
 -endif()
++set(QML_SUPPORT 0)
 +set(QML_INCLUDES "")
 +set(QML_LIBRARIES "")
  
- qt5_wrap_cpp(DESTROYLISTENER_MOC "destroylistener.h")
- 
+ set(libpyside_SRC
+     dynamicqmetaobject.cpp
 diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
-index e2b8708ce..0541c7d91 100644
+index 219b99d48..f33e4f724 100644
 --- a/sources/pyside2/libpyside/pyside.cpp
 +++ b/sources/pyside2/libpyside/pyside.cpp
-@@ -423,7 +423,7 @@ static const char invalidatePropertyName[] = "_PySideInvalidatePtr";
+@@ -414,7 +414,7 @@ static const char invalidatePropertyName[] = "_PySideInvalidatePtr";
  // class by walking up the meta objects.
  static const char *typeName(QObject *cppSelf)
  {
@@ -74,16 +58,8 @@ index e2b8708ce..0541c7d91 100644
      if (!Shiboken::Conversions::getConverter(typeName)) {
          for (auto metaObject = cppSelf->metaObject(); metaObject; metaObject = metaObject->superClass()) {
              const char *name = metaObject->className();
-@@ -459,7 +459,6 @@ PyObject *getWrapperForQObject(QObject *cppSelf, SbkObjectType *sbk_type)
-     }
- 
-     pyOut = Shiboken::Object::newObject(sbk_type, cppSelf, false, false, typeName(cppSelf));
--
-     return pyOut;
- }
- 
 diff --git a/sources/pyside2/libpyside/pyside.h b/sources/pyside2/libpyside/pyside.h
-index ae400e1fe..b7412594b 100644
+index c1a298cc8..91e648f47 100644
 --- a/sources/pyside2/libpyside/pyside.h
 +++ b/sources/pyside2/libpyside/pyside.h
 @@ -50,12 +50,57 @@
@@ -145,10 +121,10 @@ index ae400e1fe..b7412594b 100644
  
  /**
 diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
-index c1349cae6..5e6071bb7 100644
+index 3de5d3223..8cc960e99 100644
 --- a/sources/shiboken2/CMakeLists.txt
 +++ b/sources/shiboken2/CMakeLists.txt
-@@ -76,7 +76,7 @@ if (NOT PYTHON_EXTENSION_SUFFIX)
+@@ -78,7 +78,7 @@ if (NOT PYTHON_EXTENSION_SUFFIX)
    get_python_extension_suffix()
  endif()
  
@@ -158,7 +134,7 @@ index c1349cae6..5e6071bb7 100644
  
  shiboken_check_if_limited_api()
 diff --git a/sources/shiboken2/data/shiboken_helpers.cmake b/sources/shiboken2/data/shiboken_helpers.cmake
-index 6bd75d0ea..316b52f05 100644
+index 5e0c6ea72..1097991c3 100644
 --- a/sources/shiboken2/data/shiboken_helpers.cmake
 +++ b/sources/shiboken2/data/shiboken_helpers.cmake
 @@ -298,7 +298,7 @@ macro(shiboken_check_if_limited_api)
@@ -171,10 +147,10 @@ index 6bd75d0ea..316b52f05 100644
              # GREATER_EQUAL is available only from cmake 3.7 on. We mean python 3.5 .
              set(PYTHON_LIMITED_API 1)
 diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
-index 64467e3d1..e729c49ea 100644
+index 38b596a5f..1aed4286b 100644
 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
 +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
-@@ -58,7 +58,11 @@ static const char typeNameFunc[] = R"CPP(
+@@ -59,7 +59,11 @@ static const char typeNameFunc[] = R"CPP(
  template <class T>
  static const char *typeNameOf(const T &t)
  {
@@ -186,39 +162,49 @@ index 64467e3d1..e729c49ea 100644
      auto size = std::strlen(typeName);
  #if defined(Q_CC_MSVC) // MSVC: "class QPaintDevice * __ptr64"
      if (auto lastStar = strchr(typeName, '*')) {
-@@ -1522,18 +1526,31 @@ void CppGenerator::writeConverterRegister(QTextStream &s, const AbstractMetaClas
-         cppSignature.removeFirst();
-     }
- 
--    s << INDENT << "Shiboken::Conversions::registerConverterName(converter, typeid(::";
-+    if (usePySideExtensions() && metaClass->isQObject()) {
-+        s << INDENT << "Shiboken::Conversions::registerConverterName(converter, PySide::getTypeId<::";
-+    } else {
-+        s << INDENT << "Shiboken::Conversions::registerConverterName(converter, typeid(::";
-+    }
-     QString qualifiedCppNameInvocation;
-     if (!classContext.forSmartPointer())
-         qualifiedCppNameInvocation = metaClass->qualifiedCppName();
-     else
-         qualifiedCppNameInvocation = classContext.preciseType()->cppSignature();
- 
--    s << qualifiedCppNameInvocation << ").name());\n";
-+    if (usePySideExtensions() && metaClass->isQObject()) {
-+        s << qualifiedCppNameInvocation << ">().name());\n";
-+    } else {
-+        s << qualifiedCppNameInvocation << ").name());\n";
-+    }
- 
-     if (shouldGenerateCppWrapper(metaClass)) {
--        s << INDENT << "Shiboken::Conversions::registerConverterName(converter, typeid(::";
--        s << wrapperName(metaClass) << ").name());\n";
-+        if (usePySideExtensions() && metaClass->isQObject()) {
-+            s << INDENT << "Shiboken::Conversions::registerConverterName(converter, PySide::getTypeId<::";
-+            s << wrapperName(metaClass) << ">().name());\n";
-+        } else {
-+            s << INDENT << "Shiboken::Conversions::registerConverterName(converter, typeid(::";
-+            s << wrapperName(metaClass) << ").name());\n";
-+        }
-     }
+diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
+index 66df0fd94..b84c93426 100644
+--- a/sources/shiboken2/libshiboken/pep384impl.cpp
++++ b/sources/shiboken2/libshiboken/pep384impl.cpp
+@@ -751,9 +751,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
+ #endif // IS_PY2
+     Shiboken::AutoDecRef privateobj(PyObject_GetAttr(
+         reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name()));
+-#ifndef Py_LIMITED_API
+-    return _Py_Mangle(privateobj, name);
+-#else
++
+     // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.
+     // The rest of this function is our own implementation of _Py_Mangle.
+     // Please compare the original function in compile.c .
+@@ -789,7 +787,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
+     if (amount > big_stack)
+         free(resbuf);
+     return result;
+-#endif // else Py_LIMITED_API
++
+ }
  
-     s << endl;
+ /*****************************************************************************
+diff --git a/sources/shiboken2/libshiboken/signature/signature_helper.cpp b/sources/shiboken2/libshiboken/signature/signature_helper.cpp
+index 2b360c786..0246ec61d 100644
+--- a/sources/shiboken2/libshiboken/signature/signature_helper.cpp
++++ b/sources/shiboken2/libshiboken/signature/signature_helper.cpp
+@@ -236,7 +236,7 @@ static PyObject *_build_new_entry(PyObject *new_name, PyObject *value)
+     PyObject *new_value = PyDict_Copy(value);
+     PyObject *multi = PyDict_GetItem(value, PyName::multi());
+     if (multi != nullptr && Py_TYPE(multi) == &PyList_Type) {
+-        ssize_t len = PyList_Size(multi);
++        Py_ssize_t len = PyList_Size(multi);
+         AutoDecRef list(PyList_New(len));
+         if (list.isNull())
+             return nullptr;
+@@ -314,7 +314,7 @@ PyObject *_address_to_stringlist(PyObject *numkey)
+      * When needed in `PySide_BuildSignatureProps`, the strings are
+      * finally materialized.
+      */
+-    ssize_t address = PyNumber_AsSsize_t(numkey, PyExc_ValueError);
++    Py_ssize_t address = PyNumber_AsSsize_t(numkey, PyExc_ValueError);
+     if (address == -1 && PyErr_Occurred())
+         return nullptr;
+     char **sig_strings = reinterpret_cast<char **>(address);

+ 39 - 0
package-system/pyside2/pyside2-tools.patch

@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ce65750..9626bc4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,9 +6,31 @@ if (QUIET_BUILD)
+     set(CMAKE_INSTALL_MESSAGE NEVER)
+ endif()
+ 
+-find_package(Shiboken2 2.0.0 REQUIRED)
+-find_package(Qt5 REQUIRED Core)
+-find_package(PySide2 2.0.0 REQUIRED)
++list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/../../pyside3a_install/py3.10-qt5.15.1-64bit-release/lib")
++list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/../../pyside3a_install/py3.10-qt5.15.1-64bit-release")
++
++
++find_package(Shiboken2 2.0.0
++             REQUIRED
++             PATHS
++                "${CMAKE_SOURCE_DIR}/../../pyside3a_install/py3.10-qt5.15.1-64bit-release/lib"
++             NO_DEFAULT_PATH
++)
++
++find_package(Qt5
++             REQUIRED
++                Core
++             PATHS
++                "${CMAKE_SOURCE_DIR}/../../../qt-5.15.2-rev6-linux/qt"
++             )
++
++find_package(PySide2 2.0.0
++             REQUIRED
++             PATHS
++                "${CMAKE_SOURCE_DIR}/../../pyside3a_install/py3.10-qt5.15.1-64bit-release"
++             NO_DEFAULT_PATH
++)
++
+ 
+ set(pyside2_tools_MAJOR_VERSION "2")
+ set(pyside2_tools_MINOR_VERSION "0")

+ 14 - 3
package-system/pyside2-qt/setup.py → package-system/pyside2/setup.py

@@ -8,12 +8,23 @@
 
 import os
 import platform
+import pathlib
+import sys
 
 from setuptools import setup, find_packages
 from setuptools.command.develop import develop
 from setuptools.command.build_py import build_py
 
-PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
+if sys.platform == 'win32':
+    # The library folder structure of windows omits the extra 'python3.10' folder level for the site-packages, so we have to
+    # adjust to where to read the project root based on this file
+    PROJECT_ROOT = pathlib.Path(os.path.dirname(__file__)).parent.parent
+else:
+    PROJECT_ROOT = pathlib.Path(os.path.dirname(__file__)).parent.parent.parent
+
+
+
+README_FILE = PROJECT_ROOT / 'README.md'
 
 PYTHON_64 = platform.architecture()[0] == '64bit'
 
@@ -22,12 +33,12 @@ if __name__ == '__main__':
     if not PYTHON_64:
         raise RuntimeError("32-bit Python is not a supported platform.")
 
-    with open(os.path.join(PROJECT_ROOT, 'README.md')) as f:
+    with README_FILE.open() as f:
         long_description = f.read()
 
     setup(
         name="pyside2",
-        version="5.12.4.2.3",
+        version="5.15.2.1",
         description='Pyside2',
         long_description=long_description,
         packages=['PySide2', 'shiboken2'],

+ 2 - 2
package_build_list_host_linux.json

@@ -17,7 +17,7 @@
         "libsamplerate-0.2.1-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Linux --package-root ../../package-system --clean",
         "mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.1-rev1",
         "OpenMesh-8.1-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Linux --package-root ../../package-system --clean",
-        "pyside2-5.15.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2-qt --platform-name Linux --package-root ../../package-system --clean",
+        "pyside2-5.15.2.1-py3.10-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux --package-root ../../package-system/pyside2/temp --clean",
         "OpenEXR-3.1.3-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux --package-root ../../package-system/OpenEXR/temp --clean",
         "OpenXR-1.0.22-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux --package-root ../../package-system --clean",
         "openimageio-opencolorio-2.3.12.0-rev2-linux": "package-system/openimageio-opencolorio/build_openimageio.py --clean",
@@ -53,7 +53,7 @@
         "libsamplerate-0.2.1-rev2-linux": "package-system/libsamplerate-linux",
         "mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp-linux",
         "OpenMesh-8.1-rev3-linux": "package-system/OpenMesh-linux",
-        "pyside2-5.15.2-rev2-linux": "package-system/pyside2-linux",
+        "pyside2-5.15.2.1-py3.10-rev3-linux": "package-system/pyside2/temp/pyside2-linux",
         "OpenEXR-3.1.3-rev4-linux": "package-system/OpenEXR/temp/OpenEXR-linux",
         "OpenXR-1.0.22-rev2-linux": "package-system/OpenXR-linux",
         "openimageio-opencolorio-2.3.12.0-rev2-linux": "package-system/openimageio-opencolorio/temp/package-linux",

+ 2 - 1
package_build_list_host_windows.json

@@ -47,6 +47,7 @@
         "png-1.6.37-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Windows --package-root ../../package-system/libpng/temp --clean",
         "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows",
         "pybind11-2.10.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pybind11 --platform-name multiplatform --package-root ../../package-system/pybind11/temp --clean",
+        "pyside2-5.15.2.1-py3.10-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Windows --package-root ../../package-system/pyside2/temp --clean",
         "python-3.7.12-rev2-windows": "package-system/python/build_package_image.py",
         "qt-5.15.2-rev7-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean",
         "RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system",
@@ -113,7 +114,7 @@
     "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri-windows",
     "PVRTexTool-4.24.0-rev4-multiplatform": "package-system/PVRTexTool-multiplatform",
     "pybind11-2.10.0-rev1-multiplatform": "package-system/pybind11/temp/pybind11-multiplatform",
-    "pyside2-qt-5.15.1-rev2-windows": "package-system/pyside2-windows",
+    "pyside2-5.15.2.1-py3.10-rev3-windows": "package-system/pyside2/temp/pyside2-windows",
     "python-3.7.12-rev2-windows": "package-system/python/win_x64/package",
     "qt-5.15.2-rev7-windows": "package-system/Qt/temp/qt-windows",
     "RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform",