marfrit/marfrit-packages
0
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

kwin-fourier 6.6.4->6.6.5 + qt6-base-fourier 6.11.0->6.11.1 (track upstream extra) #12

Merged
marfrit merged 2 commits from claude-noether/marfrit-packages:noether/kwin-qt6-baseline-bump into main 2026-05-15 11:45:27 +00:00
Conversation 0 Commits 2 Files Changed 2
+13 -13
claude-noether commented 2026-05-15 10:57:42 +00:00
Contributor
Copy Link
Copy Source

Triggered by pacman -Syu on fresnel showing two marfrit packages behind upstream extra:

kwin: local (1:6.6.4-1) is newer than extra (6.6.5-1)
qt6-base: local (1:6.11.0-2) is newer than extra (6.11.0-4)

(Epoch=1 keeps both winning install-side, but the underlying baselines lag.)

Note: linux-fresnel-fourier: local (7.0-14) is newer than marfrit (7.0-1) is not in this PR — that's kernel-agent territory per the standing delegation.

kwin-fourier 6.6.4 → 6.6.5

  • pkgver/pkgrel bump (3 → 1, reset on pkgver bump)
  • New tarball sha256 (6c187ce7…)
  • 0001-transaction-bypass-watchDmaBuf-fence-wait.patch dry-run verified clean against 6.6.5 src/wayland/transaction.cpp
  • Epoch=1 retained (the bypass-watch-dmabuf hypothesis isn't upstreamable yet — ongoing ohm/fresnel HW-decode validation)

qt6-base-fourier 6.11.0 → 6.11.1

Arch has actually moved past 6.11.0-4 to 6.11.1-1; rebase straight there.

Synchronized with Arch's 6.11.1 PKGBUILD:

  • pkgver/pkgrel
  • Tarball sha256 (2eafe504…)
  • Dropped cherry-pick of 8b54513cdcf6 (qdbus crash fix; landed upstream in 6.11.1, Arch dropped it from theirs too)
  • gcc-libs → libgcc + libstdc++ in depends (Arch split these between 6.11.0 and 6.11.1)
  • Build flag: dropped -DFEATURE_sql_ibase=OFF, added -DFEATURE_mimetype_database=OFF (matching Arch)

Kept (the raison d'être of the fork):

  • 0001/0002/0003 GL_R8-on-ES3 patches (Mali GLES3 KWin compositor stall fix)
  • qt6-base-cflags.patch + qt6-base-nostrip.patch
  • qt6-xcb-private-headers-fourier sub-package
  • epoch=1

Verification gap to be honest about

GL_R8 patches not dry-run-verified against the 6.11.1 source — the qtbase git clone is multi-GB and impractical for a quick check on this host. They touch glyph cache (QOpenGLTextureGlyphCache) and RHI gles2 (QRhiGles2) paths that have been API-stable since Qt 6.10, so the expectation is they apply cleanly. If first real build hits hunk failures, the fix is to refresh the patches against current upstream — file an issue and I'll iterate.

CI impact after merge

  • kwin-fourier-aarch64 builds in CI (per current workflow)
  • qt6-base-fourier-aarch64 same — large build (~1h on fermi), but no special handling

Bot: claude-noether

Triggered by `pacman -Syu` on fresnel showing two marfrit packages behind upstream extra: ``` kwin: local (1:6.6.4-1) is newer than extra (6.6.5-1) qt6-base: local (1:6.11.0-2) is newer than extra (6.11.0-4) ``` (Epoch=1 keeps both winning install-side, but the underlying baselines lag.) Note: `linux-fresnel-fourier: local (7.0-14) is newer than marfrit (7.0-1)` is **not** in this PR — that's kernel-agent territory per the standing delegation. ## kwin-fourier 6.6.4 → 6.6.5 - pkgver/pkgrel bump (3 → 1, reset on pkgver bump) - New tarball sha256 (`6c187ce7…`) - `0001-transaction-bypass-watchDmaBuf-fence-wait.patch` dry-run verified clean against 6.6.5 `src/wayland/transaction.cpp` - Epoch=1 retained (the bypass-watch-dmabuf hypothesis isn't upstreamable yet — ongoing ohm/fresnel HW-decode validation) ## qt6-base-fourier 6.11.0 → 6.11.1 Arch has actually moved past 6.11.0-4 to 6.11.1-1; rebase straight there. Synchronized with Arch's 6.11.1 PKGBUILD: - pkgver/pkgrel - Tarball sha256 (`2eafe504…`) - Dropped cherry-pick of `8b54513cdcf6` (qdbus crash fix; landed upstream in 6.11.1, Arch dropped it from theirs too) - `gcc-libs` → `libgcc` + `libstdc++` in depends (Arch split these between 6.11.0 and 6.11.1) - Build flag: dropped `-DFEATURE_sql_ibase=OFF`, added `-DFEATURE_mimetype_database=OFF` (matching Arch) Kept (the raison d'être of the fork): - 0001/0002/0003 GL_R8-on-ES3 patches (Mali GLES3 KWin compositor stall fix) - qt6-base-cflags.patch + qt6-base-nostrip.patch - qt6-xcb-private-headers-fourier sub-package - epoch=1 ## Verification gap to be honest about GL_R8 patches **not** dry-run-verified against the 6.11.1 source — the qtbase git clone is multi-GB and impractical for a quick check on this host. They touch glyph cache (`QOpenGLTextureGlyphCache`) and RHI gles2 (`QRhiGles2`) paths that have been API-stable since Qt 6.10, so the expectation is they apply cleanly. If first real build hits hunk failures, the fix is to refresh the patches against current upstream — file an issue and I'll iterate. ## CI impact after merge - kwin-fourier-aarch64 builds in CI (per current workflow) - qt6-base-fourier-aarch64 same — large build (~1h on fermi), but no special handling Bot: claude-noether
claude-noether added 2 commits 2026-05-15 10:57:43 +00:00
kwin-fourier: 6.6.4 -> 6.6.5 (track upstream extra) fedcc4a357 
Triggered by 'pacman -Syu' on fresnel showing local 1:6.6.4-1 newer
than extra 6.6.5-1 (epoch wins, but our base lags upstream).

- pkgver 6.6.4 -> 6.6.5
- pkgrel 3 -> 1 (reset on pkgver bump)
- sha256sum updated for new tarball
- 0001-transaction-bypass-watchDmaBuf-fence-wait.patch dry-run verified
  clean against 6.6.5/src/wayland/transaction.cpp

Epoch=1 retained until upstream lands a proper V4L2 implicit-sync
fence-wait bypass (the patch-header hypothesis is still being tested
through ohm/fresnel HW-decode validation; not upstreamable yet).
qt6-base-fourier: rebase 6.11.0 -> 6.11.1 to track upstream extra 75dadb2925 
Triggered by 'pacman -Syu' on fresnel showing local 1:6.11.0-2 newer
than (then-)extra 6.11.0-4. By the time of this commit Arch has moved
on to 6.11.1-1; rebase straight to that.

Diff against Arch's qt6-base 6.11.1 PKGBUILD reduced:
- _pkgver 6.11.0 -> 6.11.1
- pkgrel 3 -> 1 (reset on pkgver bump)
- sha256 of git tag updated to 2eafe504... (matches Arch's 6.11.1 PKGBUILD)
- Drop cherry-pick of 8b54513cdcf6 (qdbus crash fix landed upstream
  in 6.11.1; Arch dropped it from theirs as well)
- depends: gcc-libs replaced by libgcc + libstdc++ (Arch split these
  into separate packages between 6.11.0 and 6.11.1)
- Build flag: -DFEATURE_sql_ibase=OFF removed, -DFEATURE_mimetype_database=OFF
  added (Arch toggled in 6.11.1)

Kept (the reason this fork exists):
- 0001/0002/0003 GL_R8-on-ES3 patches (Mali GLES3 KWin compositor stall fix)
- qt6-base-cflags.patch + qt6-base-nostrip.patch (system CFLAGS + skip strip)
- qt6-xcb-private-headers-fourier sub-package (depended on by other fork pkgs)
- epoch=1 (precedence guarantee until upstream lands GL_R8/ES3 fix)

Patches NOT dry-run-verified against 6.11.1 source (qt clone is multi-GB
and impractical to fetch for a quick check). They touch glyph cache and
RHI gles2 paths that have been stable since Qt 6.10; expected to apply
cleanly. Will revert pkgrel and re-pin if first build hits hunk failures.
marfrit merged commit 108c725c58 into main 2026-05-15 11:45:27 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
marfrit (Markus Fritsche)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: marfrit/marfrit-packages#12
Delete Branch "claude-noether/marfrit-packages:noether/kwin-qt6-baseline-bump"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?