Skip to content

Commit f2a30d8

Browse files
authored
refactor(core): use ayatana appindicator by default, keep option to use gtk (#3916)
1 parent c4320ed commit f2a30d8

File tree

30 files changed

+263
-127
lines changed

30 files changed

+263
-127
lines changed

.changes/ayatana-tray.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri": patch
3+
---
4+
5+
**Breaking change:** Use ayatana-appindicator for Linux system tray by default. Use the `gtk-tray` Cargo feature to use `libappindicator` instead.

.changes/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"getPublishedVersion": "cargo search ${ pkgFile.pkg.package.name } --limit 1 | sed -nE \"s/^[^\\\"]*\\\"//; s/\\\".*//1p\"",
99
"prepublish": [
1010
"sudo apt-get update",
11-
"sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf",
11+
"sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf",
1212
"cargo install cargo-audit --features=fix",
1313
{
1414
"command": "cargo generate-lockfile",
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"cli.rs": patch
3+
"cli.js": patch
4+
---
5+
6+
**Breaking change:** Enable default Cargo features except `tauri/custom-protocol` on the dev command.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri-build": patch
3+
---
4+
5+
Copy system tray icon resource to the target directory on Linux.

.github/workflows/artifacts-updater.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: matrix.platform == 'ubuntu-latest'
4242
run: |
4343
sudo apt-get update
44-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
44+
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
4545
4646
- name: Get current date
4747
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV

.github/workflows/bench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
run: |
4444
python -m pip install --upgrade pip
4545
sudo apt-get update
46-
sudo apt-get install -y webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf xvfb
46+
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf xvfb
4747
wget https://github.com/sharkdp/hyperfine/releases/download/v1.11.0/hyperfine_1.11.0_amd64.deb
4848
sudo dpkg -i hyperfine_1.11.0_amd64.deb
4949
pip install memory_profiler

.github/workflows/lint-fmt-core.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ jobs:
4949
args: '--features compression,wry,isolation,custom-protocol,api-all,cli,updater,system-tray',
5050
key: 'all'
5151
}
52-
- { args: '--no-default-features', key: 'no-default' }
52+
- {
53+
args: '--no-default-features --features ayatana-tray',
54+
key: 'no-default'
55+
}
5356
- { args: '--features custom-protocol', key: 'custom-protocol' }
5457
- { args: '--features api-all', key: 'api-all' }
5558

@@ -58,7 +61,7 @@ jobs:
5861
- name: install webkit2gtk
5962
run: |
6063
sudo apt-get update
61-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
64+
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
6265
6366
- uses: actions-rs/toolchain@v1
6467
with:

.github/workflows/publish-cli.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ jobs:
255255
- name: install system dependencies
256256
run: |
257257
sudo apt-get update
258-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
258+
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
259259
- name: Test bindings
260260
run: yarn test
261261
test-linux-x64-musl-binding:
@@ -349,7 +349,7 @@ jobs:
349349
set -e
350350
export PATH=/usr/local/cargo/bin/:/usr/local/fnm:$PATH
351351
apt-get update
352-
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install --no-install-recommends -y unzip libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
352+
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install --no-install-recommends -y unzip libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
353353
bash
354354
curl https://sh.rustup.rs -sSf | bash -s -- -y
355355
curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "/usr/local/fnm" --skip-shell

.github/workflows/test-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
if: matrix.platform == 'ubuntu-latest'
107107
run: |
108108
sudo apt-get update
109-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
109+
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
110110
111111
- name: Get current date
112112
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV

.github/workflows/test-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: matrix.platform == 'ubuntu-latest'
4141
run: |
4242
sudo apt-get update
43-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
43+
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
4444
4545
- name: Get current date
4646
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV

0 commit comments

Comments
 (0)