fix(ci): Update Qt version to latest
This commit is contained in:
@@ -89,6 +89,22 @@ if [[ ! -d "${DOTS_REPO}/.git" ]]; then
|
||||
git -C "${DOTS_REPO}" submodule update --init --depth=1
|
||||
fi
|
||||
|
||||
# end-4 pins quickshell to 41651d7 (Sep 25), which predates quickshell's
|
||||
# Qt 6.12 fix (5d5d498, Oct 3: "use MOC includes instead of opaque pointer
|
||||
# definitions - Fixes linking issues and Qt 6.12 compatibility"). Arch
|
||||
# shipped qt6 6.12.0 into extra on Oct 8; with the old pin qmetatype.h's
|
||||
# "Meta Types must be fully defined" static_assert kills the moc build of
|
||||
# quickshell-hyprland-ipc (failed CI run 137) and the whole ISO build with
|
||||
# it. Force the fixed commit, but ONLY while end-4 still carries the old
|
||||
# pin - once they bump it themselves the guard stops matching and their
|
||||
# pin wins untouched. localrepo/check-quickshell-pin.sh (weekly CI)
|
||||
# verifies both this pin and end-4's stay Qt 6.12-compatible.
|
||||
QS_PKG="${DOTS_REPO}/sdata/dist-arch/illogical-impulse-quickshell-git/PKGBUILD"
|
||||
if [[ -f "${QS_PKG}" ]] && grep -q "^_commit='41651d7" "${QS_PKG}"; then
|
||||
echo "[customize] Bumping end-4 quickshell pin to 11ca60be (Qt 6.12 fix)..."
|
||||
sed -i "s|^_commit='41651d7[^']*'|_commit='11ca60be22b063478ed9586ca1d7f92f0f261caf'|" "${QS_PKG}"
|
||||
fi
|
||||
|
||||
# ── end4-pC: the default quickshell config, shipped in skel ──────────────────
|
||||
# pctrade/end4-pC is a fork of the ii shell config. It lives next to ii in
|
||||
# ~/.config/quickshell and does not modify it; which one runs is decided by
|
||||
|
||||
Reference in New Issue
Block a user