-
-
Notifications
You must be signed in to change notification settings - Fork 329
feat(linux): port to gtk4 #1258
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
johncarmack1984
wants to merge
10
commits into
tauri-apps:dev
Choose a base branch
from
johncarmack1984:gtk4
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,713
−1,687
Open
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ca26fd7
feat(linux): port to gtk4
johncarmack1984 651d33f
Merge branch 'dev' into gtk4
johncarmack1984 ff6ccdc
chore(linux): update the gtk4 stack to 0.11
johncarmack1984 8899a70
ci(linux): build against gtk4 and raise the msrv to 1.92
johncarmack1984 dbc72ed
fix(linux): gtk 4.10 feature floor for the Accessible interface
johncarmack1984 095690f
chore(linux): depend on the gdk4 crates by their real names
johncarmack1984 4eb8300
refactor(linux): depend on gtk4 by its real name
johncarmack1984 4884738
ci: drop the fork sync workflow
johncarmack1984 c0ea184
style: nightly rustfmt
johncarmack1984 1879ad8
ci: pin the msrv toolchain via the action input
johncarmack1984 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "tao": minor | ||
| --- | ||
|
|
||
| Add optional `libadwaita` feature for GTK4 Linux builds. When enabled, uses `adw::Application` instead of `gtk::Application` for proper GNOME HIG styling (rounded corners, themed menus, etc.). |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "tao": minor | ||
| --- | ||
|
|
||
| Port the Linux backend from GTK3 to GTK4 (`gtk4` 0.11, `glib` 0.22). Adds an optional `libadwaita` feature. Public gtk types exposed through the Unix extension traits are now their GTK4 equivalents, and the minimum supported Rust version rises to 1.92 and the minimum system GTK to 4.10 (both required by gtk4-rs 0.11 and the `Accessible` interface the window type implements). |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| name: Sync with Upstream | ||
|
|
||
| on: | ||
| schedule: | ||
| # Run daily at 6 AM UTC | ||
| - cron: '0 6 * * *' | ||
| workflow_dispatch: # Allow manual trigger | ||
|
|
||
| jobs: | ||
| sync: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Configure Git | ||
| run: | | ||
| git config user.name "github-actions[bot]" | ||
| git config user.email "github-actions[bot]@users.noreply.github.com" | ||
|
|
||
| - name: Add upstream remote | ||
| run: git remote add upstream https://github.com/tauri-apps/tao.git || true | ||
|
|
||
| - name: Fetch upstream | ||
| run: git fetch upstream | ||
|
|
||
| - name: Check and merge upstream (gtk4-v0.34.5 branch) | ||
| run: | | ||
| # Get current branch | ||
| BRANCH="gtk4-v0.34.5" | ||
| git checkout $BRANCH | ||
|
|
||
| # Check if we're behind upstream/dev | ||
| BEHIND=$(git rev-list --count HEAD..upstream/dev) | ||
|
|
||
| if [ "$BEHIND" -gt 0 ]; then | ||
| echo "Found $BEHIND new commits from upstream" | ||
|
|
||
| # Try to merge - will fail if conflicts exist | ||
| if git merge upstream/dev --no-edit; then | ||
| echo "Successfully merged upstream changes" | ||
| git push origin $BRANCH | ||
| else | ||
| echo "Merge conflicts detected - manual intervention required" | ||
| git merge --abort | ||
| exit 1 | ||
| fi | ||
| else | ||
| echo "Already up to date with upstream" | ||
| fi | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.