diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index de226d1..9807a62 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -608,6 +608,7 @@ jobs:
nettle \
gmp \
gnome-keyring \
+ libappindicator \
polkit \
webkitgtk41 \
xdg-utils
diff --git a/Makefile b/Makefile
index 9e40441..03fc99b 100644
--- a/Makefile
+++ b/Makefile
@@ -169,6 +169,12 @@ install:
install -Dm644 packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
install -Dm644 packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/gpgui.png
install -Dm644 packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
+ install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
+ install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
+ install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
+ install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
+ install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
+ install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
install -Dm644 packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
install-bsd:
@@ -199,11 +205,18 @@ install-bsd:
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256@2/apps
+ install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status
install -m 644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/gpgui.svg
install -m 644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/gpgui.png
install -m 644 packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/gpgui.png
install -m 644 packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/gpgui.png
install -m 644 packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256@2/apps/gpgui.png
+ install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
+ install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
+ install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
+ install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
+ install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
+ install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
install -d $(DESTDIR)$(PREFIX)/share/polkit-1/actions
install -m 644 packaging/bsd/com.yuezk.gpgui.policy $(DESTDIR)$(PREFIX)/share/polkit-1/actions/com.yuezk.gpgui.policy
@@ -259,6 +272,7 @@ package-openbsd: clean-bsd-package
comment=$$(cat .build/openbsd/+COMMENT); \
openbsd_arch=$$(uname -m | sed 's/x86_64/amd64/'); \
gnome_keyring_pkg=$$(pkg_info -e 'gnome-keyring-*' | sed 's/^inst://' | head -n 1); \
+ libappindicator_pkg=$$(pkg_info -e 'libappindicator-*' | sed 's/^inst://' | head -n 1); \
polkit_pkg=$$(pkg_info -e 'polkit-*' | sed 's/^inst://' | head -n 1); \
webkitgtk_pkg=$$(pkg_info -e 'webkitgtk41-*' | sed 's/^inst://' | head -n 1); \
xdg_utils_pkg=$$(pkg_info -e 'xdg-utils-*' | sed 's/^inst://' | head -n 1); \
@@ -269,6 +283,7 @@ package-openbsd: clean-bsd-package
-f .build/openbsd/PLIST \
-p $(PREFIX) \
-P x11/gnome/keyring:gnome-keyring-*:$$gnome_keyring_pkg \
+ -P x11/libappindicator:libappindicator-*:$$libappindicator_pkg \
-P sysutils/polkit:polkit-*:$$polkit_pkg \
-P www/webkitgtk4,webkitgtk41:webkitgtk41-*:$$webkitgtk_pkg \
-P devel/xdg-utils:xdg-utils-*:$$xdg_utils_pkg \
@@ -297,6 +312,12 @@ uninstall:
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/gpgui.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
rm -f $(DESTDIR)/var/lib/gpclient/gpgui \
diff --git a/docs/bsd-source-build.md b/docs/bsd-source-build.md
index 1629409..47cff12 100644
--- a/docs/bsd-source-build.md
+++ b/docs/bsd-source-build.md
@@ -45,7 +45,7 @@ Install build and runtime dependencies:
```sh
doas pkg_add git rust libiconv gettext-tools autoconf-2.72 automake-1.17 \
libtool patch gmake pkgconf libxml gnutls p11-kit nettle gmp \
- gnome-keyring polkit webkitgtk41 xdg-utils
+ gnome-keyring libappindicator polkit webkitgtk41 xdg-utils
```
Use the installed Autoconf and Automake versions:
diff --git a/packaging/binary/Makefile.in b/packaging/binary/Makefile.in
index f969699..810675f 100644
--- a/packaging/binary/Makefile.in
+++ b/packaging/binary/Makefile.in
@@ -24,6 +24,12 @@ install:
install -Dm644 artifacts/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
install -Dm644 artifacts/usr/share/icons/hicolor/256x256/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/gpgui.png
install -Dm644 artifacts/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
+ install -Dm644 artifacts/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
+ install -Dm644 artifacts/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
+ install -Dm644 artifacts/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
+ install -Dm644 artifacts/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
+ install -Dm644 artifacts/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
+ install -Dm644 artifacts/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
install -Dm644 artifacts/usr/share/polkit-1/actions/com.yuezk.gpgui.policy $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
uninstall:
@@ -48,6 +54,12 @@ uninstall:
rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/gpgui.png
rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
+ rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy
rm -f $(DESTDIR)/var/lib/gpclient/scripts/vpnc-script \
diff --git a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
new file mode 100644
index 0000000..d02f21b
--- /dev/null
+++ b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
@@ -0,0 +1,12 @@
+
diff --git a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
new file mode 100644
index 0000000..fc568f8
--- /dev/null
+++ b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
@@ -0,0 +1,12 @@
+
diff --git a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
new file mode 100644
index 0000000..be41866
--- /dev/null
+++ b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
@@ -0,0 +1,12 @@
+
diff --git a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
new file mode 100644
index 0000000..4c63a8d
--- /dev/null
+++ b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
@@ -0,0 +1,12 @@
+
diff --git a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
new file mode 100644
index 0000000..b3ab25d
--- /dev/null
+++ b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
@@ -0,0 +1,12 @@
+
diff --git a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
new file mode 100644
index 0000000..c15e592
--- /dev/null
+++ b/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
@@ -0,0 +1,12 @@
+
diff --git a/packaging/rpm/globalprotect-openconnect.spec.in b/packaging/rpm/globalprotect-openconnect.spec.in
index 752b9e2..4571357 100644
--- a/packaging/rpm/globalprotect-openconnect.spec.in
+++ b/packaging/rpm/globalprotect-openconnect.spec.in
@@ -80,6 +80,12 @@ make build
%{_datadir}/icons/hicolor/256x256/apps/gpgui.png
%{_datadir}/icons/hicolor/256x256@2/apps/gpgui.png
%{_datadir}/icons/hicolor/scalable/apps/gpgui.svg
+%{_datadir}/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg
%{_datadir}/polkit-1/actions/com.yuezk.gpgui.policy
%dir /usr/lib/NetworkManager
@@ -102,6 +108,7 @@ make build
%dir %{_datadir}/icons/hicolor/256x256@2/apps
%dir %{_datadir}/icons/hicolor/scalable
%dir %{_datadir}/icons/hicolor/scalable/apps
+%dir %{_datadir}/icons/hicolor/scalable/status
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
diff --git a/scripts/verify-linux-desktop-assets.sh b/scripts/verify-linux-desktop-assets.sh
index fd76097..9d3d643 100755
--- a/scripts/verify-linux-desktop-assets.sh
+++ b/scripts/verify-linux-desktop-assets.sh
@@ -57,6 +57,17 @@ verify_same_file \
verify_same_file \
"$GPGUI_APP_DIR/src-tauri/icons/icon.svg" \
"$GP_DIR/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg"
+for icon in \
+ gpgui-connected-symbolic.svg \
+ gpgui-disconnected-symbolic.svg \
+ gpgui-connecting-1-symbolic.svg \
+ gpgui-connecting-2-symbolic.svg \
+ gpgui-connecting-3-symbolic.svg \
+ gpgui-connecting-4-symbolic.svg; do
+ verify_same_file \
+ "$GPGUI_APP_DIR/src-tauri/icons/tray/theme/$icon" \
+ "$GP_DIR/packaging/files/usr/share/icons/hicolor/scalable/status/$icon"
+done
verify_same_file \
"$GPGUI_APP_DIR/src-tauri/icons/32x32.png" \
"$GP_DIR/apps/gpauth/icons/32x32.png"
@@ -115,4 +126,4 @@ verify_absent "$GPGUI_APP_DIR/gpauth.desktop"
verify_absent "$GP_DIR/packaging/files/usr/share/applications/gpauth.desktop"
verify_absent "$GP_DIR/packaging/bsd/gpauth.desktop"
-echo "Linux desktop assets are synchronized"
+echo "Linux desktop and tray assets are synchronized"