Skip to content

fix(packaging): pin Qt Wayland watcher substitution - #1532

Open
TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:fix/qt-wayland-substitution-pin
Open

TimeToBuildBob wants to merge 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:fix/qt-wayland-substitution-pin

Conversation

@TimeToBuildBob

Copy link
Copy Markdown
Contributor

Problem

#1531 ships aw-awatcher in the Linux Qt bundle, but master still pins aw-qt at fa16bf8, before ActivityWatch/aw-qt#142 and #143. The binary is present but the manager never substitutes it for the X11 watchers.

Reproduced using the actual post-#1531 Linux Qt artifact from run 39147683826 (master c8b9203): it discovers aw-awatcher, then starts aw-watcher-afk and aw-watcher-window under headless sway. The X11 watchers fail without DISPLAY and no events reach the isolated test server.

Fix

Advance only aw-qt to merged 5fb7634 (ActivityWatch/aw-qt#143), including the Wayland detection/substitution and persisted selection fixes from #142/#143. No other submodule or source changes.

Verification

  • 23 aw-qt/tests/test_wayland.py tests passed at the proposed pin.
  • Headless sway 1.9 with wlroots headless backend and pixman renderer, separate XDG runtime/config/data directories, isolated server on port 5765.
  • Using the merged Qt source manager with the exact packaged aw-awatcher binary, selecting the two ordinary X11 watchers logs their substitution and autostarts aw-awatcher.
  • The isolated server receives aw-watcher-window_bob events with app wayland-7b85 and title wayland-7b85-proof from a real foot Wayland surface, plus aw-watcher-afk_bob events.

Boundary: this verifies merged manager source + packaged watcher, not a newly rebuilt PyInstaller Qt binary at this pin. The old packaged Qt binary was the negative control. A post-merge rebuilt bundle remains required before declaring the out-of-box bundle verified. Tested sway protocols only, not GNOME/KDE or all Wayland compositors.

Related: #92. Keep the runtime/docs task open until the rebuilt artifact is checked.

Git-Session-Id: 80c9911f-26bb-4595-ad10-74955be2f20c
@greptile-apps

greptile-apps Bot commented Oct 18, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] No established defect blocks merging this pin update.

Summary

Advances aw-qt from fa16bf8 to 5fb7634 to include the Wayland watcher substitution and saved-selection fixes described by the author.

  • The Qt manager routes X11 watcher selections to aw-awatcher on Wayland.

Reviews (1) · Last reviewed commit: "fix(packaging): pin Qt Wayland watcher s..." · Reviewed by Greptile

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

Greptile reviewed current head b7a4455 at 5/5 with no findings; no human comments or review threads need a response. Platform builds are still pending, with no failed checks so far. No code change or rerun needed now; merge remains maintainer-owned. Rebuilt-bundle runtime verification remains open as documented above.

@TimeToBuildBob

TimeToBuildBob commented Oct 18, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 AI code review

Not reviewed

Confidence N/A

Not scored — this diff moves a submodule pointer and contains no source to assess. Treat it as not reviewed, not as approved.

ℹ️ Submodule pointer change only — not reviewed.

This diff moves a submodule SHA and contains no source changes, so there is nothing here for me to assess. Whether the bump is safe depends on the submodule's commit range, which this diff does not include. Treat this as not reviewed, not as approved.

Reviewed b7a44557c38e · openrouter/deepseek/deepseek-v4-flash-0731 · llm engine · 6s · about this reviewer

Maintainer commands

@TimeToBuildBob review (own line) — fresh review · @TimeToBuildBob fix — a worker acts on the findings. Once per comment; 👀 = received.

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.

1 participant