From e202543390ae410c6b9fa52776ac093f0f1a7a9c Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Thu, 20 Aug 2026 23:26:57 -0600 Subject: [PATCH 01/13] Update Qt to v6.11.2 Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- Scripts/extras/archive_downloader.py | 6 +- Scripts/extras/pull_and_build_from_git.py | 5 +- package-system/Qt/FindQt.cmake | 2 +- package-system/Qt/Platform/Mac/Qt_mac.cmake | 5 - .../Platform/Windows/QtPlugin_windows.cmake | 1 - package-system/Qt/README.md | 108 ++++++++---------- package-system/Qt/build-darwin-arm64.sh | 25 +++- package-system/Qt/build-linux.sh | 55 ++++++++- package-system/Qt/build-windows.bat | 24 +++- package-system/Qt/build_config.json | 28 +++-- package-system/Qt/recursion-check.patch | 6 +- package_build_list_host_darwin-arm64.json | 4 +- package_build_list_host_linux.json | 4 +- package_build_list_host_windows.json | 4 +- 14 files changed, 179 insertions(+), 98 deletions(-) diff --git a/Scripts/extras/archive_downloader.py b/Scripts/extras/archive_downloader.py index 3cfb19ae..232631e3 100644 --- a/Scripts/extras/archive_downloader.py +++ b/Scripts/extras/archive_downloader.py @@ -49,8 +49,8 @@ def hash_file(file_path:str, hash_algorithm:str='md5')->str: # we don't follow symlinks here, this is strictly to check actual packages. with open(file_path, 'rb') as afile: - buf = afile.read() - hasher.update(buf) + for chunk in iter(lambda: afile.read(1024 * 1024), b''): + hasher.update(chunk) hash_result = hasher.hexdigest() return hash_result @@ -122,7 +122,7 @@ def extract_package(src_package_file: str, target_folder:str): elif package_ext in ARCHIVE_EXTS_TAR: import tarfile with tarfile.open(str(src_package_file_path.resolve())) as tar_file: - tarfile.extractall(destination_path) + tar_file.extractall(destination_path) elif package_ext in ARCHIVE_EXTS_7ZIP: try: os.makedirs(destination_path, exist_ok=True) diff --git a/Scripts/extras/pull_and_build_from_git.py b/Scripts/extras/pull_and_build_from_git.py index 8fbd7053..8c783a95 100644 --- a/Scripts/extras/pull_and_build_from_git.py +++ b/Scripts/extras/pull_and_build_from_git.py @@ -37,7 +37,7 @@ * package_name : The base name of the package, used for constructing the filename and folder structures * package_url : The package url that will be placed in the PackageInfo.json * package_license : The type of license that will be described in the PackageInfo.json -* package_license_file : The name of the source code license file (expected at the root of the source folder pulled from git) +* package_license_file : The source-relative license file path. This can be overridden for an individual target platform. The following keys can exist at the root level or the target-platform level: @@ -266,7 +266,6 @@ def __init__(self, build_config, target_platform_name, target_platform_config): self.package_name = build_config["package_name"] self.package_url = build_config["package_url"] self.package_license = build_config["package_license"] - self.package_license_file = build_config["package_license_file"] except KeyError as e: raise BuildError(f"Invalid build config. Missing required key : {str(e)}") @@ -276,6 +275,7 @@ def _get_value(value_key, required=True, default=None): raise BuildError(f"Required key '{value_key}' not found in build config") return result + self.package_license_file = _get_value("package_license_file") self.git_url = _get_value("git_url", required=False) self.git_tag = _get_value("git_tag", required=False) self.src_package_url = _get_value("src_package_url", required=False) @@ -1407,4 +1407,3 @@ def prepare_build(platform_name, base_folder, build_folder, package_root_folder, print(err) exit(1) - diff --git a/package-system/Qt/FindQt.cmake b/package-system/Qt/FindQt.cmake index a211e98d..f032df31 100644 --- a/package-system/Qt/FindQt.cmake +++ b/package-system/Qt/FindQt.cmake @@ -20,7 +20,7 @@ endif() # Force-set QtCore's version here to ensure CMake detects Qt's existence and allows AUTOMOC to work set(Qt6Core_VERSION_MAJOR "6" CACHE STRING "Qt's major version" FORCE) -set(Qt6Core_VERSION_MINOR "10" CACHE STRING "Qt's minor version" FORCE) +set(Qt6Core_VERSION_MINOR "11" CACHE STRING "Qt's minor version" FORCE) set(Qt6Core_VERSION_PATCH "2" CACHE STRING "Qt's patch version" FORCE) mark_as_advanced(Qt6Core_VERSION_MAJOR) mark_as_advanced(Qt6Core_VERSION_MINOR) diff --git a/package-system/Qt/Platform/Mac/Qt_mac.cmake b/package-system/Qt/Platform/Mac/Qt_mac.cmake index 67c0c8a8..e3066864 100644 --- a/package-system/Qt/Platform/Mac/Qt_mac.cmake +++ b/package-system/Qt/Platform/Mac/Qt_mac.cmake @@ -8,11 +8,6 @@ set(QT_LIB_PATH ${QT_PATH}/lib) -list(APPEND QT6_COMPONENTS - DBus - PrintSupport -) - function(ly_qt_configuration_mapping in_config out_config) set(${out_config} RELEASE PARENT_SCOPE) endfunction() diff --git a/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake b/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake index 4ae93496..c6646ce4 100644 --- a/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake +++ b/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake @@ -36,4 +36,3 @@ ly_add_target_files(TARGETS 3rdParty::Qt::Widgets::Plugins FILES ${QT_PATH}/plugins/styles/qmodernwindowsstyle$<$:d>.dll OUTPUT_SUBDIRECTORY styles ) - diff --git a/package-system/Qt/README.md b/package-system/Qt/README.md index 5f7d5879..ca57a813 100644 --- a/package-system/Qt/README.md +++ b/package-system/Qt/README.md @@ -1,89 +1,75 @@ -# QT O3DE 3rd Party Package +# Qt O3DE 3rd Party Package +## Prerequisites +1. Python 3.10 or newer +1. The Python package `boto3` +1. [3p-package-scripts](https://github.com/o3de/3p-package-scripts) cloned next to [3p-package-source](https://github.com/o3de/3p-package-source) +## Sources and targets -## Prerequisites +The active Qt 6 packages use the official Qt 6.11.2 source archive: -1. **Python 3.10+** or higher installed -1. Python package `boto3` -1. [3p-package-scripts](https://github.com/o3de/3p-package-scripts) cloned locally at the same directory level as the local [3p-package-source](https://github.com/o3de/3p-package-source) +`https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz` +The archive is verified with SHA-1 `7e15dbb24d8d390b04fb53bb7397a2f625608132`. -## Updating +| Target | Package | +| --- | --- | +| Windows x64 | `qt-6.11.2-rev1-windows` | +| Linux x86_64 | `qt-6.11.2-rev1-linux` | +| macOS arm64 | `qt-6.11.2-rev1-mac-arm64` | +| macOS Intel (legacy) | `qt-5.15.2-rev8-mac` | +| Linux aarch64 (legacy) | `qt-5.15.2-rev10-linux-aarch64` | -When creating updates to the package, the rev number needs to be bumped as a minimum in order to represent a new package. If a new version of Qt is being used as the base source code, then the full version number needs to be updated. +The legacy Qt 5 targets continue to use the O3DE Qt git repository. -In `build_config.json`, the following lines control the git url and tag/commit that is used to pull the source code from. -``` - "git_url": "https://github.com/o3de/qt5.git", - "git_tag": "5.15.1-o3de", - "git_commit": "b3a1a6947422928e8aecb14ad607199e9720d266", -``` +## Qt 6 build contents -To control the version and rev of the package, the entry for `package_version` is used. For Qt, the package versioning is specific to the target platform, so this key resides inside each target platform's definition block. +All active targets build `qtbase`, `qtsvg`, `qtimageformats`, `qttools`, and `qttranslations`. Linux also builds `qtwayland`. QtDeclarative and ActiveQt are explicitly skipped. -``` - "Windows": { - "Windows": { - "package_version": "5.15.2-rev7", - ... - } - }, - "Darwin": { - "Mac": { - ... - "package_version": "5.15.2-rev8", - ... - } - }, - "Linux": { - "Linux": { - "package_version": "5.15.2-rev10", - ... - }, - "Linux-aarch64": { - "package_version": "5.15.2-rev10", - ... - } - } -``` -The package version controls path and filename of the target package. The target file name will be built following the pattern of qt-${package_version}-${platform_lower} where `platform_lower` will be one of the following depending on the target platform/architecture: +The package includes the Qt Widgets libraries used by O3DE, UiTools, `moc`, `uic`, `rcc`, `lupdate`, and `lrelease`. The WebP and TIFF image plugins remain enabled. Qt Widgets Designer, JasPer, MNG, SQL, PrintSupport, and selected unused qttools applications are disabled. DBus and Wayland integration are enabled only for Linux. -1. windows -1. linux -1. linux-aarch64 -1. mac +The Linux x86_64 build resolves TIFF, zlib, and OpenSSL through the corresponding O3DE dependency packages and forces Qt to use them instead of silently selecting bundled or host-system copies. -Then, depending on the platform, the package manifest file needs to be updated with this new folder name. Each manifest file is specific to the HOST platform that the package is being built on. (In the case of Linux, if the architecture is aarch64, then the package manifest file has an additional `-aarch64` suffix to the name). +QtCanvasPainter is not included. Its open-source licensing and dependency on QtDeclarative are incompatible with this package configuration. -The values in the corresponding `build_from_source` and `build_from_folder` needs to be updated to reflect the new name of the package if changed. +## Updating -## Building +When changing build inputs without changing the Qt release, increment the platform-specific revision. When changing the upstream Qt release, update: -The following build command line examples are based on the current values of the package names by platform. If a new version is being being built, update the command lines below as needed. +- `src_package_url`, `src_package_sha1`, and `package_version` in `build_config.json` +- The archive source paths in the active platform build scripts and `recursion-check.patch` +- The forced Qt version in `FindQt.cmake` +- The matching keys in each active host package build list -### Windows +Package names follow `qt-${package_version}-${platform}`. -``` -python ..\3p-package-scripts\o3de_package_scripts\build_package.py --search_path . qt-5.15.2-rev10-windows -``` +## Building -## Linux +Run these commands from the `3p-package-source` repository. Adjust the relative `3p-package-scripts` path if the repositories are laid out differently. -### amd64 -``` -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-5.15.2-rev10-linux -``` +### Windows x64 -### aarch64 +```bat +python ..\3p-package-scripts\o3de_package_scripts\build_package.py --search_path . qt-6.11.2-rev1-windows ``` -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-5.15.2-rev10-linux-aarch64 + +### Linux x86_64 + +```bash +python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-linux ``` -## Mac +### macOS arm64 +```bash +python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-mac-arm64 ``` -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-5.15.2-rev8-mac +### Legacy targets + +```bash +python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-5.15.2-rev8-mac +python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-5.15.2-rev10-linux-aarch64 ``` diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index c2e6d78f..34d6ecde 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -15,6 +15,7 @@ MAKE_FLAGS=-j32 # TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script BUILD_PATH=$TEMP_FOLDER/build +QT_SOURCE_ROOT=$TEMP_FOLDER/src/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2 QTARRAY="qtbase,qtimageformats,qtsvg,qttranslations,qttools" [[ -d $BUILD_PATH ]] || mkdir $BUILD_PATH @@ -22,6 +23,8 @@ cd $BUILD_PATH _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -submodules ${QTARRAY} \ + -skip qtdeclarative \ + -skip qtactiveqt \ -platform macx-clang \ -nomake examples \ -nomake tests \ @@ -30,13 +33,29 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -opensource \ -qt-tiff \ -qt-zlib \ + -qt-webp \ + -no-jasper \ + -no-mng \ -no-icu \ - -dbus-linked \ + -no-dbus \ + -no-feature-printsupport \ + -no-feature-sql \ + -no-feature-designer \ + -feature-linguist \ + -no-feature-assistant \ + -no-feature-distancefieldgenerator \ + -no-feature-kmap2qmap \ + -no-feature-pixeltool \ + -no-feature-qdbus \ + -no-feature-qdoc \ + -no-feature-qtattributionsscanner \ + -no-feature-qtdiag \ + -no-feature-qtplugininfo \ -framework \ -confirm-license " echo Configuring Qt... -../src/configure ${_OPTS} +${QT_SOURCE_ROOT}/configure ${_OPTS} cmake --build . --parallel if [ $? -ne 0 ] @@ -54,7 +73,7 @@ fi # The installation target on darwin is not installing the framework's header paths in the main # include folder. Create a symlink to the headers there for backwards compatibility -qtframeworks=(QtLabsPlatform QtQuickControls2 QtQuickParticles QtQuickControls2ImagineStyleImpl QtQuickControls2BasicStyleImpl QtLabsSharedImage QtQmlMeta QtDesigner QtQuickControls2FusionStyleImpl QtQuickShapesDesignHelpers QtQuickWidgets QtQuickControls2Material QtQmlXmlListModel QtShaderTools QtLabsSynchronizer QtQuickLayouts QtQuickControls2Basic QtHelp QtQuickVectorImage QtPrintSupport QtGui QtDBus QtQuickControls2Fusion QtQuickTemplates2 QtQuickDialogs2Utils QtXml QtQuick QtQuickEffects QtCore QtQuickDialogs2QuickImpl QtQmlNetwork QtQml QtQuickVectorImageGenerator QtQmlCore QtQmlWorkerScript QtQuickControls2Impl QtOpenGL QtLabsQmlModels QtQuickControls2Universal QtQmlLocalStorage QtQmlCompiler QtOpenGLWidgets QtUiTools QtLabsSettings QtSvgWidgets QtQuickControls2MacOSStyleImpl QtQuickControls2MaterialStyleImpl QtTest QtWidgets QtQuickShapes QtQuickTest QtNetwork QtQuickControls2UniversalStyleImpl QtSvg QtQuickControls2IOSStyleImpl QtDesignerComponents QtQuickControls2Imagine QtQuickVectorImageHelpers QtQmlModels QtLabsAnimation QtLabsFolderListModel QtQuickControls2FluentWinUI3StyleImpl QtQuickDialogs2 QtLabsWavefrontMesh QtSql QtConcurrent) +qtframeworks=(QtConcurrent QtCore QtGui QtNetwork QtOpenGL QtOpenGLWidgets QtSvg QtSvgWidgets QtTest QtUiTools QtWidgets QtXml) cd $TARGET_INSTALL_ROOT/include for qtframework in "${qtframeworks[@]}"; do diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index 63d4b89a..2076e25f 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -59,8 +59,57 @@ sudo apt-get install -y libfontconfig1-dev \ libxcb-xinerama0-dev \ libxrender-dev -QTARRAY="qtbase,qtimageformats,qtsvg,qttranslations,qtwayland" -BUILD_ROOT="${TEMP_FOLDER}/src" +QT6_ARCHIVE_ROOT="${TEMP_FOLDER}/src/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2" +if [ -d "${QT6_ARCHIVE_ROOT}" ] +then + BUILD_ROOT="${QT6_ARCHIVE_ROOT}" + QTARRAY="qtbase,qtimageformats,qtsvg,qttools,qttranslations,qtwayland" + + TIFF_PACKAGE_ROOT="${TEMP_FOLDER}/${TIFF_FOLDER_NAME}" + ZLIB_PACKAGE_ROOT="${TEMP_FOLDER}/${ZLIB_FOLDER_NAME}" + OPENSSL_PACKAGE_ROOT="${TEMP_FOLDER}/${OPENSSL_FOLDER_NAME}" + for DEPENDENCY_ROOT in "${TIFF_PACKAGE_ROOT}" "${ZLIB_PACKAGE_ROOT}" "${OPENSSL_PACKAGE_ROOT}" + do + if [ ! -d "${DEPENDENCY_ROOT}" ] + then + echo "Required Qt dependency package not found: ${DEPENDENCY_ROOT}" + exit 1 + fi + done + + QT_DEPENDENCY_MODULE_PATH="${TIFF_PACKAGE_ROOT};${ZLIB_PACKAGE_ROOT};${OPENSSL_PACKAGE_ROOT}" + QT_PLATFORM_OPTS="-skip qtdeclarative \ + -skip qtactiveqt \ + -no-icu \ + -feature-dbus \ + -no-feature-printsupport \ + -no-feature-sql \ + -system-tiff \ + -system-zlib \ + -openssl-linked \ + -qt-webp \ + -no-jasper \ + -no-mng \ + -no-feature-designer \ + -feature-linguist \ + -no-feature-assistant \ + -no-feature-distancefieldgenerator \ + -no-feature-kmap2qmap \ + -no-feature-pixeltool \ + -no-feature-qdbus \ + -no-feature-qdoc \ + -no-feature-qtattributionsscanner \ + -no-feature-qtdiag \ + -no-feature-qtplugininfo \ + -- \ + -DCMAKE_MODULE_PATH=${QT_DEPENDENCY_MODULE_PATH} \ + -DOPENSSL_USE_STATIC_LIBS=TRUE" +else + # Preserve the source layout used by the legacy Linux aarch64 git target. + BUILD_ROOT="${TEMP_FOLDER}/src" + QTARRAY="qtbase,qtimageformats,qtsvg,qttranslations,qtwayland" + QT_PLATFORM_OPTS="-no-icu" +fi BUILD_PATH="${TEMP_FOLDER}/build" echo ${BUILD_PATH} @@ -77,7 +126,7 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -opensource \ -xcb \ -confirm-license \ - -no-icu" + ${QT_PLATFORM_OPTS}" ${BUILD_ROOT}/configure ${_OPTS} if [ $? -ne 0 ] diff --git a/package-system/Qt/build-windows.bat b/package-system/Qt/build-windows.bat index 47219b92..269d85bb 100644 --- a/package-system/Qt/build-windows.bat +++ b/package-system/Qt/build-windows.bat @@ -10,9 +10,10 @@ REM REM Set these before running the script if not defined VCVARS_PATH set VCVARS_PATH="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -if not defined QTARRAY set QTARRAY=qtbase,qtimageformats,qtsvg,qttranslations +if not defined QTARRAY set QTARRAY=qtbase,qtimageformats,qtsvg,qttools,qttranslations REM TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script +set QT_SOURCE_ROOT=%TEMP_FOLDER%\src\qt-everywhere-src-6.11.2.tar\qt-everywhere-src-6.11.2 set CHECKS_FAILED=0 for %%P IN (VCVARS_PATH,TEMP_FOLDER,TARGET_INSTALL_ROOT) do ( if not exist !%%P! ( @@ -42,6 +43,8 @@ cd b set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ -submodules %QTARRAY% ^ + -skip qtdeclarative ^ + -skip qtactiveqt ^ -platform win32-msvc ^ -nomake examples ^ -nomake tests ^ @@ -53,9 +56,26 @@ set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ -confirm-license ^ -opengl dynamic ^ -openssl-linked ^ + -no-dbus ^ + -no-feature-printsupport ^ + -no-feature-sql ^ + -qt-webp ^ + -no-jasper ^ + -no-mng ^ + -no-feature-designer ^ + -feature-linguist ^ + -no-feature-assistant ^ + -no-feature-distancefieldgenerator ^ + -no-feature-kmap2qmap ^ + -no-feature-pixeltool ^ + -no-feature-qdbus ^ + -no-feature-qdoc ^ + -no-feature-qtattributionsscanner ^ + -no-feature-qtdiag ^ + -no-feature-qtplugininfo ^ -- -Wno-dev -cmd /c ""..\3p-package-source\source\package-system\Qt\temp\src\configure.bat" %_OPTS%" || goto FAILURE +cmd /c ""%QT_SOURCE_ROOT%\configure.bat" %_OPTS%" || goto FAILURE cmd /c cmake --build . --parallel || goto FAILURE diff --git a/package-system/Qt/build_config.json b/package-system/Qt/build_config.json index 4ff8b47a..fdcb23a5 100644 --- a/package-system/Qt/build_config.json +++ b/package-system/Qt/build_config.json @@ -1,7 +1,4 @@ { - "git_url": "https://github.com/qt/qt5.git", - "git_tag": "6.10.2", - "git_commit": "abfb3788bcfd08d6192899eb39a8ff34d7546da8", "package_name": "qt", "package_url": "https://www.qt.io/", "package_license": "LGPL-3.0", @@ -11,8 +8,11 @@ "Platforms": { "Windows": { "Windows": { + "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", + "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", + "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", "patch_file": "recursion-check.patch", - "package_version": "6.10.2-rev5", + "package_version": "6.11.2-rev1", "depends_on_packages": [ ["OpenSSL-1.1.1o-rev1-windows", "52b9d2bc5f3e0c6e405a0f290d1904bf545acc0c73d6a52351247d917c4a06d2", ""], ["tiff-4.2.0.15-rev3-windows", "c6000a906e6d2a0816b652e93dfbeab41c9ed73cdd5a613acd53e553d0510b60", ""], @@ -28,6 +28,10 @@ }, "Darwin": { "Mac": { + "git_url": "https://github.com/o3de/qt5.git", + "git_tag": "5.15.1-o3de", + "git_commit": "b3a1a6947422928e8aecb14ad607199e9720d266", + "package_license_file": "qt/LICENSE.LGPLv3", "cmake_find_source": "FindQt.cmake.mac", "package_version": "5.15.2-rev8", "patch_file": "qt-mac.patch", @@ -43,9 +47,12 @@ ] }, "Mac-arm64": { + "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", + "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", + "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", "patch_file": "recursion-check.patch", "cmake_find_source": "FindQt.cmake", - "package_version": "6.10.2-rev6", + "package_version": "6.11.2-rev1", "custom_build_cmd": [ "./build-darwin-arm64.sh" ], @@ -56,8 +63,11 @@ }, "Linux": { "Linux": { + "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", + "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", + "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", "patch_file": "recursion-check.patch", - "package_version": "6.10.2-rev8", + "package_version": "6.11.2-rev1", "depends_on_packages": [ ["OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", ""], ["tiff-4.2.0.15-rev3-linux", "2377f48b2ebc2d1628d9f65186c881544c92891312abe478a20d10b85877409a", ""], @@ -74,7 +84,11 @@ "python3", "copy_platform_cmakes.py" ] }, - "Linux-aarch64": { + "Linux-aarch64": { + "git_url": "https://github.com/o3de/qt5.git", + "git_tag": "5.15.1-o3de", + "git_commit": "b3a1a6947422928e8aecb14ad607199e9720d266", + "package_license_file": "qt/LICENSE.LGPLv3", "package_version": "5.15.2-rev10", "patch_file": "qt-linux.patch", "depends_on_packages": [ diff --git a/package-system/Qt/recursion-check.patch b/package-system/Qt/recursion-check.patch index 13558047..98dea9e8 100644 --- a/package-system/Qt/recursion-check.patch +++ b/package-system/Qt/recursion-check.patch @@ -1,8 +1,8 @@ Submodule qtbase contains modified content -diff --git a/qtbase/cmake/QtPublicCMakeHelpers.cmake b/qtbase/cmake/QtPublicCMakeHelpers.cmake +diff --git a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake index 3074998c2c9..e22a6b79a1f 100644 ---- a/qtbase/cmake/QtPublicCMakeHelpers.cmake -+++ b/qtbase/cmake/QtPublicCMakeHelpers.cmake +--- a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake ++++ b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake @@ -226,8 +226,19 @@ function(_qt_internal_collect_buildsystem_targets result dir) if(NOT _qt_internal_collect_buildsystem_targets_inner) set(${result} "") diff --git a/package_build_list_host_darwin-arm64.json b/package_build_list_host_darwin-arm64.json index d36b12df..c74f5727 100644 --- a/package_build_list_host_darwin-arm64.json +++ b/package_build_list_host_darwin-arm64.json @@ -29,7 +29,7 @@ "poly2tri-7f0487a-rev1-mac-arm64": "package-system/poly2tri/build_package_image.py --platform-name mac-arm64", "pyside6-6.10.2-py3.10-rev5-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside6 --platform-name Mac-arm64 --clean", "python-3.10.13-rev1-mac-arm64": "package-system/python/build_package_image.py", - "qt-6.10.2-rev6-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac-arm64 --clean", + "qt-6.11.2-rev1-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac-arm64 --clean", "SPIRVCross-1.3.275.0-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac-arm64 --clean", "squish-ccr-deb557d-rev1-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac-arm64 --clean", "SQLite-3.37.2-rev2-mac-arm64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac-arm64 --clean", @@ -63,7 +63,7 @@ "poly2tri-7f0487a-rev1-mac-arm64": "package-system/poly2tri-mac-arm64", "pyside6-6.10.2-py3.10-rev5-mac-arm64": "package-system/pyside6/temp/pyside6-mac-arm64", "python-3.10.13-rev1-mac-arm64": "package-system/python/darwin_arm64/package", - "qt-6.10.2-rev6-mac-arm64": "package-system/Qt/temp/qt-mac-arm64", + "qt-6.11.2-rev1-mac-arm64": "package-system/Qt/temp/qt-mac-arm64", "SPIRVCross-1.3.275.0-rev2-mac-arm64": "package-system/SPIRVCross/temp/SPIRVCross-mac-arm64", "squish-ccr-deb557d-rev1-mac-arm64": "package-system/squish-ccr/temp/squish-ccr-mac-arm64", "SQLite-3.37.2-rev2-mac-arm64": "package-system/sqlite/temp/SQLite-mac-arm64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index ffc7bfef..7b0f2725 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -46,7 +46,7 @@ "python-3.10.13-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean", "python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py", - "qt-6.10.2-rev8-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean", + "qt-6.11.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean", "zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean", "lz4-1.9.4-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/lz4 --platform-name Linux --package-root ../../package-system/lz4/temp --clean", "expat-2.4.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Linux --package-root ../../package-system/expat/temp --clean", @@ -97,7 +97,7 @@ "unwind-1.2.1-linux": "package-system/unwind-linux", "SQLite-3.37.2-rev1-linux": "package-system/SQLite-linux", "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform", - "qt-6.10.2-rev8-linux": "package-system/Qt/temp/qt-linux", + "qt-6.11.2-rev1-linux": "package-system/Qt/temp/qt-linux", "zlib-1.2.11-rev5-linux": "package-system/zlib-linux", "lz4-1.9.4-rev2-linux": "package-system/lz4/temp/lz4-linux", "expat-2.4.2-rev2-linux": "package-system/expat/temp/expat-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 30de7211..d79d9e6e 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -54,7 +54,7 @@ "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", "pyside6-6.10.2-py3.10-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside6 --platform-name Windows --clean", "python-3.10.13-rev1-windows": "package-system/python/build_package_image.py", - "qt-6.10.2-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean", + "qt-6.11.2-rev1-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", "SPIRVCross-1.3.275.0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean", "SQLite-3.37.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Windows --package-root ../../package-system --clean", @@ -127,7 +127,7 @@ "pyside2-5.15.2.1-py3.10-rev3-windows": "package-system/pyside2/temp/pyside2-windows", "pyside6-6.10.2-py3.10-rev5-windows": "package-system/pyside6/temp/pyside6-windows", "python-3.10.13-rev1-windows": "package-system/python/win_x64/package", - "qt-6.10.2-rev5-windows": "package-system/Qt/temp/qt-windows", + "qt-6.11.2-rev1-windows": "package-system/Qt/temp/qt-windows", "RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform", "RapidXML-1.13-rev1-multiplatform": "package-system/RapidXML-multiplatform", "SPIRVCross-1.3.275.0-rev1-windows": "package-system/SPIRVCross-windows", From 5bfbdf7f2aa4d8d1d6e79271a4d8ca7b501ba64a Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Thu, 20 Aug 2026 23:36:52 -0600 Subject: [PATCH 02/13] Remove Qt5 Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- Scripts/extras/pull_and_build_from_git.py | 4 +- package-system/Qt/FindQt.cmake.mac | 290 ---- package-system/Qt/QT-NOTICE.TXT | 2 +- package-system/Qt/README.md | 20 +- package-system/Qt/build-darwin.sh | 105 -- package-system/Qt/build-linux.sh | 97 +- package-system/Qt/build_config.json | 48 +- package-system/Qt/qt-mac.patch | 13 - package-system/pyside2/Dockerfile | 96 -- package-system/pyside2/Findpyside2.cmake | 237 --- package-system/pyside2/LICENSES.txt | 1341 ----------------- package-system/pyside2/README.md | 5 - package-system/pyside2/__init__.py | 0 package-system/pyside2/build-linux.sh | 242 --- package-system/pyside2/build_config.json | 66 - package-system/pyside2/build_windows.bat | 102 -- package-system/pyside2/docker_build_linux.sh | 115 -- package-system/pyside2/package_linux.sh | 24 - package-system/pyside2/package_windows.bat | 121 -- package-system/pyside2/pyside2-5.15.2.1.patch | 229 --- package-system/pyside2/pyside2-tools.patch | 39 - package-system/pyside2/setup.py | 52 - package-system/pyside6/build_windows.bat | 6 +- package_build_list_host_darwin.json | 2 - package_build_list_host_linux-aarch64.json | 6 +- package_build_list_host_linux.json | 4 - package_build_list_host_windows.json | 2 - 27 files changed, 65 insertions(+), 3203 deletions(-) delete mode 100644 package-system/Qt/FindQt.cmake.mac delete mode 100755 package-system/Qt/build-darwin.sh delete mode 100644 package-system/Qt/qt-mac.patch delete mode 100644 package-system/pyside2/Dockerfile delete mode 100644 package-system/pyside2/Findpyside2.cmake delete mode 100644 package-system/pyside2/LICENSES.txt delete mode 100644 package-system/pyside2/README.md delete mode 100644 package-system/pyside2/__init__.py delete mode 100755 package-system/pyside2/build-linux.sh delete mode 100644 package-system/pyside2/build_config.json delete mode 100644 package-system/pyside2/build_windows.bat delete mode 100755 package-system/pyside2/docker_build_linux.sh delete mode 100755 package-system/pyside2/package_linux.sh delete mode 100644 package-system/pyside2/package_windows.bat delete mode 100644 package-system/pyside2/pyside2-5.15.2.1.patch delete mode 100644 package-system/pyside2/pyside2-tools.patch delete mode 100644 package-system/pyside2/setup.py diff --git a/Scripts/extras/pull_and_build_from_git.py b/Scripts/extras/pull_and_build_from_git.py index 8c783a95..a7d60885 100644 --- a/Scripts/extras/pull_and_build_from_git.py +++ b/Scripts/extras/pull_and_build_from_git.py @@ -37,7 +37,7 @@ * package_name : The base name of the package, used for constructing the filename and folder structures * package_url : The package url that will be placed in the PackageInfo.json * package_license : The type of license that will be described in the PackageInfo.json -* package_license_file : The source-relative license file path. This can be overridden for an individual target platform. +* package_license_file : The source-relative path to the package license file The following keys can exist at the root level or the target-platform level: @@ -266,6 +266,7 @@ def __init__(self, build_config, target_platform_name, target_platform_config): self.package_name = build_config["package_name"] self.package_url = build_config["package_url"] self.package_license = build_config["package_license"] + self.package_license_file = build_config["package_license_file"] except KeyError as e: raise BuildError(f"Invalid build config. Missing required key : {str(e)}") @@ -275,7 +276,6 @@ def _get_value(value_key, required=True, default=None): raise BuildError(f"Required key '{value_key}' not found in build config") return result - self.package_license_file = _get_value("package_license_file") self.git_url = _get_value("git_url", required=False) self.git_tag = _get_value("git_tag", required=False) self.src_package_url = _get_value("src_package_url", required=False) diff --git a/package-system/Qt/FindQt.cmake.mac b/package-system/Qt/FindQt.cmake.mac deleted file mode 100644 index 5839baf7..00000000 --- a/package-system/Qt/FindQt.cmake.mac +++ /dev/null @@ -1,290 +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 -# -# - -if(TARGET 3rdParty::Qt::Core) # Check we are not called multiple times - return() -endif() - -set(QT_PACKAGE_NAME qt) - -set(QT_PATH "${CMAKE_CURRENT_LIST_DIR}/qt" CACHE STRING "The root path to Qt" FORCE) -mark_as_advanced(QT_PATH) -if(NOT EXISTS ${QT_PATH}) - message(FATAL_ERROR "Cannot find 3rdParty library ${QT_PACKAGE_NAME} on path ${QT_PATH}") -endif() - -# Force-set QtCore's version here to ensure CMake detects Qt's existence and allows AUTOMOC to work -set(Qt5Core_VERSION_MAJOR "5" CACHE STRING "Qt's major version" FORCE) -set(Qt5Core_VERSION_MINOR "15" CACHE STRING "Qt's minor version" FORCE) -set(Qt5Core_VERSION_PATCH "2" CACHE STRING "Qt's patch version" FORCE) -mark_as_advanced(Qt5Core_VERSION_MAJOR) -mark_as_advanced(Qt5Core_VERSION_MINOR) -mark_as_advanced(Qt5Core_VERSION_PATCH) - -set(QT5_COMPONENTS - Core - Concurrent - Gui - LinguistTools - Network - OpenGL - Svg - Test - Widgets - Xml -) - -include(${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}/Qt_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) - -list(APPEND CMAKE_PREFIX_PATH ${QT_LIB_PATH}/cmake/Qt5) - -# Clear the cache for found DIRs -unset(Qt5_DIR CACHE) -foreach(component ${QT5_COMPONENTS}) - unset(Qt5${component}_DIR CACHE) -endforeach() -unset(Qt5Positioning_DIR CACHE) -unset(Qt5PrintSupport_DIR CACHE) -unset(Qt5Qml_DIR CACHE) -unset(Qt5QmlModels_DIR CACHE) -unset(Qt5Quick_DIR CACHE) - -# Populate the Qt5 configurations -find_package(Qt5 - COMPONENTS ${QT5_COMPONENTS} - REQUIRED - NO_CMAKE_PACKAGE_REGISTRY -) - -# Now create libraries that wrap the dependency so we can refer to them in our format -foreach(component ${QT5_COMPONENTS}) - if(TARGET Qt5::${component}) - - # Convert the includes to system includes - get_target_property(system_includes Qt5::${component} INTERFACE_INCLUDE_DIRECTORIES) - set_target_properties(Qt5::${component} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "") # Clear it in case someone refers to it - ly_target_include_system_directories(TARGET Qt5::${component} - INTERFACE - ${system_includes} - ${QT_PATH}/include - ) - - # Alias the target with our prefix - add_library(3rdParty::Qt::${component} ALIAS Qt5::${component}) - mark_as_advanced(Qt5${component}_DIR) # Hiding from GUI - - # Qt only has debug and release, we map the configurations we use in o3de. We map all the configurations - # except debug to release - foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) - string(TOUPPER ${conf} UCONF) - ly_qt_configuration_mapping(${UCONF} MAPPED_CONF) - set_target_properties(Qt5::${component} PROPERTIES - MAP_IMPORTED_CONFIG_${UCONF} ${MAPPED_CONF} - ) - endforeach() - - endif() -endforeach() - -# Some extra DIR variables we want to hide from GUI -mark_as_advanced(Qt5_DIR) # Hiding from GUI -mark_as_advanced(Qt5LinguistTools_DIR) # Hiding from GUI, this variable comes from the LinguistTools module -mark_as_advanced(Qt5Positioning_DIR) -mark_as_advanced(Qt5PrintSupport_DIR) -mark_as_advanced(Qt5Qml_DIR) -mark_as_advanced(Qt5QmlModels_DIR) -mark_as_advanced(Qt5Quick_DIR) - -# Special case for Qt::Gui, we are using the private headers... -ly_target_include_system_directories(TARGET Qt5::Gui - INTERFACE "${Qt5Gui_PRIVATE_INCLUDE_DIRS}" -) - -# Another special case: Qt:Widgets, we are also using private headers -ly_target_include_system_directories(TARGET Qt5::Widgets - INTERFACE "${Qt5Widgets_PRIVATE_INCLUDE_DIRS}" -) - -# Qt plugins/translations/aux files. -# We create libraries that wraps them so they get deployed properly. -# This used to be deployed through winqtdeploy/macqtdeploy, however, those tools -# are old and unmaintaned, macqtdeploy takes long times to run -add_library(3rdParty::Qt::Core::Translations INTERFACE IMPORTED GLOBAL) -file(GLOB tranlation_files ${QT_PATH}/translations/qt_*.qm) -if(tranlation_files) - ly_add_target_files(TARGETS 3rdParty::Qt::Core::Translations - FILES ${tranlation_files} - OUTPUT_SUBDIRECTORY translations - ) -endif() -ly_add_dependencies(Qt5::Core 3rdParty::Qt::Core::Translations) - -# plugins, each platform will define the files it has and the OUTPUT_SUBDIRECTORY -set(QT_PLUGINS - Network - Gui - Widgets -) -foreach(plugin ${QT_PLUGINS}) - add_library(3rdParty::Qt::${plugin}::Plugins INTERFACE IMPORTED GLOBAL) - ly_add_dependencies(Qt5::${plugin} 3rdParty::Qt::${plugin}::Plugins) -endforeach() -include(${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}/QtPlugin_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) - -# UIC executable -unset(QT_UIC_EXECUTABLE CACHE) -find_program(QT_UIC_EXECUTABLE uic HINTS "${QT_PATH}/bin") -mark_as_advanced(QT_UIC_EXECUTABLE) # Hiding from GUI - -# RCC executable -unset(AUTORCC_EXECUTABLE CACHE) -find_program(AUTORCC_EXECUTABLE rcc HINTS "${QT_PATH}/bin") -mark_as_advanced(AUTORCC_EXECUTABLE) # Hiding from GUI -set(Qt5Core_RCC_EXECUTABLE "${AUTORCC_EXECUTABLE}" CACHE FILEPATH "Qt's resource compiler, used by qt5_add_resources" FORCE) -mark_as_advanced(Qt5Core_RCC_EXECUTABLE) # Hiding from GUI - -# LRELEASE executable -unset(QT_LRELEASE_EXECUTABLE CACHE) -find_program(QT_LRELEASE_EXECUTABLE lrelease HINTS "${QT_PATH}/bin") -mark_as_advanced(QT_LRELEASE_EXECUTABLE) # Hiding from GUI -if(NOT QT_LRELEASE_EXECUTABLE) - message(FATAL_ERROR "Qt's lrelease executbale not found") -endif() -set(Qt5_LRELEASE_EXECUTABLE "${QT_LRELEASE_EXECUTABLE}" CACHE FILEPATH "Qt's lrelease executable, used by qt5_add_translation" FORCE) -mark_as_advanced(Qt5_LRELEASE_EXECUTABLE) # Hiding from GUI - -#! ly_qt_uic_target: handles qt's ui files by injecting uic generation -# -# AUTOUIC has issues to detect changes in UIC files and trigger regeneration: -# https://gitlab.kitware.com/cmake/cmake/-/issues/18741 -# So instead, we are going to manually wrap the files. We dont use qt5_wrap_ui because -# it outputs to ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h and we want to follow the -# same folder structure that AUTOUIC uses -# -function(ly_qt_uic_target TARGET) - - get_target_property(all_ui_sources ${TARGET} SOURCES) - list(FILTER all_ui_sources INCLUDE REGEX "^.*\\.ui$") - if(NOT all_ui_sources) - message(FATAL_ERROR "Target ${TARGET} contains AUTOUIC but doesnt have any .ui file") - endif() - - if(AUTOGEN_BUILD_DIR) - set(gen_dir ${AUTOGEN_BUILD_DIR}) - else() - set(gen_dir ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_autogen/include) - endif() - - foreach(ui_source ${all_ui_sources}) - - get_filename_component(filename ${ui_source} NAME_WE) - get_filename_component(dir ${ui_source} DIRECTORY) - if(IS_ABSOLUTE ${dir}) - file(RELATIVE_PATH dir ${CMAKE_CURRENT_SOURCE_DIR} ${dir}) - endif() - - set(outfolder ${gen_dir}/${dir}) - set(outfile ${outfolder}/ui_${filename}.h) - get_filename_component(infile ${ui_source} ABSOLUTE) - - file(MAKE_DIRECTORY ${outfolder}) - add_custom_command(OUTPUT ${outfile} - COMMAND ${QT_UIC_EXECUTABLE} -o ${outfile} ${infile} - MAIN_DEPENDENCY ${infile} VERBATIM - COMMENT "UIC ${infile}" - ) - - set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC TRUE) - set_source_files_properties(${outfile} PROPERTIES - SKIP_AUTOMOC TRUE - SKIP_AUTOUIC TRUE - GENERATED TRUE - ) - list(APPEND all_ui_wrapped_sources ${outfile}) - - endforeach() - - # Add files to the target - target_sources(${TARGET} PRIVATE ${all_ui_wrapped_sources}) - source_group("Generated Files" FILES ${all_ui_wrapped_sources}) - - # Add include directories relative to the generated folder - # query for the property first to avoid the "NOTFOUND" in a list - get_property(has_includes TARGET ${TARGET} PROPERTY INCLUDE_DIRECTORIES SET) - if(has_includes) - get_property(all_include_directories TARGET ${TARGET} PROPERTY INCLUDE_DIRECTORIES) - foreach(dir ${all_include_directories}) - if(IS_ABSOLUTE ${dir}) - file(RELATIVE_PATH dir ${CMAKE_CURRENT_SOURCE_DIR} ${dir}) - endif() - list(APPEND new_includes ${gen_dir}/${dir}) - endforeach() - endif() - list(APPEND new_includes ${gen_dir}) - target_include_directories(${TARGET} PRIVATE ${new_includes}) - -endfunction() - -#! ly_add_translations: adds translations (ts) to a target. -# -# This wrapper will generate a qrc file with those translations and add the files under "prefix" and add them to -# the indicated targets. These files will be added under the "Generated Files" filter -# -# \arg:TARGETS name of the targets that the translations will be added to -# \arg:PREFIX prefix where the translation will be located within the qrc file -# \arg:FILES translation files to add -# -function(ly_add_translations) - - set(options) - set(oneValueArgs PREFIX) - set(multiValueArgs TARGETS FILES) - - cmake_parse_arguments(ly_add_translations "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - # Validate input arguments - if(NOT ly_add_translations_TARGETS) - message(FATAL_ERROR "You must provide at least one target") - endif() - if(NOT ly_add_translations_FILES) - message(FATAL_ERROR "You must provide at least a translation file") - endif() - - qt5_add_translation(TRANSLATED_FILES ${ly_add_translations_FILES}) - - set(qrc_file_contents -" - -") - foreach(file ${TRANSLATED_FILES}) - get_filename_component(filename ${file} NAME) - string(APPEND qrc_file_contents " ${filename} -") - endforeach() - string(APPEND qrc_file_contents " - -") - set(qrc_file_path ${CMAKE_CURRENT_BINARY_DIR}/i18n_${ly_add_translations_PREFIX}.qrc) - file(WRITE - ${qrc_file_path} - ${qrc_file_contents} - ) - set_source_files_properties( - ${TRANSLATED_FILES} - ${qrc_file_path} - PROPERTIES - GENERATED TRUE - SKIP_AUTORCC TRUE - ) - qt5_add_resources(RESOURCE_FILE ${qrc_file_path}) - - foreach(target ${ly_add_translations_TARGETS}) - target_sources(${target} PRIVATE "${TRANSLATED_FILES};${qrc_file_path};${RESOURCE_FILE}") - endforeach() - -endfunction() diff --git a/package-system/Qt/QT-NOTICE.TXT b/package-system/Qt/QT-NOTICE.TXT index 35f14cf0..8b3e582f 100644 --- a/package-system/Qt/QT-NOTICE.TXT +++ b/package-system/Qt/QT-NOTICE.TXT @@ -1,4 +1,4 @@ The O3DE Editor includes components of Qt, http://www.qt-project.org/, that are licensed under Version 3 of the GNU Lesser General Public License. Source code for the Qt distributions used in O3DE can be found here: https://o3de-legal-prod.s3-us-west-2.amazonaws.com/LicenseConformance/Qt/Src.zip -Qt also includes a number of third party components that are licensed under other license terms; for details see https://doc.qt.io/qt-5/licenses-used-in-qt.html. +Qt also includes a number of third party components that are licensed under other license terms; for details see https://doc.qt.io/qt-6/licenses-used-in-qt.html. diff --git a/package-system/Qt/README.md b/package-system/Qt/README.md index ca57a813..d059652a 100644 --- a/package-system/Qt/README.md +++ b/package-system/Qt/README.md @@ -18,11 +18,8 @@ The archive is verified with SHA-1 `7e15dbb24d8d390b04fb53bb7397a2f625608132`. | --- | --- | | Windows x64 | `qt-6.11.2-rev1-windows` | | Linux x86_64 | `qt-6.11.2-rev1-linux` | +| Linux aarch64 | `qt-6.11.2-rev1-linux-aarch64` | | macOS arm64 | `qt-6.11.2-rev1-mac-arm64` | -| macOS Intel (legacy) | `qt-5.15.2-rev8-mac` | -| Linux aarch64 (legacy) | `qt-5.15.2-rev10-linux-aarch64` | - -The legacy Qt 5 targets continue to use the O3DE Qt git repository. ## Qt 6 build contents @@ -30,18 +27,18 @@ All active targets build `qtbase`, `qtsvg`, `qtimageformats`, `qttools`, and `qt The package includes the Qt Widgets libraries used by O3DE, UiTools, `moc`, `uic`, `rcc`, `lupdate`, and `lrelease`. The WebP and TIFF image plugins remain enabled. Qt Widgets Designer, JasPer, MNG, SQL, PrintSupport, and selected unused qttools applications are disabled. DBus and Wayland integration are enabled only for Linux. -The Linux x86_64 build resolves TIFF, zlib, and OpenSSL through the corresponding O3DE dependency packages and forces Qt to use them instead of silently selecting bundled or host-system copies. +The Linux builds resolve TIFF, zlib, and OpenSSL through the corresponding architecture-specific O3DE dependency packages and force Qt to use them instead of silently selecting bundled or host-system copies. QtCanvasPainter is not included. Its open-source licensing and dependency on QtDeclarative are incompatible with this package configuration. ## Updating -When changing build inputs without changing the Qt release, increment the platform-specific revision. When changing the upstream Qt release, update: +When changing build inputs without changing the Qt release, increment the package revision. When changing the upstream Qt release, update: - `src_package_url`, `src_package_sha1`, and `package_version` in `build_config.json` - The archive source paths in the active platform build scripts and `recursion-check.patch` - The forced Qt version in `FindQt.cmake` -- The matching keys in each active host package build list +- The matching keys in each host package build list Package names follow `qt-${package_version}-${platform}`. @@ -61,15 +58,14 @@ python ..\3p-package-scripts\o3de_package_scripts\build_package.py --search_path python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-linux ``` -### macOS arm64 +### Linux aarch64 ```bash -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-mac-arm64 +python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-linux-aarch64 ``` -### Legacy targets +### macOS arm64 ```bash -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-5.15.2-rev8-mac -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-5.15.2-rev10-linux-aarch64 +python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-mac-arm64 ``` diff --git a/package-system/Qt/build-darwin.sh b/package-system/Qt/build-darwin.sh deleted file mode 100755 index 52ef613b..00000000 --- a/package-system/Qt/build-darwin.sh +++ /dev/null @@ -1,105 +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 -# - -set -euo pipefail - -# Limit Ninja jobs lower to avoid out of memory issues build qtwebengine -export NINJAJOBS=-j12 -MAKE_FLAGS=-j32 - -# Only Xcodebuilder 10.x or 11.x are known to build this version of Qt on mac successfully -XCODEBUILD_VERSION=`xcodebuild -version | grep Xcode | awk '{print $2}'` -XCODEBUILD_VERSION_MAJOR=`echo $XCODEBUILD_VERSION | awk -F. '{print $1}'` -echo Xcodebuild version $XCODEBUILD_VERSION detected. -if [ $XCODEBUILD_VERSION_MAJOR -gt "11" ]; then - echo Error: Xcodebuild version $XCODEBUILD_VERSION detected. Only Xcodebuild version 10 or 11 have been tested with this version of Qt - exit 1 -elif [ $XCODEBUILD_VERSION_MAJOR -lt "10" ]; then - echo Error: Xcodebuild version $XCODEBUILD_VERSION detected. Only Xcodebuild version 10 or 11 have been tested with this version of Qt - exit 1 -fi - -# TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script - -# Base the Tiff of the dependent tiff O3DE package (static) -TIFF_PREFIX=$TEMP_FOLDER/tiff-4.2.0.15-rev3-mac/tiff -TIFF_INCDIR=$TIFF_PREFIX/include -TIFF_LIBDIR=$TIFF_PREFIX/lib - -# We need to also bring in the zlib dependency since Tiff is a static lib dependency -ZLIB_PREFIX=$TEMP_FOLDER/zlib-1.2.11-rev5-mac/zlib -ZLIB_INCDIR=$ZLIB_PREFIX/include -ZLIB_LIBDIR=$ZLIB_PREFIX/lib - -BUILD_PATH=$TEMP_FOLDER/build - -[[ -d $BUILD_PATH ]] || mkdir $BUILD_PATH -cd $BUILD_PATH - -echo Configuring Qt... -../src/configure \ --prefix ${TARGET_INSTALL_ROOT} \ --opensource \ --nomake examples \ --nomake tests \ --confirm-license \ --no-icu \ --dbus \ --no-separate-debug-info \ --release \ --force-debug-info \ --qt-libpng \ --qt-libjpeg \ --no-feature-vnc \ --no-feature-linuxfb \ ---tiff=system \ --qt-zlib \ --v \ --no-cups \ --no-glib \ --no-feature-renameat2 \ --no-feature-getentropy \ --no-feature-statx \ --no-egl \ --I $TIFF_INCDIR \ --I $ZLIB_INCDIR \ --L $TIFF_LIBDIR \ --L $ZLIB_LIBDIR - -echo Qt configured, building modules... -qtarray=(qtbase qtgraphicaleffects qtimageformats qtsvg qttools qtmacextras qttranslations) - -for qtlib in "${qtarray[@]}"; do - echo Building $qtlib... - make module-$qtlib $MAKE_FLAGS - echo Built $qtlib. -done - -echo Finished building modules, installing... -for qtlib in "${qtarray[@]}"; do - echo Installing $qtlib... - make module-$qtlib-install_subtargets - echo $qtlib installed. -done - -# The installation target on darwin is not installing the framework's header paths in the main -# include folder. Create a symlink to the headers there for backwards compatibility -cd $TARGET_INSTALL_ROOT/include - -qtframeworks=(QtConcurrent QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtMacExtras QtNetwork QtOpenGL QtPrintSupport QtQml QtQmlModels QtQmlWorkerScript QtQuick QtQuickParticles QtQuickShapes QtQuickTest QtQuickWidgets QtSql QtSvg QtTest QtUiPlugin QtWidgets QtXml QtZlib) -for qtframework in "${qtframeworks[@]}"; do - if [ -d $TARGET_INSTALL_ROOT/lib/$qtframework.framework/Headers ]; then - echo "Linking ${TARGET_INSTALL_ROOT}/lib/${qtframework}.framework/Headers/ to ${TARGET_INSTALL_ROOT}/include/${qtframework}" - ln -s ../lib/$qtframework.framework/Headers/ $qtframework - else - echo "Unable to find $TARGET_INSTALL_ROOT/lib/${qtframework}.framework/Headers (${qtframework}) Skipping.." - fi -done - -echo Qt installed successfully! diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index 2076e25f..6f205bd3 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -21,8 +21,8 @@ OPENSSL_FOLDER_NAME=$3 # Determine the host architecture CURRENT_HOST_ARCH=$(uname -m) -# Use the host architecture if not supplied -TARGET_ARCH=${4:-$(uname -m)} +# Arg 4: The target architecture +TARGET_ARCH=$4 # If the host and target architecture does not match, we stop if [ "${CURRENT_HOST_ARCH}" != ${TARGET_ARCH} ] @@ -59,57 +59,48 @@ sudo apt-get install -y libfontconfig1-dev \ libxcb-xinerama0-dev \ libxrender-dev -QT6_ARCHIVE_ROOT="${TEMP_FOLDER}/src/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2" -if [ -d "${QT6_ARCHIVE_ROOT}" ] -then - BUILD_ROOT="${QT6_ARCHIVE_ROOT}" - QTARRAY="qtbase,qtimageformats,qtsvg,qttools,qttranslations,qtwayland" - - TIFF_PACKAGE_ROOT="${TEMP_FOLDER}/${TIFF_FOLDER_NAME}" - ZLIB_PACKAGE_ROOT="${TEMP_FOLDER}/${ZLIB_FOLDER_NAME}" - OPENSSL_PACKAGE_ROOT="${TEMP_FOLDER}/${OPENSSL_FOLDER_NAME}" - for DEPENDENCY_ROOT in "${TIFF_PACKAGE_ROOT}" "${ZLIB_PACKAGE_ROOT}" "${OPENSSL_PACKAGE_ROOT}" - do - if [ ! -d "${DEPENDENCY_ROOT}" ] - then - echo "Required Qt dependency package not found: ${DEPENDENCY_ROOT}" - exit 1 - fi - done - - QT_DEPENDENCY_MODULE_PATH="${TIFF_PACKAGE_ROOT};${ZLIB_PACKAGE_ROOT};${OPENSSL_PACKAGE_ROOT}" - QT_PLATFORM_OPTS="-skip qtdeclarative \ - -skip qtactiveqt \ - -no-icu \ - -feature-dbus \ - -no-feature-printsupport \ - -no-feature-sql \ - -system-tiff \ - -system-zlib \ - -openssl-linked \ - -qt-webp \ - -no-jasper \ - -no-mng \ - -no-feature-designer \ - -feature-linguist \ - -no-feature-assistant \ - -no-feature-distancefieldgenerator \ - -no-feature-kmap2qmap \ - -no-feature-pixeltool \ - -no-feature-qdbus \ - -no-feature-qdoc \ - -no-feature-qtattributionsscanner \ - -no-feature-qtdiag \ - -no-feature-qtplugininfo \ - -- \ - -DCMAKE_MODULE_PATH=${QT_DEPENDENCY_MODULE_PATH} \ - -DOPENSSL_USE_STATIC_LIBS=TRUE" -else - # Preserve the source layout used by the legacy Linux aarch64 git target. - BUILD_ROOT="${TEMP_FOLDER}/src" - QTARRAY="qtbase,qtimageformats,qtsvg,qttranslations,qtwayland" - QT_PLATFORM_OPTS="-no-icu" -fi +BUILD_ROOT="${TEMP_FOLDER}/src/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2" +QTARRAY="qtbase,qtimageformats,qtsvg,qttools,qttranslations,qtwayland" + +TIFF_PACKAGE_ROOT="${TEMP_FOLDER}/${TIFF_FOLDER_NAME}" +ZLIB_PACKAGE_ROOT="${TEMP_FOLDER}/${ZLIB_FOLDER_NAME}" +OPENSSL_PACKAGE_ROOT="${TEMP_FOLDER}/${OPENSSL_FOLDER_NAME}" +for DEPENDENCY_ROOT in "${TIFF_PACKAGE_ROOT}" "${ZLIB_PACKAGE_ROOT}" "${OPENSSL_PACKAGE_ROOT}" +do + if [ ! -d "${DEPENDENCY_ROOT}" ] + then + echo "Required Qt dependency package not found: ${DEPENDENCY_ROOT}" + exit 1 + fi +done + +QT_DEPENDENCY_MODULE_PATH="${TIFF_PACKAGE_ROOT};${ZLIB_PACKAGE_ROOT};${OPENSSL_PACKAGE_ROOT}" +QT_PLATFORM_OPTS="-skip qtdeclarative \ + -skip qtactiveqt \ + -no-icu \ + -feature-dbus \ + -no-feature-printsupport \ + -no-feature-sql \ + -system-tiff \ + -system-zlib \ + -openssl-linked \ + -qt-webp \ + -no-jasper \ + -no-mng \ + -no-feature-designer \ + -feature-linguist \ + -no-feature-assistant \ + -no-feature-distancefieldgenerator \ + -no-feature-kmap2qmap \ + -no-feature-pixeltool \ + -no-feature-qdbus \ + -no-feature-qdoc \ + -no-feature-qtattributionsscanner \ + -no-feature-qtdiag \ + -no-feature-qtplugininfo \ + -- \ + -DCMAKE_MODULE_PATH=${QT_DEPENDENCY_MODULE_PATH} \ + -DOPENSSL_USE_STATIC_LIBS=TRUE" BUILD_PATH="${TEMP_FOLDER}/build" echo ${BUILD_PATH} diff --git a/package-system/Qt/build_config.json b/package-system/Qt/build_config.json index fdcb23a5..ecb7f775 100644 --- a/package-system/Qt/build_config.json +++ b/package-system/Qt/build_config.json @@ -2,17 +2,16 @@ "package_name": "qt", "package_url": "https://www.qt.io/", "package_license": "LGPL-3.0", - "package_license_file": "LICENSES/LGPL-3.0-only.txt", + "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", + "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", + "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", + "patch_file": "recursion-check.patch", + "package_version": "6.11.2-rev1", "cmake_find_source": "FindQt.cmake", "cmake_find_target": "FindQt.cmake", "Platforms": { "Windows": { "Windows": { - "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", - "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", - "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", - "patch_file": "recursion-check.patch", - "package_version": "6.11.2-rev1", "depends_on_packages": [ ["OpenSSL-1.1.1o-rev1-windows", "52b9d2bc5f3e0c6e405a0f290d1904bf545acc0c73d6a52351247d917c4a06d2", ""], ["tiff-4.2.0.15-rev3-windows", "c6000a906e6d2a0816b652e93dfbeab41c9ed73cdd5a613acd53e553d0510b60", ""], @@ -27,32 +26,8 @@ } }, "Darwin": { - "Mac": { - "git_url": "https://github.com/o3de/qt5.git", - "git_tag": "5.15.1-o3de", - "git_commit": "b3a1a6947422928e8aecb14ad607199e9720d266", - "package_license_file": "qt/LICENSE.LGPLv3", - "cmake_find_source": "FindQt.cmake.mac", - "package_version": "5.15.2-rev8", - "patch_file": "qt-mac.patch", - "depends_on_packages": [ - ["tiff-4.2.0.15-rev3-mac", "c2615ccdadcc0e1d6c5ed61e5965c4d3a82193d206591b79b805c3b3ff35a4bf", ""], - ["zlib-1.2.11-rev5-mac", "b6fea9c79b8bf106d4703b67fecaa133f832ad28696c2ceef45fb5f20013c096", ""] - ], - "custom_build_cmd": [ - "./build-darwin.sh" - ], - "custom_install_cmd": [ - "{python}", "copy_platform_cmakes.py" - ] - }, "Mac-arm64": { - "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", - "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", - "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", - "patch_file": "recursion-check.patch", "cmake_find_source": "FindQt.cmake", - "package_version": "6.11.2-rev1", "custom_build_cmd": [ "./build-darwin-arm64.sh" ], @@ -63,11 +38,6 @@ }, "Linux": { "Linux": { - "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", - "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", - "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", - "patch_file": "recursion-check.patch", - "package_version": "6.11.2-rev1", "depends_on_packages": [ ["OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", ""], ["tiff-4.2.0.15-rev3-linux", "2377f48b2ebc2d1628d9f65186c881544c92891312abe478a20d10b85877409a", ""], @@ -85,12 +55,6 @@ ] }, "Linux-aarch64": { - "git_url": "https://github.com/o3de/qt5.git", - "git_tag": "5.15.1-o3de", - "git_commit": "b3a1a6947422928e8aecb14ad607199e9720d266", - "package_license_file": "qt/LICENSE.LGPLv3", - "package_version": "5.15.2-rev10", - "patch_file": "qt-linux.patch", "depends_on_packages": [ ["OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", ""], ["tiff-4.2.0.15-rev3-linux-aarch64", "429461014b21a530dcad597c2d91072ae39d937a04b7bbbf5c34491c41767f7f", ""], @@ -104,7 +68,7 @@ "aarch64" ], "custom_install_cmd": [ - "{python}", "copy_platform_cmakes.py" + "python3", "copy_platform_cmakes.py" ] } } diff --git a/package-system/Qt/qt-mac.patch b/package-system/Qt/qt-mac.patch deleted file mode 100644 index 9cbaff40..00000000 --- a/package-system/Qt/qt-mac.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/qtimageformats/src/imageformats/configure.json b/qtimageformats/src/imageformats/configure.json -index 5b876c3..f2fa1cc 100644 ---- a/qtimageformats/src/imageformats/configure.json -+++ b/qtimageformats/src/imageformats/configure.json -@@ -85,7 +85,7 @@ - }, - "sources": [ - { "type": "pkgConfig", "args": "libtiff-4" }, -- { "libs": "-ltiff" } -+ { "libs": "-ltiff -lz" } - ] - }, - "webp": { diff --git a/package-system/pyside2/Dockerfile b/package-system/pyside2/Dockerfile deleted file mode 100644 index c4d65027..00000000 --- a/package-system/pyside2/Dockerfile +++ /dev/null @@ -1,96 +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 -# - -# This docker file uses ubuntu 20.04 as the base image so that the AWS Native C++ libraries will use OpenSSL 3 as the base -# for its dependencies -# - -# The cpu architecture to base the docker base script from -ARG INPUT_ARCHITECTURE=amd64 - -# The root to base the docker script base from -ARG INPUT_IMAGE=ubuntu:20.04 - -ARG PYTHON_FOLDER_NAME -ARG QT_FOLDER_NAME -ARG DOCKER_BUILD_SCRIPT - -FROM ${INPUT_ARCHITECTURE}/${INPUT_IMAGE} - -ARG INPUT_ARCHITECTURE -ARG INPUT_IMAGE - -ARG PYTHON_FOLDER_NAME -ARG QT_FOLDER_NAME -ARG DOCKER_BUILD_SCRIPT - -WORKDIR /data/workspace - -# Initilize apt cache -RUN apt-get clean && apt-get update - -# Setup time zone and locale data (necessary for SSL and HTTPS packages) -# RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata locales keyboard-configuration -RUN apt-get -y install tzdata locales keyboard-configuration - -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - dpkg-reconfigure --frontend=noninteractive locales && \ - update-locale LANG=en_US.UTF-8 - -ENV LANG=en_US.UTF-8 - - -# Install the development packages needed to build Qt from source -RUN apt-get install -y cmake \ - build-essential \ - clang-12 \ - llvm-12 \ - git \ - libgl1-mesa-dev \ - libpcre2-dev \ - chrpath - -RUN apt-get install -y libclang-12-dev - -RUN apt upgrade -y - -# Prepare a target folder within the container to install the build artifacts tp -RUN mkdir -p /data/workspace/build && \ - mkdir -p /data/workspace/src - -run git config --global --add safe.directory /data/workspace/src && \ - git config --global --add safe.directory /data/workspace/src/sources/pyside2-tools - -ENV PYTHON_FOLDER_NAME=${PYTHON_FOLDER_NAME} -ENV QT_FOLDER_NAME=${QT_FOLDER_NAME} -ENV LLVM_INSTALL_DIR=/usr/lib/llvm-12 -ENV LLVM_CONFIG=/usr/bin/llvm-config-12 - -# The 3P package for python has some embedded paths from the host machine that was -# used to build it, and pyside2 extracts these paths to deduce the include and lib -# paths. To work around this and make it appear that the dependent 3P python package -# was installed in this docker sctructure, we will instead create a symlink from the -# 3p package's original path to the actual one mapped to the workspace path -RUN if [ "${INPUT_ARCHITECTURE}" = "aarch64" ]; then \ - mkdir -p /home/ubuntu/github/3p-package-source/package-system/python/linux_aarch64/package && \ - cd /home/ubuntu/github/3p-package-source/package-system/python/linux_aarch64/package && \ - ln -s /data/workspace/${PYTHON_FOLDER_NAME}/python python; \ - else \ - mkdir -p /home/github/3p-package-source/package-system/python/linux_x64/package && \ - cd /home/github/3p-package-source/package-system/python/linux_x64/package && \ - ln -s /data/workspace/${PYTHON_FOLDER_NAME}/python python; \ - fi - -# Copy the build script specific to this Docker script in order to execute the build -ARG CACHEBUST=1 - -COPY ${DOCKER_BUILD_SCRIPT} /data/workspace/ -COPY src /data/workspace/src/ -COPY ${PYTHON_FOLDER_NAME} /data/workspace/${PYTHON_FOLDER_NAME}/ -COPY ${QT_FOLDER_NAME} /data/workspace/${QT_FOLDER_NAME}/ - -ENTRYPOINT ["/bin/bash"] diff --git a/package-system/pyside2/Findpyside2.cmake b/package-system/pyside2/Findpyside2.cmake deleted file mode 100644 index 1a2ee985..00000000 --- a/package-system/pyside2/Findpyside2.cmake +++ /dev/null @@ -1,237 +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() - -# Install the pyside2 site-packages into Python -add_library(${TARGET_WITH_NAMESPACE} SHARED IMPORTED GLOBAL) - -set(PYSIDE_BASE_PATH ${CMAKE_CURRENT_LIST_DIR}/pyside2) - -# In addition to the libraries, create a Pyside2::Tools library that handles the shiboken and pyside2-lupdate executables that are part -# of the pyside2 package -set(${MY_NAME}_BIN_DIR ${PYSIDE_BASE_PATH}/bin) -set(${MY_NAME}_LIB_DIR ${PYSIDE_BASE_PATH}/lib) -set(${MY_NAME}_INCLUDE_DIR ${PYSIDE_BASE_PATH}/include) - -if (PAL_PLATFORM_NAME STREQUAL "Windows") - ly_pip_install_local_package_editable(${${MY_NAME}_LIB_DIR}/site-packages pyside2) -elseif (PAL_PLATFORM_NAME STREQUAL "Linux") - ly_pip_install_local_package_editable(${PYSIDE_BASE_PATH}/lib/python3.10/site-packages pyside2) -endif() - -if (PAL_PLATFORM_NAME STREQUAL "Linux") - set(${MY_NAME}_RUNTIME_DEPENDENCIES - ${${MY_NAME}_LIB_DIR}/libpyside2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}.5.15.2.1 - ${${MY_NAME}_LIB_DIR}/libpyside2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}.5.15 - ${${MY_NAME}_LIB_DIR}/libpyside2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX} - ${${MY_NAME}_LIB_DIR}/libshiboken2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}.5.15.2.1 - ${${MY_NAME}_LIB_DIR}/libshiboken2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}.5.15 - ${${MY_NAME}_LIB_DIR}/libshiboken2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX} - ) - - ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES}) -endif() - -ly_target_include_system_directories(TARGET ${TARGET_WITH_NAMESPACE} - INTERFACE - ${${MY_NAME}_INCLUDE_DIR} - ${${MY_NAME}_INCLUDE_DIR}/PySide2 - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtConcurrent - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtCore - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtGui - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtNetwork - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtOpenGL - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtOpenGLFunctions - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtSql - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtSvg - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtWidgets - ${${MY_NAME}_INCLUDE_DIR}/PySide2/QtXml -) - -if (PAL_PLATFORM_NAME STREQUAL "Windows") - set_target_properties(${TARGET_WITH_NAMESPACE} PROPERTIES - ${MY_NAME}_SHARE_DIR ${CMAKE_CURRENT_LIST_DIR}/pyside2/share - IMPORTED_IMPLIB "${${MY_NAME}_LIB_DIR}/site-packages/PySide2/pyside2.abi3${CMAKE_STATIC_LIBRARY_SUFFIX}" - IMPORTED_LOCATION "${${MY_NAME}_LIB_DIR}/site-packages/PySide2/pyside2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}" - IMPORTED_IMPLIB_DEBUG "${${MY_NAME}_LIB_DIR}/site-packages/PySide2/pyside2_d.cp310-win_amd64${CMAKE_STATIC_LIBRARY_SUFFIX}" - IMPORTED_LOCATION_DEBUG "${${MY_NAME}_LIB_DIR}/site-packages/PySide2/pyside2_d.cp310-win_amd64${CMAKE_SHARED_LIBRARY_SUFFIX}" - ) -elseif (PAL_PLATFORM_NAME STREQUAL "Linux") - set_target_properties(${TARGET_WITH_NAMESPACE} PROPERTIES - ${MY_NAME}_SHARE_DIR ${CMAKE_CURRENT_LIST_DIR}/pyside2/share - IMPORTED_LOCATION "${${MY_NAME}_LIB_DIR}/libpyside2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}" - IMPORTED_LOCATION_DEBUG "${${MY_NAME}_LIB_DIR}/libpyside2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}" - ) -endif() - -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 -) - -if (PAL_PLATFORM_NAME STREQUAL "Windows") - set(${MY_NAME}_TOOLS_DEPENDENCIES - ${${MY_NAME}_BIN_DIR}/libclang.dll - ) -endif() - -add_library(${MY_NAME}::Tools SHARED IMPORTED GLOBAL) - -ly_add_target_files(TARGETS ${MY_NAME}::Tools FILES - ${${MY_NAME}_TOOLS_BINARIES} - ${${MY_NAME}_TOOLS_DEPENDENCIES} - ${${MY_NAME}_TOOLS_PYTHON_SCRIPTS} -) - -ly_target_include_system_directories(TARGET ${MY_NAME}::Tools - INTERFACE ${${MY_NAME}_INCLUDE_DIR}/shiboken2 -) - -if (PAL_PLATFORM_NAME STREQUAL "Windows") - set_target_properties(${MY_NAME}::Tools PROPERTIES - IMPORTED_IMPLIB "${${MY_NAME}_LIB_DIR}/site-packages/shiboken2/shiboken2.abi3${CMAKE_STATIC_LIBRARY_SUFFIX}" - IMPORTED_LOCATION "${${MY_NAME}_LIB_DIR}/site-packages/shiboken2/shiboken2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}" - IMPORTED_IMPLIB_DEBUG "${${MY_NAME}_LIB_DIR}/site-packages/shiboken2/shiboken2_d.cp310-win_amd64${CMAKE_STATIC_LIBRARY_SUFFIX}" - IMPORTED_LOCATION_DEBUG "${${MY_NAME}_LIB_DIR}/site-packages/shiboken2/shiboken2_d.cp310-win_amd64${CMAKE_SHARED_LIBRARY_SUFFIX}" - ) -elseif (PAL_PLATFORM_NAME STREQUAL "Linux") - set_target_properties(${MY_NAME}::Tools PROPERTIES - IMPORTED_LOCATION "${${MY_NAME}_LIB_DIR}/libshiboken2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}" - IMPORTED_LOCATION_DEBUG "${${MY_NAME}_LIB_DIR}/libshiboken2.abi3${CMAKE_SHARED_LIBRARY_SUFFIX}" - ) -endif() - -add_library(${TARGET_WITH_NAMESPACE}::Tools ALIAS ${MY_NAME}::Tools) - -# Add shiboken generator exe tool. -add_executable(${MY_NAME}::ShibokenTool IMPORTED GLOBAL) -set_target_properties(${MY_NAME}::ShibokenTool PROPERTIES IMPORTED_LOCATION "${${MY_NAME}_BIN_DIR}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}") -add_executable(${TARGET_WITH_NAMESPACE}::ShibokenTool ALIAS ${MY_NAME}::ShibokenTool) - -function(add_shiboken_project) - set(oneValueArgs MODULE_NAME NAMESPACE NAME WRAPPED_HEADER TYPESYSTEM_FILE GENERATED_FILES LICENSE_HEADER) - set(multiValueArgs INCLUDE_DIRS DEPENDENCIES) - cmake_parse_arguments(add_shiboken_project "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) - - # Validate arguments - if (NOT add_shiboken_project_MODULE_NAME) - message(FATAL_ERROR "You must provide a module name matching the package name in the xml typesystem file. This is the name of the output Python module.") - endif() - - if(NOT add_shiboken_project_WRAPPED_HEADER) - message(FATAL_ERROR "You must provide a header file containing all headers to be reflected.") - endif() - - if(NOT add_shiboken_project_TYPESYSTEM_FILE) - message(FATAL_ERROR "You must provide a typesystem file containing all items to be reflected.") - endif() - - if(NOT add_shiboken_project_GENERATED_FILES) - message(FATAL_ERROR "You must provide a cmake file containing all the cpp files that will be generated.") - endif() - - # Include generated_files: this should define the GENERATED_FILES list. - include(${add_shiboken_project_GENERATED_FILES}) - if(NOT GENERATED_FILES) - message(FATAL_ERROR "You must provide a GENERATED_FILES list.") - endif() - - # Reformat the include dirs array to add in "-I" to each entry, or shiboken won't work. - list(TRANSFORM add_shiboken_project_INCLUDE_DIRS PREPEND "-I") - - # Reformat the generated files list to prepend the containing folder. - list(TRANSFORM GENERATED_FILES PREPEND "${CMAKE_CURRENT_BINARY_DIR}/${add_shiboken_project_MODULE_NAME}/") - - get_property(SHARE_DIR TARGET 3rdParty::pyside2 PROPERTY pyside2_SHARE_DIR) - - # Allow AUTOMOC/AUTOUIC on generated files. - if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) - endif() - set(CMAKE_AUTOMOC ON) - - set(shiboken_options --generator-set=shiboken --enable-parent-ctor-heuristic - --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero - --avoid-protected-hack --language-level=c++17 --debug-level=full - --license-file=${add_shiboken_project_LICENSE_HEADER} - ${add_shiboken_project_INCLUDE_DIRS} - -T${SHARE_DIR}/PySide2 - -T${SHARE_DIR}/PySide2/typesystems - --output-directory=${CMAKE_CURRENT_BINARY_DIR} - ) - - set(generated_sources_dependencies ${add_shiboken_project_WRAPPED_HEADER} ${add_shiboken_project_TYPESYSTEM_FILE}) - - # Custom shiboken command to generate wrapped files. Set the working directory to qt/bin so that shiboken can load necessary dlls. - add_custom_command( - OUTPUT ${GENERATED_FILES} - COMMAND 3rdParty::pyside2::ShibokenTool ${shiboken_options} ${add_shiboken_project_WRAPPED_HEADER} ${add_shiboken_project_TYPESYSTEM_FILE} - DEPENDS ${generated_sources_dependencies} 3rdParty::pyside2 - COMMENT "Running generator for ${add_shiboken_project_TYPESYSTEM_FILE}." - WORKING_DIRECTORY ${QT_PATH}/bin - VERBATIM - ) - - # Set up the project for building the code generated by shiboken. - ly_add_target( - NAME ${add_shiboken_project_NAME}.Editor MODULE - NAMESPACE add_shiboken_project_NAMESPACE - OUTPUT_NAME ${add_shiboken_project_MODULE_NAME} - # We need to provide a FILES_CMAKE, but as the files do not yet exist, project creation would fail if it actually - # had a FILES list. The files are actually added in by the following TARGET_SOURCES step. - FILES_CMAKE - ${add_shiboken_project_GENERATED_FILES} - BUILD_DEPENDENCIES - PUBLIC - 3rdParty::pyside2 - Qt5::Widgets - Qt5::Core - Qt5::Widgets - Qt5::Gui - ${add_shiboken_project_DEPENDENCIES} - PRIVATE - 3rdParty::pyside2::Tools - ) - - ly_create_alias(NAME ${add_shiboken_project_NAME}.Builders NAMESPACE add_shiboken_project_NAMESPACE TARGETS ${add_shiboken_project_NAME}.Editor) - ly_create_alias(NAME ${add_shiboken_project_NAME}.Tools NAMESPACE add_shiboken_project_NAMESPACE TARGETS ${add_shiboken_project_NAME}.Builders) - - target_sources(${add_shiboken_project_NAME}.Editor PRIVATE ${GENERATED_FILES}) - - # Building the wrapper files will not work with a unity build. - set_target_properties(${add_shiboken_project_NAME}.Editor PROPERTIES UNITY_BUILD OFF) - - if (PAL_PLATFORM_NAME STREQUAL "Windows") - # Append _d to the module name in a debug build. - set_target_properties(${add_shiboken_project_NAME}.Editor PROPERTIES DEBUG_POSTFIX "_d") - - # Disable various warnings in shiboken generated wrapper code. - #"conditional expression is constant" - #"unreferenced formal parameter" - #"declaration of 'x' hides previous local declaration." - #"declaration of 'x' hides class member." - target_compile_options(${add_shiboken_project_NAME}.Editor PRIVATE /wd4127 /wd4100 /wd4456 /wd4458) - endif() - - # Fix the name of the module. - set_property(TARGET ${add_shiboken_project_NAME}.Editor PROPERTY PREFIX "") - set_property(TARGET ${add_shiboken_project_NAME}.Editor PROPERTY SUFFIX ".pyd") - - set_target_properties(${add_shiboken_project_NAME}.Editor PROPERTIES LINK_FLAGS "${python_additional_link_flags}") -endfunction() - -set(${MY_NAME}_FOUND True) diff --git a/package-system/pyside2/LICENSES.txt b/package-system/pyside2/LICENSES.txt deleted file mode 100644 index d18f36e6..00000000 --- a/package-system/pyside2/LICENSES.txt +++ /dev/null @@ -1,1341 +0,0 @@ - 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. - 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. - 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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 -. - - 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 -. -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. - - 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. diff --git a/package-system/pyside2/README.md b/package-system/pyside2/README.md deleted file mode 100644 index 220b3907..00000000 --- a/package-system/pyside2/README.md +++ /dev/null @@ -1,5 +0,0 @@ - -Python 3.10 support - - -- _Py_Mangle is no longer exposed for use with PySide2 . \ No newline at end of file diff --git a/package-system/pyside2/__init__.py b/package-system/pyside2/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/package-system/pyside2/build-linux.sh b/package-system/pyside2/build-linux.sh deleted file mode 100755 index 9afcbd78..00000000 --- a/package-system/pyside2/build-linux.sh +++ /dev/null @@ -1,242 +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 - -# This script will utilize Docker to build on either AMD64 or AARCH64 architectures. - - -DOCKER_BUILD_SCRIPT=docker_build_linux.sh -TARGET_BUILD_FOLDER=build - -# -# Collect the required arguments for this ubuntu docker-base build script -# - -# Get the base docker image name -DOCKER_IMAGE_NAME_BASE=$1 -if [ "${DOCKER_IMAGE_NAME_BASE}" == "" ] -then - echo "Missing argument 1: Docker image name for this this process" - exit 1 -fi - -# Get the ubuntu base version (16.04|18.04|20.04|22.04) -UBUNTU_BASE=$2 -if [ "${UBUNTU_BASE}" == "" ] -then - echo "Missing argument 2: Ubuntu docker tag" - exit 1 -fi - -# Determine the host architecture -CURRENT_HOST_ARCH=$(uname -m) - -# Use the host architecture if not supplied -TARGET_ARCH=${3:-$(uname -m)} - -# Recompute the DOWNLOADED_PACKAGE_FOLDERS to apply to $WORKSPACE/temp inside the Docker script -DEP_PACKAGES_FOLDERNAMES_ONLY=${DOWNLOADED_PACKAGE_FOLDERS//$TEMP_FOLDER\//} -DEP_PACKAGES_DOCKER_FOLDERNAMES=${DOWNLOADED_PACKAGE_FOLDERS//$TEMP_FOLDER/"/data/workspace/temp"} - -echo "Executing docker-based build from the following arguments" -echo " DOCKER_IMAGE_NAME_BASE = ${DOCKER_IMAGE_NAME_BASE}" -echo " UBUNTU_BASE = ${UBUNTU_BASE}" -echo " DOCKER_BUILD_SCRIPT = ${DOCKER_BUILD_SCRIPT}" -echo " TARGET_BUILD_FOLDER = ${TARGET_BUILD_FOLDER}" -echo " TARGET_ARCH = ${TARGET_ARCH}" -echo " TEMP_FOLDER = ${TEMP_FOLDER}" -echo " DOWNLOADED_PACKAGE_FOLDERS = ${DEP_PACKAGES_FOLDERNAMES_ONLY}" - -# -# Make sure docker is installed -# -DOCKER_VERSION=$(docker --version) -if [ $? -ne 0 ] -then - echo "Required package docker is not installed" - echo "Follow instructions on https://docs.docker.com/engine/install/ubuntu/ to install docker properly" - exit 1 -fi -echo "Detected Docker Version $DOCKER_VERSION" - -# -# Check the target architecture and determine if the necessary cross compilation requirements are met -# - -# If the host and target architecture does not match, make sure the necessary cross compilation packages are installed -if [ "${CURRENT_HOST_ARCH}" != ${TARGET_ARCH} ] -then - echo "Checking cross compiling requirements." - for package_check in docker-ce qemu binfmt-support qemu-user-static - do - echo "Checking package $package_check" - dpkg -s $package_check > /dev/null 2>&1 - if [ $? -ne 0 ] - then - echo "" - echo "Missing package $package_check. Make sure to install it with your local package manager." - echo "" - exit 1 - fi - done - - # Only cross compilation of an ARM64 image on an x86_64 host is supported - if [ "${TARGET_ARCH}" = "aarch64" ] - then - # Make sure qemu-aarch64 is installed properly - QEMU_AARCH_COUNT=$(update-binfmts --display | grep qemu-aarch64 | wc -l) - if [ $QEMU_AARCH_COUNT -eq 0 ] - then - echo "" - echo "QEMU aarch64 binary format not registered." - echo "Run the following command to register" - echo "" - echo "sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes" - echo "" - exit 1 - fi - echo "" - echo "Cross compiling aarch64 on an amd64 machine validated." - echo "" - fi -else - echo "Building ${TARGET_ARCH} natively." -fi - - -# Setup the docker arguments -if [ "${TARGET_ARCH}" = "x86_64" ] -then - echo "Processing Docker for amd64" - - DOCKER_INPUT_ARCHITECTURE=amd64 - TARGET_DOCKER_PLATFORM_ARG=linux/amd64 - PYTHON_FOLDER_NAME=python-3.10.13-rev2-linux - QT_FOLDER_NAME=qt-5.15.2-rev9-linux - -elif [ "${TARGET_ARCH}" = "aarch64" ] -then - echo "Processing Docker for aarch64" - - DOCKER_INPUT_ARCHITECTURE=arm64v8 - TARGET_DOCKER_PLATFORM_ARG=linux/arm64/v8 - PYTHON_FOLDER_NAME=python-3.10.13-rev2-linux-aarch64 - QT_FOLDER_NAME=qt-5.15.2-rev9-linux-aarch64 - -else - echo "Unsupported architecture ${TARGET_ARCH}" - exit 1 -fi - -# Build the Docker Image -DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME_BASE}_${DOCKER_INPUT_ARCHITECTURE}_3p -echo DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME} - -DOCKER_IMAGE_NAME=pyside2_linux_3p -PYSIDE2_TOOL_PATCH=pyside2-tools.patch - -echo "Using dependent 3rd Party Library ${PYTHON_FOLDER_NAME}" -echo "Using dependent 3rd Party Library ${QT_FOLDER_NAME}" - -# Prepare the docker file and use the temp folder as the context root -cp ${DOCKER_BUILD_SCRIPT} temp/ - -pushd temp - -# An additional patch needs to be applied since pyside-tools -pushd src/sources/pyside2-tools -PYSIDE_TOOLS_PATCH_FILE=${BASE_ROOT}/pyside2-tools.patch -echo Applying patch $PYSIDE_TOOLS_PATCH_FILE to pyside-tools -git apply --ignore-whitespace ../../../../$PYSIDE2_TOOL_PATCH -if [ $? -eq 0 ]; then - echo "Patch applied" -else - echo "Git apply failed" - popd - exit $retVal -fi -popd - -popd - -# Build the Docker Image -echo "Building the docker build script for ${DOCKER_IMAGE_NAME_BASE} on ${DOCKER_INPUT_ARCHITECTURE} for Ubuntu $1" -echo "" - -CMD_DOCKER_BUILD="\ -docker build --build-arg INPUT_DOCKER_BUILD_SCRIPT=${DOCKER_BUILD_SCRIPT}\ - --build-arg INPUT_ARCHITECTURE=${DOCKER_INPUT_ARCHITECTURE}\ - --build-arg INPUT_IMAGE=ubuntu:${UBUNTU_BASE}\ - --build-arg PYTHON_FOLDER_NAME=\"${PYTHON_FOLDER_NAME}\"\ - --build-arg QT_FOLDER_NAME=\"${QT_FOLDER_NAME}\"\ - --build-arg DOCKER_BUILD_SCRIPT=\"${DOCKER_BUILD_SCRIPT}\"\ - -f Dockerfile -t ${DOCKER_IMAGE_NAME}:latest temp" - -echo "CWD=$(pwd)" -echo $CMD_DOCKER_BUILD -eval $CMD_DOCKER_BUILD - -if [ $? -ne 0 ] -then - echo "Error occurred creating Docker image ${DOCKER_IMAGE_NAME}:latest." - exit 1 -fi - - -# Capture the Docker Image ID -IMAGE_ID=$(docker images -q ${DOCKER_IMAGE_NAME}:latest) -if [ -z $IMAGE_ID ] -then - echo "Error: Cannot find Image ID for ${DOCKER_IMAGE_NAME}" - exit 1 -fi - -# Run the Docker Image -echo "Running build script in the docker image" - -echo docker run -it --platform ${TARGET_DOCKER_PLATFORM_ARG} --tty ${DOCKER_IMAGE_NAME}:latest /data/workspace/$DOCKER_BUILD_SCRIPT -docker run --platform ${TARGET_DOCKER_PLATFORM_ARG} --tty ${DOCKER_IMAGE_NAME}:latest /data/workspace/$DOCKER_BUILD_SCRIPT -if [ $? -ne 0 ] -then - echo Failed to build from docker image ${DOCKER_IMAGE_NAME}:latest - exit 1 -fi - -# Capture the container ID -echo "Capturing the Container ID" -CONTAINER_ID=$(docker container ls -l -q --filter "ancestor=${DOCKER_IMAGE_NAME}:latest") -if [ -z $CONTAINER_ID ] -then - echo "Error: Cannot find Container ID for Image ${DOCKER_IMAGE_NAME}" - exit 1 -fi - -# Copy the build artifacts from the Docker Container -echo "Copying the built contents from the docker container for image ${DOCKER_IMAGE_NAME}" - -mkdir -p build -docker cp $CONTAINER_ID:/data/workspace/build/. $TARGET_INSTALL_ROOT -if [ $? -ne 0 ] -then - echo "Error occurred copying build artifacts from Docker image ${DOCKER_IMAGE_NAME}:latest." - exit 1 -fi - -# Clean up the docker image and container -echo "Cleaning up container" -docker container rm $CONTAINER_ID || (echo "Warning: unable to clean up container for image ${DOCKER_IMAGE_NAME}") - -echo "Cleaning up image" -docker rmi --force $IMAGE_ID || (echo "Warning: unable to clean up image ${DOCKER_IMAGE_NAME}") - -popd - -exit 0 - diff --git a/package-system/pyside2/build_config.json b/package-system/pyside2/build_config.json deleted file mode 100644 index f097b0e7..00000000 --- a/package-system/pyside2/build_config.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "git_url": "https://code.qt.io/pyside/pyside-setup", - "git_tag": "v5.15.2.1", - "package_name": "pyside2", - "package_version": "5.15.2.1-py3.10-rev7", - "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", - "custom_build_cmd": [ - "build_windows.bat" - ], - "custom_install_cmd": [ - "package_windows.bat" - ] - } - }, - "Linux": { - "Linux": { - "depends_on_packages" :[ - ["python-3.10.13-rev2-linux", "a7832f9170a3ac93fbe678e9b3d99a977daa03bb667d25885967e8b4977b86f8", ""], - ["qt-5.15.2-rev9-linux", "db4bcd2003262f4d8c7d7da832758824fc24e53da5895edef743f67a64a5c734", ""] - ], - "cmake_find_source": "Findpyside2.cmake", - "custom_build_cmd": [ - "./build-linux.sh", - "pyside2_5_15_2_1", - "20.04", - "x86_64" - ], - "custom_install_cmd": [ - "./package_linux.sh" - ] - }, - "Linux-aarch64": { - "depends_on_packages" :[ - ["python-3.10.13-rev2-linux-aarch64", "30bc2731e2ac54d8e22d36ab15e30b77aefe2dce146ef92d6f20adc0a9c5b14e", ""], - ["qt-5.15.2-rev9-linux-aarch64", "da80840ecd3f7a074edecbb3dedb1ff36c568cfe4943e18d9559e9fca9f151bc", ""] - ], - "cmake_find_source": "Findpyside2.cmake", - "custom_build_cmd": [ - "./build-linux.sh", - "pyside2_5_15_2_1", - "20.04", - "aarch64" - ], - "custom_install_cmd": [ - "./package_linux.sh" - ] - } - - } - } -} diff --git a/package-system/pyside2/build_windows.bat b/package-system/pyside2/build_windows.bat deleted file mode 100644 index 807902a4..00000000 --- a/package-system/pyside2/build_windows.bat +++ /dev/null @@ -1,102 +0,0 @@ -@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 diff --git a/package-system/pyside2/docker_build_linux.sh b/package-system/pyside2/docker_build_linux.sh deleted file mode 100755 index 2846792c..00000000 --- a/package-system/pyside2/docker_build_linux.sh +++ /dev/null @@ -1,115 +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 -# -# - -BASE_ROOT=/data/workspace -PACKAGE_BASE=${BASE_ROOT}/build -DEP_PYTHON_BASE=${BASE_ROOT}/${PYTHON_FOLDER_NAME} -DEP_QT_BASE=${BASE_ROOT}/${QT_FOLDER_NAME} - -echo "Using Python at ${DEP_PYTHON_BASE}" -echo "Using Qt at ${DEP_QT_BASE}" - -# Get the python executable from the package dependency -LOCAL_PYTHON3_BIN=${DEP_PYTHON_BASE}/python/bin/python3 -if [ ! -f $LOCAL_PYTHON3_BIN ] -then - echo "Required local 3P python not detected at ${LOCAL_PYTHON3_BIN}" - exit 1 -fi - -# Setup the local QT Paths -# Get the qt package's qmake location -LOCAL_3P_QTBUILD_PATH=${DEP_QT_BASE}/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 - -echo Sym-linking python -pushd ${BASE_ROOT}/build -ln -s ${DEP_PYTHON_BASE}/python python -popd - -echo Building source -pushd ${BASE_ROOT}/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 -if [ $? -ne 0 ] -then - echo "Error building shiobken2 package" - exit 1 -fi - -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=${BASE_ROOT}/src/pyside3a_install/py3.10-qt5.15.1-64bit-release/lib/cmake/Shiboken2-5.15.2. -$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=${BASE_ROOT}/src/pyside3a_install/py3.10-qt5.15.1-64bit-release/lib/cmake/Shiboken2-5.15.2.1 -if [ $? -ne 0 ] -then - echo "Error building pyside2 package" - exit 1 -fi - -popd - -echo PACKAGE_BASE=$PACKAGE_BASE -INSTALL_SOURCE=$BASE_ROOT/src/pyside3a_install/`ls $BASE_ROOT/src/pyside3a_install` -echo INSTALL_SOURCE=$INSTALL_SOURCE - -# Copy the LICENSE and README files -echo cp $BASE_ROOT/src/LICENSE.FDL $PACKAGE_BASE/ -cp $BASE_ROOT/src/LICENSE.FDL $PACKAGE_BASE/ -echo copy $BASE_ROOT/src/LICENSE.GPLv3 $PACKAGE_BASE/ -cp $BASE_ROOT/src/LICENSE.GPLv3 $PACKAGE_BASE/ -echo copy $BASE_ROOT/src/LICENSE.GPLv3-EXCEPT $PACKAGE_BASE/ -cp $BASE_ROOT/src/LICENSE.GPLv3-EXCEPT $PACKAGE_BASE/ -echo copy $BASE_ROOT/src/LICENSE.LGPLv3 $PACKAGE_BASE/ -cp $BASE_ROOT/src/LICENSE.LGPLv3 $PACKAGE_BASE/ -echo copy $BASE_ROOT/src/README.* $PACKAGE_BASE/ -cp $BASE_ROOT/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 - - -# RPATH fixes -# Note: 'patchelf' is not setting the RPATH correctly, and chrpath by itself cannot add, only change the rpath. -# So we are working around this by first using patchelf to create the (incorrect) RPATH, and then we can -# us chrpath to change the incorrect RPATH to the correct $ORIGIN one. -$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/lib/libpyside2.abi3.so.5.15.2.1 -chrpath -r \$ORIGIN $PACKAGE_BASE/lib/libpyside2.abi3.so.5.15.2.1 - -$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/lib/libshiboken2.abi3.so.5.15.2.1 -chrpath -r \$ORIGIN $PACKAGE_BASE/lib/libshiboken2.abi3.so.5.15.2.1 - -$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/lib/python3.10/site-packages/shiboken2/shiboken2.abi3.so -chrpath -r \$ORIGIN $PACKAGE_BASE/lib/python3.10/site-packages/shiboken2/shiboken2.abi3.so - -$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/bin/shiboken2 -chrpath -r \$ORIGIN $PACKAGE_BASE/bin/shiboken2 - -$BASE_ROOT/src/patchelf --force-rpath --set-rpath "\$ORIGIN" $PACKAGE_BASE/bin/pyside2-lupdate -chrpath -r \$ORIGIN "\$ORIGIN" $PACKAGE_BASE/bin/pyside2-lupdate - -# Remove the sym-link python to prevent it from being packaged up in the docker post processing. -pushd ${BASE_ROOT}/build -rm python -popd - -exit 0 diff --git a/package-system/pyside2/package_linux.sh b/package-system/pyside2/package_linux.sh deleted file mode 100755 index 10777e82..00000000 --- a/package-system/pyside2/package_linux.sh +++ /dev/null @@ -1,24 +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 -echo PACKAGE_BASE=$PACKAGE_BASE - -# 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/ -cp $TEMP_FOLDER/../LICENSES.txt $PACKAGE_BASE/ - -INSTALL_SOURCE=$TEMP_FOLDER/build -echo INSTALL_SOURCE=$INSTALL_SOURCE - -exit 0 diff --git a/package-system/pyside2/package_windows.bat b/package-system/pyside2/package_windows.bat deleted file mode 100644 index 74ce8574..00000000 --- a/package-system/pyside2/package_windows.bat +++ /dev/null @@ -1,121 +0,0 @@ -@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 diff --git a/package-system/pyside2/pyside2-5.15.2.1.patch b/package-system/pyside2/pyside2-5.15.2.1.patch deleted file mode 100644 index c3282482..00000000 --- a/package-system/pyside2/pyside2-5.15.2.1.patch +++ /dev/null @@ -1,229 +0,0 @@ -diff --git a/build_scripts/utils.py b/build_scripts/utils.py -index 0782ae036..53231ce14 100644 ---- a/build_scripts/utils.py -+++ b/build_scripts/utils.py -@@ -833,7 +833,7 @@ def ldd(executable_path): - chosen_rtld = None - # List of ld's considered by ldd on Ubuntu (here's hoping it's the - # same on all distros). -- rtld_list = ["/lib/ld-linux.so.2", "/lib64/ld-linux-x86-64.so.2", "/libx32/ld-linux-x32.so.2"] -+ rtld_list = ["/lib/ld-linux.so.2", "/lib64/ld-linux-x86-64.so.2", "/libx32/ld-linux-x32.so.2", "/lib/ld-linux-aarch64.so.1"] - - # Choose appropriate runtime dynamic linker. - for rtld in rtld_list: -diff --git a/sources/pyside2-tools b/sources/pyside2-tools ---- a/sources/pyside2-tools -+++ b/sources/pyside2-tools -@@ -1 +1 @@ --Subproject commit a8448837204faee0b457d1e2d4cbf574a2811114 -+Subproject commit a8448837204faee0b457d1e2d4cbf574a2811114-dirty -diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt -index e31c87eef..a8fdf731a 100644 ---- a/sources/pyside2/libpyside/CMakeLists.txt -+++ b/sources/pyside2/libpyside/CMakeLists.txt -@@ -1,13 +1,5 @@ - project(libpyside) - --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(${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() - - set(QML_PRIVATE_API_SUPPORT 0) --if(Qt${QT_MAJOR_VERSION}Qml_FOUND) -- # Used for registering custom QQuickItem classes defined in Python code. -- set(QML_SUPPORT 1) -- set(QML_INCLUDES ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS}) -- set(QML_LIBRARIES ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}) -- -- 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} ${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() --else() -- set(QML_SUPPORT 0) -- set(QML_PRIVATE_API_SUPPORT 0) -- set(QML_INCLUDES "") -- set(QML_LIBRARIES "") --endif() -+set(QML_SUPPORT 0) -+set(QML_INCLUDES "") -+set(QML_LIBRARIES "") - - set(libpyside_SRC - dynamicqmetaobject.cpp -diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp -index 219b99d48..f33e4f724 100644 ---- a/sources/pyside2/libpyside/pyside.cpp -+++ b/sources/pyside2/libpyside/pyside.cpp -@@ -414,7 +414,7 @@ static const char invalidatePropertyName[] = "_PySideInvalidatePtr"; - // class by walking up the meta objects. - static const char *typeName(QObject *cppSelf) - { -- const char *typeName = typeid(*cppSelf).name(); -+ const char *typeName = getTypeId(*cppSelf).name(); - if (!Shiboken::Conversions::getConverter(typeName)) { - for (auto metaObject = cppSelf->metaObject(); metaObject; metaObject = metaObject->superClass()) { - const char *name = metaObject->className(); -diff --git a/sources/pyside2/libpyside/pyside.h b/sources/pyside2/libpyside/pyside.h -index c1a298cc8..91e648f47 100644 ---- a/sources/pyside2/libpyside/pyside.h -+++ b/sources/pyside2/libpyside/pyside.h -@@ -50,12 +50,57 @@ - - #include - #include -+#include -+#include -+ -+#include -+#include - - struct SbkObjectType; - - namespace PySide - { - -+// Analog for std::type_info with the name field, to allow getTypeId to be used in lieu of typeid -+class TypeInfo -+{ -+private: -+ const char* m_name = nullptr; -+ -+public: -+ explicit TypeInfo(const char* name) : m_name(name) {} -+ const char* name() const { return m_name; } -+}; -+ -+// getTypeId returns an interface similar to the std::type_info returned by typeid, but will attempt to use -+// Qt's meta-object system for QObject subclasses instead - this allows Shiboken to interop with libraries that -+// are built without RTTI -+template -+const TypeInfo getTypeId(typename std::enable_if::value>::type* = 0) -+{ -+ const char* typeName = T::staticMetaObject.className(); -+ return TypeInfo(typeName); -+} -+ -+template -+const TypeInfo getTypeId(typename std::enable_if::value>::type* = 0) -+{ -+ return TypeInfo(typeid(T).name()); -+} -+ -+template -+const TypeInfo getTypeId(const T& t, typename std::enable_if::value>::type* = 0) -+{ -+ const char* typeName = t.metaObject() ? t.metaObject()->className() : T::staticMetaObject.className(); -+ return TypeInfo(typeName); -+} -+ -+template -+const TypeInfo getTypeId(const T& t, typename std::enable_if::value>::type* = 0) -+{ -+ return TypeInfo(typeid(t).name()); -+} -+ - PYSIDE_API void init(PyObject *module); - - /** -diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt -index 3de5d3223..8cc960e99 100644 ---- a/sources/shiboken2/CMakeLists.txt -+++ b/sources/shiboken2/CMakeLists.txt -@@ -78,7 +78,7 @@ if (NOT PYTHON_EXTENSION_SUFFIX) - get_python_extension_suffix() - endif() - --option(FORCE_LIMITED_API "Enable the limited API." "yes") -+option(FORCE_LIMITED_API "Enable the limited API." ON) - set(PYTHON_LIMITED_API 0) - - shiboken_check_if_limited_api() -diff --git a/sources/shiboken2/data/shiboken_helpers.cmake b/sources/shiboken2/data/shiboken_helpers.cmake -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) - OUTPUT_VARIABLE PYTHON_LIMITED_LIBRARIES - OUTPUT_STRIP_TRAILING_WHITESPACE) - -- if(FORCE_LIMITED_API STREQUAL "yes") -+ if(FORCE_LIMITED_API) - if (${PYTHON_VERSION_MAJOR} EQUAL 3 AND ${PYTHON_VERSION_MINOR} GREATER 4) - # 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 38b596a5f..1aed4286b 100644 ---- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp -+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp -@@ -59,7 +59,11 @@ static const char typeNameFunc[] = R"CPP( - template - static const char *typeNameOf(const T &t) - { -+#ifdef PYSIDE_H -+ const char *typeName = PySide::getTypeId(t).name(); -+#else - const char *typeName = typeid(t).name(); -+#endif //PYSIDE_H - auto size = std::strlen(typeName); - #if defined(Q_CC_MSVC) // MSVC: "class QPaintDevice * __ptr64" - if (auto lastStar = strchr(typeName, '*')) { -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(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 -+ - } - - /***************************************************************************** -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(address); diff --git a/package-system/pyside2/pyside2-tools.patch b/package-system/pyside2/pyside2-tools.patch deleted file mode 100644 index 8baf5ca0..00000000 --- a/package-system/pyside2/pyside2-tools.patch +++ /dev/null @@ -1,39 +0,0 @@ -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-rev8-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") diff --git a/package-system/pyside2/setup.py b/package-system/pyside2/setup.py deleted file mode 100644 index 06f5f61e..00000000 --- a/package-system/pyside2/setup.py +++ /dev/null @@ -1,52 +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 -# -# - -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 - -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' - - -if __name__ == '__main__': - if not PYTHON_64: - raise RuntimeError("32-bit Python is not a supported platform.") - - with README_FILE.open() as f: - long_description = f.read() - - setup( - name="pyside2", - version="5.15.2.1", - description='Pyside2', - long_description=long_description, - packages=['PySide2', 'shiboken2'], - install_requires=[ - ], - tests_require=[ - ], - entry_points={ - }, - ) - diff --git a/package-system/pyside6/build_windows.bat b/package-system/pyside6/build_windows.bat index 6dfee49a..1b90ed98 100644 --- a/package-system/pyside6/build_windows.bat +++ b/package-system/pyside6/build_windows.bat @@ -62,7 +62,7 @@ cd %TEMP_FOLDER%\src echo "Installing build dependencies" -ECHO Building Pyside2 (Release) +ECHO Building PySide6 (Release) set LLVM_INSTALL_DIR=%TEMP_FOLDER%\libclang-release_20.1.3-based-windows-vs2019_64\libclang set PATH=%LLVM_INSTALL_DIR%\bin;%PATH% @@ -77,9 +77,7 @@ call %TEMP_FOLDER%\testenv\Scripts\python.exe setup.py install ^ --limited-api=yes ^ --skip-modules=Quick,MultimediaWidgets,Pdf,PdfWidgets,Positioning,Location,NetworkAuth,Nfc,WebEngineQuick,Multimedia,QuickControls2,QuickTest,QuickWidgets,UiToolsPrivate,RemoteObjects,Positioning,Scxml,TextToSpeech,3DCore,3DRender,3DInput,3DLogic,3DAnimation,3DExtras,AxContainer if %ERRORLEVEL% NEQ 0 ( - echo "Failed to build pyside2 (release)" + echo "Failed to build PySide6 (release)" exit /B 1 ) exit /B 0 - - \ No newline at end of file diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index 3865f8e1..69c443ac 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -43,7 +43,6 @@ "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.2-rev1", "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac", "mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios", - "qt-5.15.2-rev8-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Mac --package-root ../../package-system/Qt/temp --clean", "zlib-1.2.11-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Mac --package-root ../../package-system --clean", "zlib-1.2.11-rev5-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean", "lz4-1.9.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/lz4 --platform-name Mac --package-root ../../package-system/lz4/temp --clean", @@ -97,7 +96,6 @@ "azslc-1.8.22-rev1-mac": "package-system/azslc/temp/azslc-mac", "SQLite-3.37.2-rev2-mac": "package-system/SQLite-mac", "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform", - "qt-5.15.2-rev8-mac": "package-system/Qt/temp/qt-mac", "zlib-1.2.11-rev5-mac": "package-system/zlib-mac", "zlib-1.2.11-rev5-ios": "package-system/zlib-ios", "lz4-1.9.4-rev1-mac": "package-system/lz4/temp/lz4-mac", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index 7ddd1efe..ad054354 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -32,9 +32,8 @@ "PhysX-5.1.1-rev4-linux-aarch64": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform-name linux-aarch64", "png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean", "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64", - "pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --clean", "python-3.10.13-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux-aarch64 --clean", - "qt-5.15.2-rev10-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean", + "qt-6.11.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean", "sdformat-16.0.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sdformat --platform-name Linux-aarch64 --clean", "SPIRVCross-1.3.275.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean", "SQLite-3.37.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Linux-aarch64 --clean", @@ -72,9 +71,8 @@ "PhysX-5.1.1-rev4-linux-aarch64": "package-system/PhysX5/temp/PhysX5-linux-aarch64", "png-1.6.37-rev2-linux-aarch64": "package-system/libpng/temp/png-linux-aarch64", "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri-linux-aarch64", - "pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64", "python-3.10.13-rev2-linux-aarch64": "package-system/python/temp/python-linux-aarch64", - "qt-5.15.2-rev10-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64", + "qt-6.11.2-rev1-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64", "sdformat-16.0.1-rev1-linux-aarch64": "package-system/sdformat/temp/sdformat-linux-aarch64", "SPIRVCross-1.3.275.0-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64", "SQLite-3.37.2-rev1-linux-aarch64": "package-system/sqlite/temp/SQLite-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 7b0f2725..216fb7bd 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -21,8 +21,6 @@ "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.1-py3.10-rev7-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux --package-root ../../package-system/pyside2/temp --clean", - "pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --package-root ../../package-system/pyside2/temp --clean", "pyside6-6.10.2-py3.10-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside6 --platform-name Linux --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", @@ -70,8 +68,6 @@ "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.1-py3.10-rev7-linux": "package-system/pyside2/temp/pyside2-linux", - "pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64", "pyside6-6.10.2-py3.10-rev5-linux": "package-system/pyside6/temp/pyside6-linux", "OpenEXR-3.1.3-rev4-linux": "package-system/OpenEXR/temp/OpenEXR-linux", "OpenXR-1.0.22-rev2-linux": "package-system/OpenXR-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index d79d9e6e..27956708 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -51,7 +51,6 @@ "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", "pyside6-6.10.2-py3.10-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside6 --platform-name Windows --clean", "python-3.10.13-rev1-windows": "package-system/python/build_package_image.py", "qt-6.11.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Windows --package-root ../../package-system/Qt/temp --clean", @@ -124,7 +123,6 @@ "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-5.15.2.1-py3.10-rev3-windows": "package-system/pyside2/temp/pyside2-windows", "pyside6-6.10.2-py3.10-rev5-windows": "package-system/pyside6/temp/pyside6-windows", "python-3.10.13-rev1-windows": "package-system/python/win_x64/package", "qt-6.11.2-rev1-windows": "package-system/Qt/temp/qt-windows", From 67e703f9e065c3442f32a3c73f557983e0203684 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Thu, 20 Aug 2026 23:51:06 -0600 Subject: [PATCH 03/13] Handle package list deletions in build workflow Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- .github/workflows/build-package.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-package.yaml b/.github/workflows/build-package.yaml index 7adf641c..82bcafb2 100644 --- a/.github/workflows/build-package.yaml +++ b/.github/workflows/build-package.yaml @@ -40,9 +40,9 @@ jobs: # Only get the changes that can be built # First, get the diff output - DIFF=$(git diff ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} \ - --no-ext-diff --unified=0 \ - --exit-code -a --no-prefix -- $FILE | egrep "^\+[^\+]" | egrep -v "^\+\+\+ ") + DIFF=$(git diff ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} \ + --no-ext-diff --unified=0 \ + -a --no-prefix -- $FILE | grep -E "^\+[^\+]" | grep -Ev "^\+\+\+ " || true) # Use an associative array to track which packages we've already processed declare -A PROCESSED_PACKAGES From 424c700f156e6903786683a26b51eb03747eee88 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Fri, 21 Aug 2026 00:05:19 -0600 Subject: [PATCH 04/13] Handle aliased zlib target in Qt configure Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/recursion-check.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/package-system/Qt/recursion-check.patch b/package-system/Qt/recursion-check.patch index 98dea9e8..396b7ff9 100644 --- a/package-system/Qt/recursion-check.patch +++ b/package-system/Qt/recursion-check.patch @@ -23,3 +23,20 @@ index 3074998c2c9..e22a6b79a1f 100644 set(forward_args "") if(arg_EXCLUDE) set(forward_args APPEND EXCLUDE ${arg_EXCLUDE}) +diff --git a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake +--- a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake ++++ b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake +@@ -17,6 +17,12 @@ qt_find_package(WrapSystemZLIB 1.0.8 MODULE + # and tries to promote it to global, but fails because the directory scope of the PNG package is + # different (src/gui) from where ZLIB was originally found (qtbase root). + # To avoid that, just manually promote the target to global here. + if(TARGET ZLIB::ZLIB) +- set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE) ++ get_target_property(zlib_aliased_target ZLIB::ZLIB ALIASED_TARGET) ++ if(zlib_aliased_target) ++ set_property(TARGET ${zlib_aliased_target} PROPERTY IMPORTED_GLOBAL TRUE) ++ else() ++ set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE) ++ endif() ++ unset(zlib_aliased_target) + endif() From 2c438439eb5dc4ae039ad5c1f5d165b0c8c541bb Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Fri, 21 Aug 2026 00:25:49 -0600 Subject: [PATCH 05/13] Fix recursion-check qt patch Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/recursion-check.patch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package-system/Qt/recursion-check.patch b/package-system/Qt/recursion-check.patch index 396b7ff9..b8d59eda 100644 --- a/package-system/Qt/recursion-check.patch +++ b/package-system/Qt/recursion-check.patch @@ -26,10 +26,7 @@ index 3074998c2c9..e22a6b79a1f 100644 diff --git a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake --- a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake +++ b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake -@@ -17,6 +17,12 @@ qt_find_package(WrapSystemZLIB 1.0.8 MODULE - # and tries to promote it to global, but fails because the directory scope of the PNG package is - # different (src/gui) from where ZLIB was originally found (qtbase root). - # To avoid that, just manually promote the target to global here. +@@ -20,3 +20,9 @@ qt_find_package(WrapSystemZLIB 1.0.8 MODULE if(TARGET ZLIB::ZLIB) - set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE) + get_target_property(zlib_aliased_target ZLIB::ZLIB ALIASED_TARGET) From d50a1663c3ffb0073afab3329cbf7f5087715bd8 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Fri, 21 Aug 2026 11:13:12 -0600 Subject: [PATCH 06/13] Build qt on all platforms with RelWithDebInfo Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/FindQt.cmake | 4 +-- .../Qt/Platform/Linux/QtPlugin_linux.cmake | 2 +- .../Qt/Platform/Linux/Qt_linux.cmake | 2 +- package-system/Qt/Platform/Mac/Qt_mac.cmake | 2 +- .../Platform/Windows/QtPlugin_windows.cmake | 26 +++++++++---------- .../Qt/Platform/Windows/Qt_windows.cmake | 7 +---- package-system/Qt/README.md | 2 ++ package-system/Qt/build-darwin-arm64.sh | 6 +++-- package-system/Qt/build-linux.sh | 6 +++-- package-system/Qt/build-windows.bat | 6 ++--- 10 files changed, 31 insertions(+), 32 deletions(-) diff --git a/package-system/Qt/FindQt.cmake b/package-system/Qt/FindQt.cmake index f032df31..82d2a61c 100644 --- a/package-system/Qt/FindQt.cmake +++ b/package-system/Qt/FindQt.cmake @@ -98,8 +98,8 @@ foreach(component ${QT6_COMPONENTS}) add_library(3rdParty::Qt::${component} ALIAS Qt6::${component}) mark_as_advanced(Qt6${component}_DIR) # Hiding from GUI - # Qt only has debug and release, we map the configurations we use in o3de. We map all the configurations - # except debug to release + # The package contains one optimized Qt build with separate debug information. Map every + # O3DE configuration to that RelWithDebInfo import configuration. foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) string(TOUPPER ${conf} UCONF) ly_qt_configuration_mapping(${UCONF} MAPPED_CONF) diff --git a/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake b/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake index 8d7ec729..14a9b02c 100644 --- a/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake +++ b/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake @@ -12,7 +12,7 @@ foreach(component ${QT6_COMPONENTS}) # add the IMPORTED_SONAME files as files to copy unset(extra_target_files) - get_target_property(imported_soname Qt6::${component} IMPORTED_SONAME_RELEASE) + get_target_property(imported_soname Qt6::${component} IMPORTED_SONAME_RELWITHDEBINFO) if(imported_soname) list(APPEND extra_target_files ${QT_LIB_PATH}/${imported_soname}) endif() diff --git a/package-system/Qt/Platform/Linux/Qt_linux.cmake b/package-system/Qt/Platform/Linux/Qt_linux.cmake index c345f11b..c5ea2d20 100644 --- a/package-system/Qt/Platform/Linux/Qt_linux.cmake +++ b/package-system/Qt/Platform/Linux/Qt_linux.cmake @@ -24,5 +24,5 @@ list(APPEND QT6_COMPONENTS ) function(ly_qt_configuration_mapping in_config out_config) - set(${out_config} RELEASE PARENT_SCOPE) + set(${out_config} RELWITHDEBINFO PARENT_SCOPE) endfunction() diff --git a/package-system/Qt/Platform/Mac/Qt_mac.cmake b/package-system/Qt/Platform/Mac/Qt_mac.cmake index e3066864..09ce0605 100644 --- a/package-system/Qt/Platform/Mac/Qt_mac.cmake +++ b/package-system/Qt/Platform/Mac/Qt_mac.cmake @@ -9,5 +9,5 @@ set(QT_LIB_PATH ${QT_PATH}/lib) function(ly_qt_configuration_mapping in_config out_config) - set(${out_config} RELEASE PARENT_SCOPE) + set(${out_config} RELWITHDEBINFO PARENT_SCOPE) endfunction() diff --git a/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake b/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake index c6646ce4..ff3e5612 100644 --- a/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake +++ b/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake @@ -7,32 +7,32 @@ # ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins - FILES ${QT_PATH}/plugins/iconengines/qsvgicon$<$:d>.dll + FILES ${QT_PATH}/plugins/iconengines/qsvgicon.dll OUTPUT_SUBDIRECTORY iconengines ) ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins FILES - ${QT_PATH}/plugins/imageformats/qgif$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qicns$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qico$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qjpeg$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qsvg$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qtga$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qtiff$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qwbmp$<$:d>.dll - ${QT_PATH}/plugins/imageformats/qwebp$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qgif.dll + ${QT_PATH}/plugins/imageformats/qicns.dll + ${QT_PATH}/plugins/imageformats/qico.dll + ${QT_PATH}/plugins/imageformats/qjpeg.dll + ${QT_PATH}/plugins/imageformats/qsvg.dll + ${QT_PATH}/plugins/imageformats/qtga.dll + ${QT_PATH}/plugins/imageformats/qtiff.dll + ${QT_PATH}/plugins/imageformats/qwbmp.dll + ${QT_PATH}/plugins/imageformats/qwebp.dll OUTPUT_SUBDIRECTORY imageformats ) ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins FILES - ${QT_PATH}/plugins/platforms/qminimal$<$:d>.dll - ${QT_PATH}/plugins/platforms/qwindows$<$:d>.dll + ${QT_PATH}/plugins/platforms/qminimal.dll + ${QT_PATH}/plugins/platforms/qwindows.dll OUTPUT_SUBDIRECTORY platforms ) ly_add_target_files(TARGETS 3rdParty::Qt::Widgets::Plugins - FILES ${QT_PATH}/plugins/styles/qmodernwindowsstyle$<$:d>.dll + FILES ${QT_PATH}/plugins/styles/qmodernwindowsstyle.dll OUTPUT_SUBDIRECTORY styles ) diff --git a/package-system/Qt/Platform/Windows/Qt_windows.cmake b/package-system/Qt/Platform/Windows/Qt_windows.cmake index cc07beea..09ce0605 100644 --- a/package-system/Qt/Platform/Windows/Qt_windows.cmake +++ b/package-system/Qt/Platform/Windows/Qt_windows.cmake @@ -9,10 +9,5 @@ set(QT_LIB_PATH ${QT_PATH}/lib) function(ly_qt_configuration_mapping in_config out_config) - string(TOUPPER ${in_config} in_config_upper) - if(in_config_upper STREQUAL DEBUG) - set(${out_config} DEBUG PARENT_SCOPE) - else() - set(${out_config} RELEASE PARENT_SCOPE) - endif() + set(${out_config} RELWITHDEBINFO PARENT_SCOPE) endfunction() diff --git a/package-system/Qt/README.md b/package-system/Qt/README.md index d059652a..9a1f35d2 100644 --- a/package-system/Qt/README.md +++ b/package-system/Qt/README.md @@ -27,6 +27,8 @@ All active targets build `qtbase`, `qtsvg`, `qtimageformats`, `qttools`, and `qt The package includes the Qt Widgets libraries used by O3DE, UiTools, `moc`, `uic`, `rcc`, `lupdate`, and `lrelease`. The WebP and TIFF image plugins remain enabled. Qt Widgets Designer, JasPer, MNG, SQL, PrintSupport, and selected unused qttools applications are disabled. DBus and Wayland integration are enabled only for Linux. +All active targets build one optimized `RelWithDebInfo` Qt configuration and package its separate debug information. Every O3DE build configuration links to that single Qt configuration; debug-only Qt libraries and `d`-suffixed Windows plugins are not built. + The Linux builds resolve TIFF, zlib, and OpenSSL through the corresponding architecture-specific O3DE dependency packages and force Qt to use them instead of silently selecting bundled or host-system copies. QtCanvasPainter is not included. Its open-source licensing and dependency on QtDeclarative are incompatible with this package configuration. diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index 34d6ecde..cfe8ca81 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -29,6 +29,8 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -nomake examples \ -nomake tests \ -release \ + -force-debug-info \ + -separate-debug-info \ -c++std c++20 \ -opensource \ -qt-tiff \ @@ -64,10 +66,10 @@ then exit 1 fi -cmake --install . --config Release +cmake --install . --config RelWithDebInfo if [ $? -ne 0 ] then - echo "Failed to install QT Release." + echo "Failed to install QT RelWithDebInfo." exit 1 fi diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index 6f205bd3..eabd872c 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -113,6 +113,8 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -nomake examples \ -nomake tests \ -release \ + -force-debug-info \ + -separate-debug-info \ -c++std c++20 \ -opensource \ -xcb \ @@ -133,9 +135,9 @@ then exit 1 fi -cmake --install . --config Release +cmake --install . --config RelWithDebInfo if [ $? -ne 0 ] then - echo "Failed to install QT Release." + echo "Failed to install QT RelWithDebInfo." exit 1 fi diff --git a/package-system/Qt/build-windows.bat b/package-system/Qt/build-windows.bat index 269d85bb..921fb860 100644 --- a/package-system/Qt/build-windows.bat +++ b/package-system/Qt/build-windows.bat @@ -30,10 +30,9 @@ call %VCVARS_PATH% amd64 REM For OpenSSL support set OPENSSL_ROOT=%TEMP_FOLDER%\OpenSSL-1.1.1o-rev1-windows\OpenSSL set OPENSSL_INCLUDE=%OPENSSL_ROOT%\include -set OPENSSL_LIB_DEBUG=%OPENSSL_ROOT%\debug\lib set OPENSSL_LIB_RELEASE=%OPENSSL_ROOT%\lib set INCLUDE=%OPENSSL_INCLUDE%;%INCLUDE% -set LIB=%OPENSSL_LIB_DEBUG%;%OPENSSL_LIB_RELEASE%;%LIB% +set LIB=%OPENSSL_LIB_RELEASE%;%LIB% REM To prevent max path issues, we go as close as possible to disk root cd %TEMP_FOLDER%\..\..\..\..\.. @@ -48,7 +47,7 @@ set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ -platform win32-msvc ^ -nomake examples ^ -nomake tests ^ - -debug-and-release ^ + -release ^ -c++std c++20 ^ -force-debug-info ^ -separate-debug-info ^ @@ -79,7 +78,6 @@ cmd /c ""%QT_SOURCE_ROOT%\configure.bat" %_OPTS%" || goto FAILURE cmd /c cmake --build . --parallel || goto FAILURE -cmd /c cmake --install . --config Debug || goto FAILURE cmd /c cmake --install . --config RelWithDebInfo || goto FAILURE :FINISH From eb593e2d11da65d8d4e81719d8d42a315f3fa094 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Fri, 21 Aug 2026 11:27:23 -0600 Subject: [PATCH 07/13] Use clang-18 for Linux builds Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- .github/workflows/build-package.yaml | 30 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-package.yaml b/.github/workflows/build-package.yaml index 82bcafb2..0ea8be93 100644 --- a/.github/workflows/build-package.yaml +++ b/.github/workflows/build-package.yaml @@ -272,17 +272,25 @@ jobs: echo ANDROID_NDK_HOME=$ndkRoot >> $env:GITHUB_ENV echo ANDROID_NDK_ROOT=$ndkRoot >> $env:GITHUB_ENV - - name: Install clang/gcc - if: runner.os == 'Linux' - env: - CLANG_VER: 15 - GCC_VER: 9 - run: | - sudo apt-get install -y clang-${{ env.CLANG_VER }} clang++-${{ env.CLANG_VER }} gcc-${{ env.GCC_VER }} g++-${{ env.GCC_VER }} libclang-${{ env.CLANG_VER }}-dev - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.CLANG_VER }} 10 - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${{ env.CLANG_VER }} 10 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 10 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${{ env.GCC_VER }} 10 + - name: Install clang/gcc + if: runner.os == 'Linux' + env: + CLANG_VER: 18 + GCC_VER: 9 + run: | + wget -qO /tmp/llvm.sh https://apt.llvm.org/llvm.sh + chmod +x /tmp/llvm.sh + sudo /tmp/llvm.sh ${{ env.CLANG_VER }} + sudo apt-get install -y lld-${{ env.CLANG_VER }} clang-tools-${{ env.CLANG_VER }} libclang-${{ env.CLANG_VER }}-dev gcc-${{ env.GCC_VER }} g++-${{ env.GCC_VER }} + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.CLANG_VER }} 100 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${{ env.CLANG_VER }} 100 + sudo update-alternatives --set clang /usr/bin/clang-${{ env.CLANG_VER }} + sudo update-alternatives --set clang++ /usr/bin/clang++-${{ env.CLANG_VER }} + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 10 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${{ env.GCC_VER }} 10 + echo "CC=$(which clang-${{ env.CLANG_VER }})" >> $GITHUB_ENV + echo "CXX=$(which clang++-${{ env.CLANG_VER }})" >> $GITHUB_ENV + clang --version - name: Install additional build dependencies if: runner.os == 'Linux' From 296fe7583a562134e1977be23069970662bdb999 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Fri, 21 Aug 2026 11:52:03 -0600 Subject: [PATCH 08/13] Reduce qt6 install noise Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/build-darwin-arm64.sh | 4 +++- package-system/Qt/build-linux.sh | 3 ++- package-system/Qt/build-windows.bat | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index cfe8ca81..e9f93c3d 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -54,7 +54,9 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -no-feature-qtdiag \ -no-feature-qtplugininfo \ -framework \ - -confirm-license " + -confirm-license \ + -- \ + -DCMAKE_INSTALL_MESSAGE=NEVER" echo Configuring Qt... ${QT_SOURCE_ROOT}/configure ${_OPTS} diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index eabd872c..2357da8d 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -100,7 +100,8 @@ QT_PLATFORM_OPTS="-skip qtdeclarative \ -no-feature-qtplugininfo \ -- \ -DCMAKE_MODULE_PATH=${QT_DEPENDENCY_MODULE_PATH} \ - -DOPENSSL_USE_STATIC_LIBS=TRUE" + -DOPENSSL_USE_STATIC_LIBS=TRUE \ + -DCMAKE_INSTALL_MESSAGE=NEVER" BUILD_PATH="${TEMP_FOLDER}/build" echo ${BUILD_PATH} diff --git a/package-system/Qt/build-windows.bat b/package-system/Qt/build-windows.bat index 921fb860..841776ef 100644 --- a/package-system/Qt/build-windows.bat +++ b/package-system/Qt/build-windows.bat @@ -72,7 +72,9 @@ set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ -no-feature-qtattributionsscanner ^ -no-feature-qtdiag ^ -no-feature-qtplugininfo ^ - -- -Wno-dev + -- ^ + -Wno-dev ^ + -DCMAKE_INSTALL_MESSAGE=NEVER cmd /c ""%QT_SOURCE_ROOT%\configure.bat" %_OPTS%" || goto FAILURE From 653556ab36b086509d2fd7ddc0006081bee51335 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Tue, 1 Sep 2026 18:29:45 -0600 Subject: [PATCH 09/13] Restore debug+release builds on Windows Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/FindQt.cmake | 4 +-- .../Platform/Windows/QtPlugin_windows.cmake | 26 +++++++++---------- .../Qt/Platform/Windows/Qt_windows.cmake | 7 ++++- package-system/Qt/README.md | 2 +- package-system/Qt/build-windows.bat | 12 ++++++--- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/package-system/Qt/FindQt.cmake b/package-system/Qt/FindQt.cmake index 82d2a61c..51c8d5b5 100644 --- a/package-system/Qt/FindQt.cmake +++ b/package-system/Qt/FindQt.cmake @@ -98,8 +98,8 @@ foreach(component ${QT6_COMPONENTS}) add_library(3rdParty::Qt::${component} ALIAS Qt6::${component}) mark_as_advanced(Qt6${component}_DIR) # Hiding from GUI - # The package contains one optimized Qt build with separate debug information. Map every - # O3DE configuration to that RelWithDebInfo import configuration. + # Qt only has debug and release, we map the configurations we use in o3de. We map all the configurations + # except debug to release foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) string(TOUPPER ${conf} UCONF) ly_qt_configuration_mapping(${UCONF} MAPPED_CONF) diff --git a/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake b/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake index ff3e5612..c6646ce4 100644 --- a/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake +++ b/package-system/Qt/Platform/Windows/QtPlugin_windows.cmake @@ -7,32 +7,32 @@ # ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins - FILES ${QT_PATH}/plugins/iconengines/qsvgicon.dll + FILES ${QT_PATH}/plugins/iconengines/qsvgicon$<$:d>.dll OUTPUT_SUBDIRECTORY iconengines ) ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins FILES - ${QT_PATH}/plugins/imageformats/qgif.dll - ${QT_PATH}/plugins/imageformats/qicns.dll - ${QT_PATH}/plugins/imageformats/qico.dll - ${QT_PATH}/plugins/imageformats/qjpeg.dll - ${QT_PATH}/plugins/imageformats/qsvg.dll - ${QT_PATH}/plugins/imageformats/qtga.dll - ${QT_PATH}/plugins/imageformats/qtiff.dll - ${QT_PATH}/plugins/imageformats/qwbmp.dll - ${QT_PATH}/plugins/imageformats/qwebp.dll + ${QT_PATH}/plugins/imageformats/qgif$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qicns$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qico$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qjpeg$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qsvg$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qtga$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qtiff$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qwbmp$<$:d>.dll + ${QT_PATH}/plugins/imageformats/qwebp$<$:d>.dll OUTPUT_SUBDIRECTORY imageformats ) ly_add_target_files(TARGETS 3rdParty::Qt::Gui::Plugins FILES - ${QT_PATH}/plugins/platforms/qminimal.dll - ${QT_PATH}/plugins/platforms/qwindows.dll + ${QT_PATH}/plugins/platforms/qminimal$<$:d>.dll + ${QT_PATH}/plugins/platforms/qwindows$<$:d>.dll OUTPUT_SUBDIRECTORY platforms ) ly_add_target_files(TARGETS 3rdParty::Qt::Widgets::Plugins - FILES ${QT_PATH}/plugins/styles/qmodernwindowsstyle.dll + FILES ${QT_PATH}/plugins/styles/qmodernwindowsstyle$<$:d>.dll OUTPUT_SUBDIRECTORY styles ) diff --git a/package-system/Qt/Platform/Windows/Qt_windows.cmake b/package-system/Qt/Platform/Windows/Qt_windows.cmake index 09ce0605..cc07beea 100644 --- a/package-system/Qt/Platform/Windows/Qt_windows.cmake +++ b/package-system/Qt/Platform/Windows/Qt_windows.cmake @@ -9,5 +9,10 @@ set(QT_LIB_PATH ${QT_PATH}/lib) function(ly_qt_configuration_mapping in_config out_config) - set(${out_config} RELWITHDEBINFO PARENT_SCOPE) + string(TOUPPER ${in_config} in_config_upper) + if(in_config_upper STREQUAL DEBUG) + set(${out_config} DEBUG PARENT_SCOPE) + else() + set(${out_config} RELEASE PARENT_SCOPE) + endif() endfunction() diff --git a/package-system/Qt/README.md b/package-system/Qt/README.md index 9a1f35d2..1acb5ddc 100644 --- a/package-system/Qt/README.md +++ b/package-system/Qt/README.md @@ -27,7 +27,7 @@ All active targets build `qtbase`, `qtsvg`, `qtimageformats`, `qttools`, and `qt The package includes the Qt Widgets libraries used by O3DE, UiTools, `moc`, `uic`, `rcc`, `lupdate`, and `lrelease`. The WebP and TIFF image plugins remain enabled. Qt Widgets Designer, JasPer, MNG, SQL, PrintSupport, and selected unused qttools applications are disabled. DBus and Wayland integration are enabled only for Linux. -All active targets build one optimized `RelWithDebInfo` Qt configuration and package its separate debug information. Every O3DE build configuration links to that single Qt configuration; debug-only Qt libraries and `d`-suffixed Windows plugins are not built. +Linux and macOS build one optimized `RelWithDebInfo` Qt configuration. Windows builds Debug and `RelWithDebInfo` so O3DE Debug uses ABI-compatible `d`-suffixed Qt libraries and plugins, while Profile and Release use the optimized unsuffixed build. The Linux builds resolve TIFF, zlib, and OpenSSL through the corresponding architecture-specific O3DE dependency packages and force Qt to use them instead of silently selecting bundled or host-system copies. diff --git a/package-system/Qt/build-windows.bat b/package-system/Qt/build-windows.bat index 841776ef..13e86eeb 100644 --- a/package-system/Qt/build-windows.bat +++ b/package-system/Qt/build-windows.bat @@ -30,9 +30,10 @@ call %VCVARS_PATH% amd64 REM For OpenSSL support set OPENSSL_ROOT=%TEMP_FOLDER%\OpenSSL-1.1.1o-rev1-windows\OpenSSL set OPENSSL_INCLUDE=%OPENSSL_ROOT%\include +set OPENSSL_LIB_DEBUG=%OPENSSL_ROOT%\debug\lib set OPENSSL_LIB_RELEASE=%OPENSSL_ROOT%\lib set INCLUDE=%OPENSSL_INCLUDE%;%INCLUDE% -set LIB=%OPENSSL_LIB_RELEASE%;%LIB% +set LIB=%OPENSSL_LIB_DEBUG%;%OPENSSL_LIB_RELEASE%;%LIB% REM To prevent max path issues, we go as close as possible to disk root cd %TEMP_FOLDER%\..\..\..\..\.. @@ -47,7 +48,7 @@ set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ -platform win32-msvc ^ -nomake examples ^ -nomake tests ^ - -release ^ + -debug-and-release ^ -c++std c++20 ^ -force-debug-info ^ -separate-debug-info ^ @@ -74,12 +75,17 @@ set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ -no-feature-qtplugininfo ^ -- ^ -Wno-dev ^ + -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON ^ + -DCMAKE_C_FLAGS_DEBUG="/MDd /O2 /Zi" ^ + -DCMAKE_CXX_FLAGS_DEBUG="/MDd /O2 /Zi" ^ -DCMAKE_INSTALL_MESSAGE=NEVER cmd /c ""%QT_SOURCE_ROOT%\configure.bat" %_OPTS%" || goto FAILURE -cmd /c cmake --build . --parallel || goto FAILURE +cmd /c cmake --build . --config Debug --parallel || goto FAILURE +cmd /c cmake --build . --config RelWithDebInfo --parallel || goto FAILURE +cmd /c cmake --install . --config Debug || goto FAILURE cmd /c cmake --install . --config RelWithDebInfo || goto FAILURE :FINISH From 9e90a4812e12ddfc96dfea140b7e9d78627b000d Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Tue, 1 Sep 2026 18:50:47 -0600 Subject: [PATCH 10/13] Switch linux and mac back to release only Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/Platform/Linux/QtPlugin_linux.cmake | 2 +- package-system/Qt/Platform/Linux/Qt_linux.cmake | 2 +- package-system/Qt/Platform/Mac/Qt_mac.cmake | 2 +- package-system/Qt/README.md | 2 +- package-system/Qt/build-darwin-arm64.sh | 6 ++---- package-system/Qt/build-linux.sh | 6 ++---- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake b/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake index 14a9b02c..8d7ec729 100644 --- a/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake +++ b/package-system/Qt/Platform/Linux/QtPlugin_linux.cmake @@ -12,7 +12,7 @@ foreach(component ${QT6_COMPONENTS}) # add the IMPORTED_SONAME files as files to copy unset(extra_target_files) - get_target_property(imported_soname Qt6::${component} IMPORTED_SONAME_RELWITHDEBINFO) + get_target_property(imported_soname Qt6::${component} IMPORTED_SONAME_RELEASE) if(imported_soname) list(APPEND extra_target_files ${QT_LIB_PATH}/${imported_soname}) endif() diff --git a/package-system/Qt/Platform/Linux/Qt_linux.cmake b/package-system/Qt/Platform/Linux/Qt_linux.cmake index c5ea2d20..c345f11b 100644 --- a/package-system/Qt/Platform/Linux/Qt_linux.cmake +++ b/package-system/Qt/Platform/Linux/Qt_linux.cmake @@ -24,5 +24,5 @@ list(APPEND QT6_COMPONENTS ) function(ly_qt_configuration_mapping in_config out_config) - set(${out_config} RELWITHDEBINFO PARENT_SCOPE) + set(${out_config} RELEASE PARENT_SCOPE) endfunction() diff --git a/package-system/Qt/Platform/Mac/Qt_mac.cmake b/package-system/Qt/Platform/Mac/Qt_mac.cmake index 09ce0605..e3066864 100644 --- a/package-system/Qt/Platform/Mac/Qt_mac.cmake +++ b/package-system/Qt/Platform/Mac/Qt_mac.cmake @@ -9,5 +9,5 @@ set(QT_LIB_PATH ${QT_PATH}/lib) function(ly_qt_configuration_mapping in_config out_config) - set(${out_config} RELWITHDEBINFO PARENT_SCOPE) + set(${out_config} RELEASE PARENT_SCOPE) endfunction() diff --git a/package-system/Qt/README.md b/package-system/Qt/README.md index 1acb5ddc..ff769ce7 100644 --- a/package-system/Qt/README.md +++ b/package-system/Qt/README.md @@ -27,7 +27,7 @@ All active targets build `qtbase`, `qtsvg`, `qtimageformats`, `qttools`, and `qt The package includes the Qt Widgets libraries used by O3DE, UiTools, `moc`, `uic`, `rcc`, `lupdate`, and `lrelease`. The WebP and TIFF image plugins remain enabled. Qt Widgets Designer, JasPer, MNG, SQL, PrintSupport, and selected unused qttools applications are disabled. DBus and Wayland integration are enabled only for Linux. -Linux and macOS build one optimized `RelWithDebInfo` Qt configuration. Windows builds Debug and `RelWithDebInfo` so O3DE Debug uses ABI-compatible `d`-suffixed Qt libraries and plugins, while Profile and Release use the optimized unsuffixed build. +Linux and macOS build one Release Qt configuration. Windows builds Debug and `RelWithDebInfo` so O3DE Debug uses ABI-compatible `d`-suffixed Qt libraries and plugins, while Profile and Release use the optimized unsuffixed build. The Linux builds resolve TIFF, zlib, and OpenSSL through the corresponding architecture-specific O3DE dependency packages and force Qt to use them instead of silently selecting bundled or host-system copies. diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index e9f93c3d..ac4dd619 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -29,8 +29,6 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -nomake examples \ -nomake tests \ -release \ - -force-debug-info \ - -separate-debug-info \ -c++std c++20 \ -opensource \ -qt-tiff \ @@ -68,10 +66,10 @@ then exit 1 fi -cmake --install . --config RelWithDebInfo +cmake --install . --config Release if [ $? -ne 0 ] then - echo "Failed to install QT RelWithDebInfo." + echo "Failed to install QT Release." exit 1 fi diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index 2357da8d..f14a91fd 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -114,8 +114,6 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -nomake examples \ -nomake tests \ -release \ - -force-debug-info \ - -separate-debug-info \ -c++std c++20 \ -opensource \ -xcb \ @@ -136,9 +134,9 @@ then exit 1 fi -cmake --install . --config RelWithDebInfo +cmake --install . --config Release if [ $? -ne 0 ] then - echo "Failed to install QT RelWithDebInfo." + echo "Failed to install QT Release." exit 1 fi From 4199ae654199cf08fa9415c08905485df2824c0b Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Tue, 1 Sep 2026 19:11:48 -0600 Subject: [PATCH 11/13] Add src_package_strip_top_level option Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- Scripts/extras/archive_downloader.py | 45 +++++++++++++++++++++-- Scripts/extras/pull_and_build_from_git.py | 7 +++- package-system/Qt/README.md | 1 - package-system/Qt/build-darwin-arm64.sh | 2 +- package-system/Qt/build-linux.sh | 2 +- package-system/Qt/build-windows.bat | 5 +-- package-system/Qt/build_config.json | 3 +- package-system/Qt/recursion-check.patch | 12 +++--- 8 files changed, 60 insertions(+), 17 deletions(-) diff --git a/Scripts/extras/archive_downloader.py b/Scripts/extras/archive_downloader.py index 232631e3..46628f7d 100644 --- a/Scripts/extras/archive_downloader.py +++ b/Scripts/extras/archive_downloader.py @@ -101,7 +101,41 @@ def download_and_verify(src_url: str, src_zip_hash:str, src_zip_hash_algorithm:s return str(tgt_filename) -def extract_package(src_package_file: str, target_folder:str): +def _strip_tar_top_level(tar_file): + members = tar_file.getmembers() + top_level_names = set() + + for member in members: + member_parts = pathlib.PurePosixPath(member.name).parts + if not member_parts: + continue + if member_parts[0] == '/' or '..' in member_parts: + raise RuntimeError(f"Archive contains an unsafe path: {member.name}") + top_level_names.add(member_parts[0]) + + if len(top_level_names) != 1: + raise RuntimeError("Archive must contain exactly one top-level directory to strip") + + top_level_name = top_level_names.pop() + stripped_members = [] + for member in members: + member_parts = pathlib.PurePosixPath(member.name).parts + if len(member_parts) == 1: + if not member.isdir(): + raise RuntimeError(f"Archive top-level entry is not a directory: {member.name}") + continue + + member.name = pathlib.PurePosixPath(*member_parts[1:]).as_posix() + if member.islnk(): + link_parts = pathlib.PurePosixPath(member.linkname).parts + if link_parts and link_parts[0] == top_level_name: + member.linkname = pathlib.PurePosixPath(*link_parts[1:]).as_posix() + stripped_members.append(member) + + return stripped_members + + +def extract_package(src_package_file: str, target_folder: str, strip_top_level: bool = False): src_package_file_path = pathlib.Path(src_package_file) target_folder_path = pathlib.Path(target_folder) @@ -111,19 +145,24 @@ def extract_package(src_package_file: str, target_folder:str): package_name, package_ext = os.path.splitext(str(src_package_file_path.name)) - destination_path = target_folder_path / package_name + destination_path = target_folder_path if strip_top_level else target_folder_path / package_name print(f"{INDENT}Extracting {src_package_file_path} to {destination_path}") if package_ext in ARCHIVE_EXTS_ZIP: + if strip_top_level: + raise RuntimeError("Stripping the top-level directory is not supported for zip archives") import zipfile with zipfile.ZipFile(str(src_package_file_path.resolve()), 'r') as dep_zip: dep_zip.extractall(destination_path) elif package_ext in ARCHIVE_EXTS_TAR: import tarfile with tarfile.open(str(src_package_file_path.resolve())) as tar_file: - tar_file.extractall(destination_path) + members = _strip_tar_top_level(tar_file) if strip_top_level else None + tar_file.extractall(destination_path, members=members) elif package_ext in ARCHIVE_EXTS_7ZIP: + if strip_top_level: + raise RuntimeError("Stripping the top-level directory is not supported for 7Zip archives") try: os.makedirs(destination_path, exist_ok=True) subprocess.call(['7z', 'x', '-y', str(src_package_file_path.resolve())], cwd=destination_path) diff --git a/Scripts/extras/pull_and_build_from_git.py b/Scripts/extras/pull_and_build_from_git.py index a7d60885..11a563a9 100644 --- a/Scripts/extras/pull_and_build_from_git.py +++ b/Scripts/extras/pull_and_build_from_git.py @@ -48,6 +48,7 @@ * src_package_url : The download URI to retrieve the source package compressed tar from * src_package_sha1 : The sha1 fingerprint of the downloaded source package compressed tar for verification +* src_package_strip_top_level : (optional) Extract a tar source package directly into the source folder by stripping its single top-level directory. Defaults to false. ** Note: Either both git_url + git_tag/git_commit OR src_package_url + src_package_sha1 must be supplied, but not both @@ -280,6 +281,7 @@ def _get_value(value_key, required=True, default=None): self.git_tag = _get_value("git_tag", required=False) self.src_package_url = _get_value("src_package_url", required=False) self.src_package_sha1 = _get_value("src_package_sha1", required=False) + self.src_package_strip_top_level = _get_value("src_package_strip_top_level", required=False, default=False) if not self.git_url and not self.src_package_url: raise BuildError(f"Either 'git_url' or 'src_package_url' must be provided for the source in the build config.") @@ -290,6 +292,8 @@ def _get_value(value_key, required=True, default=None): raise BuildError(f"Missing 'git_tag' entry for the git repo {self.git_url} in the build config.") if self.src_package_url and not self.src_package_sha1: raise BuildError(f"Missing 'src_package_sha1' entry for the source package at {self.src_package_url} in the build config.") + if type(self.src_package_strip_top_level) is not bool: + raise BuildError("Invalid build config. 'src_package_strip_top_level' must be a boolean.") self.package_version = _get_value("package_version") self.patch_file = _get_value("patch_file", required=False) @@ -664,7 +668,8 @@ def sync_source(self): src_zip_hash_algorithm="sha1", target_folder=self.base_temp_folder) extracted_package_path = extract_package(src_package_file=downloaded_package_file, - target_folder=self.src_folder.resolve()) + target_folder=self.src_folder.resolve(), + strip_top_level=self.package_info.src_package_strip_top_level) else: raise BuildError(f"Missing both 'git_url' and 'src_package_url' from the build config") diff --git a/package-system/Qt/README.md b/package-system/Qt/README.md index ff769ce7..d5733b95 100644 --- a/package-system/Qt/README.md +++ b/package-system/Qt/README.md @@ -38,7 +38,6 @@ QtCanvasPainter is not included. Its open-source licensing and dependency on QtD When changing build inputs without changing the Qt release, increment the package revision. When changing the upstream Qt release, update: - `src_package_url`, `src_package_sha1`, and `package_version` in `build_config.json` -- The archive source paths in the active platform build scripts and `recursion-check.patch` - The forced Qt version in `FindQt.cmake` - The matching keys in each host package build list diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index ac4dd619..8cbea7ae 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -15,7 +15,7 @@ MAKE_FLAGS=-j32 # TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script BUILD_PATH=$TEMP_FOLDER/build -QT_SOURCE_ROOT=$TEMP_FOLDER/src/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2 +QT_SOURCE_ROOT=$TEMP_FOLDER/src QTARRAY="qtbase,qtimageformats,qtsvg,qttranslations,qttools" [[ -d $BUILD_PATH ]] || mkdir $BUILD_PATH diff --git a/package-system/Qt/build-linux.sh b/package-system/Qt/build-linux.sh index f14a91fd..83afc5e3 100755 --- a/package-system/Qt/build-linux.sh +++ b/package-system/Qt/build-linux.sh @@ -59,7 +59,7 @@ sudo apt-get install -y libfontconfig1-dev \ libxcb-xinerama0-dev \ libxrender-dev -BUILD_ROOT="${TEMP_FOLDER}/src/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2" +BUILD_ROOT="${TEMP_FOLDER}/src" QTARRAY="qtbase,qtimageformats,qtsvg,qttools,qttranslations,qtwayland" TIFF_PACKAGE_ROOT="${TEMP_FOLDER}/${TIFF_FOLDER_NAME}" diff --git a/package-system/Qt/build-windows.bat b/package-system/Qt/build-windows.bat index 13e86eeb..40d23c14 100644 --- a/package-system/Qt/build-windows.bat +++ b/package-system/Qt/build-windows.bat @@ -13,7 +13,7 @@ if not defined VCVARS_PATH set VCVARS_PATH="C:\Program Files\Microsoft Visual St if not defined QTARRAY set QTARRAY=qtbase,qtimageformats,qtsvg,qttools,qttranslations REM TEMP_FOLDER and TARGET_INSTALL_ROOT get set from the pull_and_build_from_git.py script -set QT_SOURCE_ROOT=%TEMP_FOLDER%\src\qt-everywhere-src-6.11.2.tar\qt-everywhere-src-6.11.2 +set QT_SOURCE_ROOT=%TEMP_FOLDER%\src set CHECKS_FAILED=0 for %%P IN (VCVARS_PATH,TEMP_FOLDER,TARGET_INSTALL_ROOT) do ( if not exist !%%P! ( @@ -82,8 +82,7 @@ set _OPTS=-prefix %TARGET_INSTALL_ROOT% ^ cmd /c ""%QT_SOURCE_ROOT%\configure.bat" %_OPTS%" || goto FAILURE -cmd /c cmake --build . --config Debug --parallel || goto FAILURE -cmd /c cmake --build . --config RelWithDebInfo --parallel || goto FAILURE +cmd /c cmake --build . --parallel || goto FAILURE cmd /c cmake --install . --config Debug || goto FAILURE cmd /c cmake --install . --config RelWithDebInfo || goto FAILURE diff --git a/package-system/Qt/build_config.json b/package-system/Qt/build_config.json index ecb7f775..b4de1d0b 100644 --- a/package-system/Qt/build_config.json +++ b/package-system/Qt/build_config.json @@ -2,9 +2,10 @@ "package_name": "qt", "package_url": "https://www.qt.io/", "package_license": "LGPL-3.0", - "package_license_file": "qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/LICENSES/LGPL-3.0-only.txt", + "package_license_file": "LICENSES/LGPL-3.0-only.txt", "src_package_url": "https://download.qt.io/official_releases/qt/6.11/6.11.2/single/qt-everywhere-src-6.11.2.tar.xz", "src_package_sha1": "7e15dbb24d8d390b04fb53bb7397a2f625608132", + "src_package_strip_top_level": true, "patch_file": "recursion-check.patch", "package_version": "6.11.2-rev1", "cmake_find_source": "FindQt.cmake", diff --git a/package-system/Qt/recursion-check.patch b/package-system/Qt/recursion-check.patch index b8d59eda..db382b36 100644 --- a/package-system/Qt/recursion-check.patch +++ b/package-system/Qt/recursion-check.patch @@ -1,8 +1,8 @@ Submodule qtbase contains modified content -diff --git a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake +diff --git a/qtbase/cmake/QtPublicCMakeHelpers.cmake b/qtbase/cmake/QtPublicCMakeHelpers.cmake index 3074998c2c9..e22a6b79a1f 100644 ---- a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake -+++ b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/cmake/QtPublicCMakeHelpers.cmake +--- a/qtbase/cmake/QtPublicCMakeHelpers.cmake ++++ b/qtbase/cmake/QtPublicCMakeHelpers.cmake @@ -226,8 +226,19 @@ function(_qt_internal_collect_buildsystem_targets result dir) if(NOT _qt_internal_collect_buildsystem_targets_inner) set(${result} "") @@ -23,9 +23,9 @@ index 3074998c2c9..e22a6b79a1f 100644 set(forward_args "") if(arg_EXCLUDE) set(forward_args APPEND EXCLUDE ${arg_EXCLUDE}) -diff --git a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake ---- a/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake -+++ b/qt-everywhere-src-6.11.2.tar/qt-everywhere-src-6.11.2/qtbase/configure.cmake +diff --git a/qtbase/configure.cmake b/qtbase/configure.cmake +--- a/qtbase/configure.cmake ++++ b/qtbase/configure.cmake @@ -20,3 +20,9 @@ qt_find_package(WrapSystemZLIB 1.0.8 MODULE if(TARGET ZLIB::ZLIB) - set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE) From 527260b7a19286dcf1b886b0f726c17cfd43084b Mon Sep 17 00:00:00 2001 From: Arbiter <96613937+EnterTheArcane@users.noreply.github.com> Date: Fri, 4 Sep 2026 00:56:47 -0600 Subject: [PATCH 12/13] Update Scripts/extras/archive_downloader.py Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: Arbiter <96613937+EnterTheArcane@users.noreply.github.com> --- Scripts/extras/archive_downloader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Scripts/extras/archive_downloader.py b/Scripts/extras/archive_downloader.py index 46628f7d..c2f0002e 100644 --- a/Scripts/extras/archive_downloader.py +++ b/Scripts/extras/archive_downloader.py @@ -106,8 +106,7 @@ def _strip_tar_top_level(tar_file): top_level_names = set() for member in members: - member_parts = pathlib.PurePosixPath(member.name).parts - if not member_parts: + if not (member_parts := pathlib.PurePosixPath(member.name).parts): continue if member_parts[0] == '/' or '..' in member_parts: raise RuntimeError(f"Archive contains an unsafe path: {member.name}") From 7d425b0ffa4658de0e657f81f1a231cce637f318 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Fri, 4 Sep 2026 08:40:26 -0600 Subject: [PATCH 13/13] Update Qt README Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package-system/Qt/README.md b/package-system/Qt/README.md index d5733b95..33558a98 100644 --- a/package-system/Qt/README.md +++ b/package-system/Qt/README.md @@ -45,28 +45,28 @@ Package names follow `qt-${package_version}-${platform}`. ## Building -Run these commands from the `3p-package-source` repository. Adjust the relative `3p-package-scripts` path if the repositories are laid out differently. +Run these commands from the `3p-package-source` repository. ### Windows x64 ```bat -python ..\3p-package-scripts\o3de_package_scripts\build_package.py --search_path . qt-6.11.2-rev1-windows +./package.bat build qt-6.11.2-rev1-windows ``` ### Linux x86_64 ```bash -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-linux +./package.sh build qt-6.11.2-rev1-linux ``` ### Linux aarch64 ```bash -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-linux-aarch64 +./package.sh build qt-6.11.2-rev1-linux-aarch64 ``` ### macOS arm64 ```bash -python3 ../3p-package-scripts/o3de_package_scripts/build_package.py --search_path . qt-6.11.2-rev1-mac-arm64 +./package.sh build qt-6.11.2-rev1-mac-arm64 ```