Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/libadwaita-feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri": minor
"tauri-runtime-wry": minor
---

Add optional `libadwaita` feature for Linux GTK4 builds. When enabled, forwards to `tao/libadwaita` for proper GNOME HIG styling (rounded corners, themed menus, etc.).
11 changes: 11 additions & 0 deletions .changes/linux-gtk4-migration.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
tauri: minor:feat
tauri-runtime: minor:feat
tauri-runtime-wry: minor:feat
---

**Linux**: Add GTK4 and WebKitGTK 6.0 support.

Breaking changes for Linux:
- `temp_dir_path` methods removed from `TrayIconBuilder` and `TrayIcon` (ksni uses DBus)
- Requires GTK4 4.6+ and WebKitGTK 6.0+
45 changes: 45 additions & 0 deletions .github/workflows/sync-upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Sync with Upstream

on:
schedule:
- cron: '0 6 * * *'
workflow_dispatch:

jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: gtk4
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/tauri.git || true

- name: Fetch upstream
run: git fetch upstream

- name: Check and merge upstream
run: |
BEHIND=$(git rev-list --count HEAD..upstream/dev)
if [ "$BEHIND" -gt 0 ]; then
echo "Found $BEHIND new commits from upstream"
if git merge upstream/dev --no-edit; then
echo "Successfully merged upstream changes"
git push origin gtk4
else
echo "Merge conflicts detected - manual intervention required"
git merge --abort
exit 1
fi
else
echo "Already up to date with upstream"
fi
Loading
Loading