From 4401ccd6fa8819010f3551daf96f0f8666f0f06d Mon Sep 17 00:00:00 2001 From: SelfRef Date: Tue, 1 Aug 2023 00:36:19 +0200 Subject: [PATCH] Change icon location in Unix packages --- build.py | 10 +++++----- res/PKGBUILD | 2 +- res/rpm-flutter-suse.spec | 10 +++++----- res/rpm-flutter.spec | 10 +++++----- res/rpm-suse.spec | 8 ++++---- res/rpm.spec | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build.py b/build.py index d1fdd4aaf..bc72c1e6c 100755 --- a/build.py +++ b/build.py @@ -71,14 +71,14 @@ def parse_rc_features(feature): return 'osx' in platforms else: return 'linux' in platforms - + def get_all_features(): features = [] for (feat, feat_info) in available_features.items(): if platform_check(feat_info['platform']): features.append(feat) return features - + if isinstance(feature, str) and feature.upper() == 'ALL': return get_all_features() elif isinstance(feature, list): @@ -319,7 +319,7 @@ def build_flutter_deb(version, features): system2( 'cp ../res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( - 'cp ../res/128x128@2x.png tmpdeb/usr/share/rustdesk/files/rustdesk.png') + 'cp ../res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') system2( 'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( @@ -359,7 +359,7 @@ def build_deb_from_folder(version, binary_folder): system2( 'cp ../res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( - 'cp ../res/128x128@2x.png tmpdeb/usr/share/rustdesk/files/rustdesk.png') + 'cp ../res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') system2( 'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( @@ -584,7 +584,7 @@ def main(): system2( 'cp res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( - 'cp res/128x128@2x.png tmpdeb/usr/share/rustdesk/files/rustdesk.png') + 'cp res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') system2( 'cp res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( diff --git a/res/PKGBUILD b/res/PKGBUILD index 9e5b57b9d..6a9ca4094 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -30,5 +30,5 @@ package() { install -Dm 644 $HBB/res/rustdesk.service -t "${pkgdir}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk.desktop -t "${pkgdir}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk-link.desktop -t "${pkgdir}/usr/share/rustdesk/files" - install -Dm 644 $HBB/res/128x128@2x.png "${pkgdir}/usr/share/rustdesk/files/rustdesk.png" + install -Dm 644 $HBB/res/128x128@2x.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/rustdesk.png" } diff --git a/res/rpm-flutter-suse.spec b/res/rpm-flutter-suse.spec index 9b5131e07..1beb7234f 100644 --- a/res/rpm-flutter-suse.spec +++ b/res/rpm-flutter-suse.spec @@ -1,4 +1,4 @@ -Name: rustdesk +Name: rustdesk Version: 1.2.2 Release: 0 Summary: RPM package @@ -7,7 +7,7 @@ Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils libXtst6 libappindicator- Provides: libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit) %description -The best open-source remote desktop client software, written in Rust. +The best open-source remote desktop client software, written in Rust. %prep # we have no source, so nothing here @@ -24,12 +24,12 @@ mkdir -p "%{buildroot}/usr/bin" install -Dm 644 $HBB/res/rustdesk.service -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk.desktop -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk-link.desktop -t "%{buildroot}/usr/share/rustdesk/files" -install -Dm 644 $HBB/res/128x128@2x.png "%{buildroot}/usr/share/rustdesk/files/rustdesk.png" +install -Dm 644 $HBB/res/128x128@2x.png "%{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png" %files /usr/lib/rustdesk/* /usr/share/rustdesk/files/rustdesk.service -/usr/share/rustdesk/files/rustdesk.png +/usr/share/icons/hicolor/256x256/apps/rustdesk.png /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop @@ -53,7 +53,7 @@ esac cp /usr/share/rustdesk/files/rustdesk.service /etc/systemd/system/rustdesk.service cp /usr/share/rustdesk/files/rustdesk.desktop /usr/share/applications/ cp /usr/share/rustdesk/files/rustdesk-link.desktop /usr/share/applications/ -ln -s /usr/lib/rustdesk/rustdesk /usr/bin/rustdesk +ln -s /usr/lib/rustdesk/rustdesk /usr/bin/rustdesk systemctl daemon-reload systemctl enable rustdesk systemctl start rustdesk diff --git a/res/rpm-flutter.spec b/res/rpm-flutter.spec index 42009acb0..778e161c7 100644 --- a/res/rpm-flutter.spec +++ b/res/rpm-flutter.spec @@ -1,4 +1,4 @@ -Name: rustdesk +Name: rustdesk Version: 1.2.2 Release: 0 Summary: RPM package @@ -7,7 +7,7 @@ Requires: gtk3 libxcb libxdo libXfixes alsa-lib libappindicator-gtk3 libvdpau Provides: libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit) %description -The best open-source remote desktop client software, written in Rust. +The best open-source remote desktop client software, written in Rust. %prep # we have no source, so nothing here @@ -24,12 +24,12 @@ mkdir -p "%{buildroot}/usr/bin" install -Dm 644 $HBB/res/rustdesk.service -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk.desktop -t "%{buildroot}/usr/share/rustdesk/files" install -Dm 644 $HBB/res/rustdesk-link.desktop -t "%{buildroot}/usr/share/rustdesk/files" -install -Dm 644 $HBB/res/128x128@2x.png "%{buildroot}/usr/share/rustdesk/files/rustdesk.png" +install -Dm 644 $HBB/res/128x128@2x.png "%{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png" %files /usr/lib/rustdesk/* /usr/share/rustdesk/files/rustdesk.service -/usr/share/rustdesk/files/rustdesk.png +/usr/share/icons/hicolor/256x256/apps/rustdesk.png /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop @@ -53,7 +53,7 @@ esac cp /usr/share/rustdesk/files/rustdesk.service /etc/systemd/system/rustdesk.service cp /usr/share/rustdesk/files/rustdesk.desktop /usr/share/applications/ cp /usr/share/rustdesk/files/rustdesk-link.desktop /usr/share/applications/ -ln -s /usr/lib/rustdesk/rustdesk /usr/bin/rustdesk +ln -s /usr/lib/rustdesk/rustdesk /usr/bin/rustdesk systemctl daemon-reload systemctl enable rustdesk systemctl start rustdesk diff --git a/res/rpm-suse.spec b/res/rpm-suse.spec index 8309599b9..ea1b0f231 100644 --- a/res/rpm-suse.spec +++ b/res/rpm-suse.spec @@ -1,4 +1,4 @@ -Name: rustdesk +Name: rustdesk Version: 1.1.9 Release: 0 Summary: RPM package @@ -6,7 +6,7 @@ License: GPL-3.0 Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils libXtst6 libayatana-appindicator3-1 libvdpau1 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire %description -The best open-source remote desktop client software, written in Rust. +The best open-source remote desktop client software, written in Rust. %prep # we have no source, so nothing here @@ -23,7 +23,7 @@ mkdir -p %{buildroot}/usr/share/rustdesk/files/ install -m 755 $HBB/target/release/rustdesk %{buildroot}/usr/bin/rustdesk install $HBB/libsciter-gtk.so %{buildroot}/usr/lib/rustdesk/libsciter-gtk.so install $HBB/res/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ -install $HBB/res/128x128@2x.png %{buildroot}/usr/share/rustdesk/files/rustdesk.png +install $HBB/res/128x128@2x.png %{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ @@ -31,7 +31,7 @@ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ /usr/bin/rustdesk /usr/lib/rustdesk/libsciter-gtk.so /usr/share/rustdesk/files/rustdesk.service -/usr/share/rustdesk/files/rustdesk.png +/usr/share/icons/hicolor/256x256/apps/rustdesk.png /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop diff --git a/res/rpm.spec b/res/rpm.spec index 6a934b1f2..e9f9849da 100644 --- a/res/rpm.spec +++ b/res/rpm.spec @@ -1,4 +1,4 @@ -Name: rustdesk +Name: rustdesk Version: 1.2.2 Release: 0 Summary: RPM package @@ -6,7 +6,7 @@ License: GPL-3.0 Requires: gtk3 libxcb libxdo libXfixes alsa-lib libappindicator libvdpau1 libva2 pam gstreamer1-plugins-base %description -The best open-source remote desktop client software, written in Rust. +The best open-source remote desktop client software, written in Rust. %prep # we have no source, so nothing here @@ -23,7 +23,7 @@ mkdir -p %{buildroot}/usr/share/rustdesk/files/ install -m 755 $HBB/target/release/rustdesk %{buildroot}/usr/bin/rustdesk install $HBB/libsciter-gtk.so %{buildroot}/usr/lib/rustdesk/libsciter-gtk.so install $HBB/res/rustdesk.service %{buildroot}/usr/share/rustdesk/files/ -install $HBB/res/128x128@2x.png %{buildroot}/usr/share/rustdesk/files/rustdesk.png +install $HBB/res/128x128@2x.png %{buildroot}/usr/share/icons/hicolor/256x256/apps/rustdesk.png install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ @@ -31,7 +31,7 @@ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ /usr/bin/rustdesk /usr/lib/rustdesk/libsciter-gtk.so /usr/share/rustdesk/files/rustdesk.service -/usr/share/rustdesk/files/rustdesk.png +/usr/share/icons/hicolor/256x256/apps/rustdesk.png /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop /usr/share/rustdesk/files/__pycache__/*