Repository navigation
Fix the v0.7.4 Linux release build: GTK hook with X11 commented out - #53
Merged
Merged
Conversation
The v0.7.4 Linux release builds failed in "Fix the AppImage for Wayland hosts": the script reported rewriting the GTK hook, then its own check found the forced-X11 line still there and refused the AppImage. Tauri's CLI now bundles its own copy of linuxdeploy-plugin-gtk (tauri-apps/tauri#16062), and that hook carries the line commented out: `# export GDK_BACKEND=x11`. The script matched the text anywhere on a line, so the comment counted as forcing X11; the rewrite only replaced a line starting with the export, so it changed nothing, and the verification matched the same comment again. Only an active export forces X11, so detection, rewrite and verification now all match that — at any indentation, never inside a comment. A hook that leaves GDK_BACKEND unset already gets GTK's Wayland-then-X11 choice and passes through byte for byte. The regression test gains both cases: Tauri's commented hook is left unchanged with GDK_BACKEND unset, and an indented export is still rewritten. Against the old script both fail. Run over a real AppImage carrying Tauri's hook, the old script fails exactly as CI did, and the new one repacks and verifies it.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
# export GDK_BACKEND=x11commented out.fix-appimage-wayland.shmatched that text inside the comment, its column-one rewrite changed nothing, and its verification matched the comment again.export GDK_BACKEND=x11, at any indentation. A hook that leavesGDK_BACKENDunset already gets GTK's Wayland-then-X11 choice and passes through unchanged.release.ymlagainst the existing tag.Verified
scripts/test-fix-appimage-wayland.sh: 23 checks pass. The two new cases (Tauri's commented hook left byte-identical withGDK_BACKENDunset, and an indented export rewritten) both fail against the old script.3 removed, hook rewritten: 0, WebKit intact).