From 8edff03900f4a988bf3a9b49230dafd6189a6724 Mon Sep 17 00:00:00 2001 From: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> Date: Thu, 13 Aug 2026 01:32:58 -0600 Subject: [PATCH] Remove QtDBus from mac builds Signed-off-by: EnterTheArcane <96613937+EnterTheArcane@users.noreply.github.com> --- package-system/Qt/Platform/Mac/Qt_mac.cmake | 1 - package-system/Qt/build-darwin-arm64.sh | 4 ++-- package-system/Qt/build_config.json | 2 +- package_build_list_host_darwin-arm64.json | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-system/Qt/Platform/Mac/Qt_mac.cmake b/package-system/Qt/Platform/Mac/Qt_mac.cmake index 67c0c8a8..48c3350e 100644 --- a/package-system/Qt/Platform/Mac/Qt_mac.cmake +++ b/package-system/Qt/Platform/Mac/Qt_mac.cmake @@ -9,7 +9,6 @@ set(QT_LIB_PATH ${QT_PATH}/lib) list(APPEND QT6_COMPONENTS - DBus PrintSupport ) diff --git a/package-system/Qt/build-darwin-arm64.sh b/package-system/Qt/build-darwin-arm64.sh index c2e6d78f..2509859c 100755 --- a/package-system/Qt/build-darwin-arm64.sh +++ b/package-system/Qt/build-darwin-arm64.sh @@ -31,7 +31,7 @@ _OPTS="-prefix ${TARGET_INSTALL_ROOT} \ -qt-tiff \ -qt-zlib \ -no-icu \ - -dbus-linked \ + -no-dbus \ -framework \ -confirm-license " @@ -54,7 +54,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=(QtLabsPlatform QtQuickControls2 QtQuickParticles QtQuickControls2ImagineStyleImpl QtQuickControls2BasicStyleImpl QtLabsSharedImage QtQmlMeta QtDesigner QtQuickControls2FusionStyleImpl QtQuickShapesDesignHelpers QtQuickWidgets QtQuickControls2Material QtQmlXmlListModel QtShaderTools QtLabsSynchronizer QtQuickLayouts QtQuickControls2Basic QtHelp QtQuickVectorImage QtPrintSupport QtGui 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) cd $TARGET_INSTALL_ROOT/include for qtframework in "${qtframeworks[@]}"; do diff --git a/package-system/Qt/build_config.json b/package-system/Qt/build_config.json index 4ff8b47a..4c4cf2a2 100644 --- a/package-system/Qt/build_config.json +++ b/package-system/Qt/build_config.json @@ -45,7 +45,7 @@ "Mac-arm64": { "patch_file": "recursion-check.patch", "cmake_find_source": "FindQt.cmake", - "package_version": "6.10.2-rev6", + "package_version": "6.10.2-rev7", "custom_build_cmd": [ "./build-darwin-arm64.sh" ], diff --git a/package_build_list_host_darwin-arm64.json b/package_build_list_host_darwin-arm64.json index d36b12df..8abb78c5 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.10.2-rev7-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.10.2-rev7-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",