diff options
| author | Andreas Schirm <[email protected]> | 2025-06-30 17:25:33 +0200 |
|---|---|---|
| committer | Andreas Schirm <[email protected]> | 2025-07-02 08:17:02 +0000 |
| commit | c616e9de62b7161ceab7ae21bae3b3d775b456af (patch) | |
| tree | bf180978ad43e52bd61398945a7bf00f34482290 | |
| parent | a082ac67fe491cd39ee781d3f3164c806b690ff3 (diff) | |
Introduce a PACKAGECONFIG option in qtbase to allow disabling the
at-spi2-core dependency. By default, the at-spi2-core dependency
remains enabled.
Pick-to: 6.10 6.9 6.8
Change-Id: Id2f0da1e3dfc049bf2e3d37bb1c096c41c4d4088
Reviewed-by: Samuli Piippo <[email protected]>
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 4bd656f..d721d60 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -70,6 +70,7 @@ PACKAGECONFIG_SYSTEM ?= "" PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_DEFAULT ?= "\ accessibility \ + ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'accessibility-atspi-bridge', '', d)} \ dbus \ fontconfig \ glib \ @@ -102,9 +103,6 @@ OPENSSL_LINKING_MODE ?= "runtime" QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \ bb.utils.contains('PACKAGECONFIG', 'gles2', 'eglfs', 'linuxfb', d), d)}" -# at-spi bridge is used by XCB and wayland -ACCESSIBILITY_DEPENDS = "${@bb.utils.contains_any("DISTRO_FEATURES", "x11 wayland", "at-spi2-core", "", d)}" - PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF" PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF" PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON" @@ -128,7 +126,8 @@ PACKAGECONFIG[ctf] = "-DFEATURE_ctf=ON,-DFEATURE_ctf=OFF" # gui PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF" -PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,${ACCESSIBILITY_DEPENDS}" +PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF" +PACKAGECONFIG[accessibility-atspi-bridge] = "-DFEATURE_accessibility_atspi_bridge=ON,-DFEATURE_accessibility_atspi_bridge=OFF,at-spi2-core" PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb" PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig" PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm" |