Skip to content

fix(qt6): clear qt6_qtwebengine_arches macro to drop qt6-qtwebengine dependency#17125

Merged
reubeno merged 1 commit into
tomls/base/mainfrom
bphilip/qt6_qtwebengine_arches-elide
May 12, 2026
Merged

fix(qt6): clear qt6_qtwebengine_arches macro to drop qt6-qtwebengine dependency#17125
reubeno merged 1 commit into
tomls/base/mainfrom
bphilip/qt6_qtwebengine_arches-elide

Conversation

@binujp
Copy link
Copy Markdown
Contributor

@binujp binujp commented May 11, 2026

Override the qt6_qtwebengine_arches macro to %{nil} so that dependent packages
(gpsbabel, libksysguard, python-pyside6, python-pyqt6, qt6-qtwebview) skip
their qtwebengine-related code paths, to allow removal of the qt6-qtwebengine
package from AZL.

Co-authored-by: Copilot [email protected]
Part of the effort to remove opus, opusfile, and mingw-opus from Azure Linux.

Copilot AI review requested due to automatic review settings May 11, 2026 05:13
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR introduces an Azure Linux component overlay for qt6 that rewrites the %qt6_qtwebengine_arches macro to disable qtwebengine-gated code paths in downstream specs, with the goal of enabling removal of qt6-qtwebengine from the distro.

Changes:

  • Add a dedicated base/comps/qt6/qt6.comp.toml with a file-search-replace overlay to rewrite macros.qt6-srpm.
  • Regenerate rendered output (specs/q/qt6/macros.qt6-srpm) reflecting the macro change.
  • Move qt6 out of the unmodified inline component list (base/comps/components.toml) and update the qt6 lock fingerprint.

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated 3 comments.

File Description
base/comps/qt6/qt6.comp.toml New component definition adding an overlay to rewrite the qt6 SRPM macros file.
specs/q/qt6/macros.qt6-srpm Rendered macros file updated to set %qt6_qtwebengine_arches to %{nil}.
base/comps/components.toml Removes inline [components.qt6] entry now that qt6 has a dedicated component file with overlays.
locks/qt6.lock Updates input-fingerprint to reflect the component definition change.

Comment thread base/comps/qt6/qt6.comp.toml Outdated
Comment thread base/comps/qt6/qt6.comp.toml Outdated
description = "Clear qt6_qtwebengine_arches macro to disable qtwebengine across dependent packages"
type = "file-search-replace"
file = "macros.qt6-srpm"
regex = '%qt6_qtwebengine_arches x86_64 aarch64 ppc64le riscv64'
Comment thread base/comps/qt6/qt6.comp.toml Outdated
Comment thread base/comps/qt6/qt6.comp.toml Outdated
@binujp binujp force-pushed the bphilip/qt6_qtwebengine_arches-elide branch 2 times, most recently from 06aa712 to 39f80e3 Compare May 11, 2026 16:27
Comment thread base/comps/qt6/qt6.comp.toml Outdated
…dependency

Override the qt6_qtwebengine_arches macro to %{nil} so that dependent packages
(gpsbabel, libksysguard, python-pyside6, python-pyqt6, qt6-qtwebview) skip
their qtwebengine-related code paths, to allow removal of the qt6-qtwebengine
package from AZL.

Co-authored-by: Copilot <[email protected]>
@binujp binujp force-pushed the bphilip/qt6_qtwebengine_arches-elide branch from 39f80e3 to 2bd5a8d Compare May 12, 2026 17:01
@reubeno reubeno merged commit a9d1edd into tomls/base/main May 12, 2026
10 checks passed
@reubeno reubeno deleted the bphilip/qt6_qtwebengine_arches-elide branch May 12, 2026 20:15
reubeno pushed a commit that referenced this pull request May 14, 2026
Remove qt6-qtwebengine and qt6-qtwebview from Azure Linux. All
dependent packages have already been rebuilt without these packages
via the qt6_qtwebengine_arches macro override (PR #17125) and the
release bump (PR #17171).

- Delete qt6-qtwebengine dedicated comp.toml, rendered specs, and lock
- Remove qt6-qtwebview inline entry from components.toml, rendered specs, and lock
- No package list entries to clean up

Co-authored-by: Copilot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants