From 197cd5748d1eec8f0d4ff0530b396ada4366bb17 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Thu, 5 Nov 2026 17:42:09 +0800 Subject: [PATCH] fix(packaging): remove retired named tray icons The desktop shells embed solid light and dark tray artwork. Remove the obsolete SVG payload and its Unix, binary-package, RPM, and asset-validation references, including the retired RPM directory entry. Validated all 33 remaining RPM manifest entries against a staged install and checked sibling desktop assets. Refs #690 --- Makefile | 6 ++---- packaging/binary/Makefile.in | 12 ------------ .../scalable/status/gpgui-connected-symbolic.svg | 12 ------------ .../scalable/status/gpgui-connecting-1-symbolic.svg | 12 ------------ .../scalable/status/gpgui-connecting-2-symbolic.svg | 12 ------------ .../scalable/status/gpgui-connecting-3-symbolic.svg | 12 ------------ .../scalable/status/gpgui-connecting-4-symbolic.svg | 12 ------------ .../scalable/status/gpgui-disconnected-symbolic.svg | 12 ------------ packaging/rpm/globalprotect-openconnect.spec.in | 7 ------- scripts/verify-linux-desktop-assets.sh | 13 +------------ 10 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg delete mode 100644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg delete mode 100644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg delete mode 100644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg delete mode 100644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg delete mode 100644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg diff --git a/Makefile b/Makefile index 8e531fc..551bbeb 100644 --- a/Makefile +++ b/Makefile @@ -190,8 +190,7 @@ install-unix: install-gpclient-unix set -e; if [ -f "$(GPGUI_BINARY)" ]; then \ install -m 755 "$(GPGUI_BINARY)" "$(DESTDIR)$(PREFIX)/bin/gpgui"; \ fi - set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.* \ - packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-*.svg; do \ + set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.*; do \ destination="$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \ install -d "$$(dirname "$$destination")"; \ install -m 644 "$$file" "$$destination"; \ @@ -318,8 +317,7 @@ uninstall-unix: set -e; for file in gp-hip-script-installer gp-vpnc-script-installer vpnc-script; do \ rm -f "$(DESTDIR)$(PREFIX)/libexec/gpclient/$$file"; \ done - set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.* \ - packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-*.svg; do \ + set -e; for file in packaging/files/usr/share/icons/hicolor/*/apps/gpgui.*; do \ rm -f "$(DESTDIR)$(PREFIX)/$${file#packaging/files/usr/}"; \ done rm -f "$(DESTDIR)$(PREFIX)/share/applications/gpgui.desktop" \ diff --git a/packaging/binary/Makefile.in b/packaging/binary/Makefile.in index 9ab8ea7..e287e7e 100644 --- a/packaging/binary/Makefile.in +++ b/packaging/binary/Makefile.in @@ -26,12 +26,6 @@ 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: @@ -58,12 +52,6 @@ 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 deleted file mode 100644 index d02f21b..0000000 --- a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - 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 deleted file mode 100644 index fc568f8..0000000 --- a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - 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 deleted file mode 100644 index be41866..0000000 --- a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - 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 deleted file mode 100644 index 4c63a8d..0000000 --- a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - 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 deleted file mode 100644 index b3ab25d..0000000 --- a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - 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 deleted file mode 100644 index c15e592..0000000 --- a/packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/packaging/rpm/globalprotect-openconnect.spec.in b/packaging/rpm/globalprotect-openconnect.spec.in index 85ab19f..4fe2b10 100644 --- a/packaging/rpm/globalprotect-openconnect.spec.in +++ b/packaging/rpm/globalprotect-openconnect.spec.in @@ -82,12 +82,6 @@ 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 @@ -110,7 +104,6 @@ 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 fe13095..5fe368e 100755 --- a/scripts/verify-linux-desktop-assets.sh +++ b/scripts/verify-linux-desktop-assets.sh @@ -57,17 +57,6 @@ 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_DIR/crates/desktop-tray/assets/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" @@ -150,4 +139,4 @@ for app in gpgui-helper gpauth; do verify_contains "$GP_DIR/packaging/bsd/$app.desktop" "Exec=/usr/local/bin/gpclient launch-gui" done -echo "Linux desktop and tray assets are synchronized" +echo "Linux desktop assets are synchronized"