From 27353f98ff3a65fc822cf62fc95117bbf3594df7 Mon Sep 17 00:00:00 2001 From: SelfRef Date: Fri, 28 Jul 2023 11:29:17 +0200 Subject: [PATCH 1/4] Fix icon name in .desktop entry to allow theming --- res/rustdesk.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/rustdesk.desktop b/res/rustdesk.desktop index e6ee6476a..cc72ff449 100644 --- a/res/rustdesk.desktop +++ b/res/rustdesk.desktop @@ -3,7 +3,7 @@ Name=RustDesk GenericName=Remote Desktop Comment=Remote Desktop Exec=rustdesk %u -Icon=/usr/share/rustdesk/files/rustdesk.png +Icon=rustdesk Terminal=false Type=Application StartupNotify=true From 4401ccd6fa8819010f3551daf96f0f8666f0f06d Mon Sep 17 00:00:00 2001 From: SelfRef Date: Tue, 1 Aug 2023 00:36:19 +0200 Subject: [PATCH 2/4] 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__/* From 8595d3e569dcf4066f5de4f7cbe5c6cbaf4fea4d Mon Sep 17 00:00:00 2001 From: SelfRef Date: Tue, 1 Aug 2023 00:54:21 +0200 Subject: [PATCH 3/4] Add scalable icon for Unix packages --- appimage/AppImageBuilder-aarch64.yml | 1 + appimage/AppImageBuilder-x86_64.yml | 1 + build.py | 6 ++ flatpak/rustdesk.json | 3 +- res/PKGBUILD | 1 + res/rpm-flutter-suse.spec | 2 + res/rpm-flutter.spec | 2 + res/rpm-suse.spec | 2 + res/rpm.spec | 2 + res/scalable.svg | 88 ++++++++++++++++++++++++++++ 10 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 res/scalable.svg diff --git a/appimage/AppImageBuilder-aarch64.yml b/appimage/AppImageBuilder-aarch64.yml index e4cfb723e..b372f4eb9 100644 --- a/appimage/AppImageBuilder-aarch64.yml +++ b/appimage/AppImageBuilder-aarch64.yml @@ -8,6 +8,7 @@ script: - mv ./usr ./AppDir/usr # 32x32 icon - for i in {32,64,128}; do mkdir -p ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/; cp ../res/$i\x$i.png ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/rustdesk.png; done + - mkdir -p ./AppDir/usr/share/icons/hicolor/scalable/apps/; cp ../res/scalable.svg ./AppDir/usr/share/icons/hicolor/scalable/apps/rustdesk.svg # desktop file # - sed -i "s/Icon=\/usr\/share\/rustdesk\/files\/rustdesk.png/Icon=rustdesk/g" ./AppDir/usr/share/applications/rustdesk.desktop - rm -rf ./AppDir/usr/share/applications diff --git a/appimage/AppImageBuilder-x86_64.yml b/appimage/AppImageBuilder-x86_64.yml index 1a443dc34..9a4054b62 100644 --- a/appimage/AppImageBuilder-x86_64.yml +++ b/appimage/AppImageBuilder-x86_64.yml @@ -8,6 +8,7 @@ script: - mv ./usr ./AppDir/usr # 32x32 icon - for i in {32,64,128}; do mkdir -p ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/; cp ../res/$i\x$i.png ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/rustdesk.png; done + - mkdir -p ./AppDir/usr/share/icons/hicolor/scalable/apps/; cp ../res/scalable.svg ./AppDir/usr/share/icons/hicolor/scalable/apps/rustdesk.svg # desktop file # - sed -i "s/Icon=\/usr\/share\/rustdesk\/files\/rustdesk.png/Icon=rustdesk/g" ./AppDir/usr/share/applications/rustdesk.desktop - rm -rf ./AppDir/usr/share/applications diff --git a/build.py b/build.py index bc72c1e6c..98d8aa30f 100755 --- a/build.py +++ b/build.py @@ -320,6 +320,8 @@ def build_flutter_deb(version, features): 'cp ../res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( 'cp ../res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') + system2( + 'cp ../res/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg') system2( 'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( @@ -360,6 +362,8 @@ def build_deb_from_folder(version, binary_folder): 'cp ../res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( 'cp ../res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') + system2( + 'cp ../res/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg') system2( 'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( @@ -585,6 +589,8 @@ def main(): 'cp res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( 'cp res/128x128@2x.png tmpdeb/usr/share/icons/hicolor/256x256/apps/rustdesk.png') + system2( + 'cp res/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg') system2( 'cp res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop') system2( diff --git a/flatpak/rustdesk.json b/flatpak/rustdesk.json index ff7701d27..4a8334fc9 100644 --- a/flatpak/rustdesk.json +++ b/flatpak/rustdesk.json @@ -4,7 +4,7 @@ "runtime-version": "21.08", "sdk": "org.freedesktop.Sdk", "command": "rustdesk", - "icon": "share/rustdesk/files/rustdesk.png", + "icon": "share/icons/hicolor/scalable/apps/rustdesk.svg", "modules": [ "shared-modules/libappindicator/libappindicator-gtk3-12.10.json", "xdotool.json", @@ -19,6 +19,7 @@ "mv /app/share/applications/rustdesk.desktop /app/share/applications/com.rustdesk.RustDesk.desktop", "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/com.rustdesk.RustDesk.desktop", "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/rustdesk-link.desktop", + "mv /app/share/icons/hicolor/scalable/apps/rustdesk.svg /app/share/icons/hicolor/scalable/apps/com.rustdesk.RustDesk.svg", "for size in 16 24 32 48 64 128 256 512; do\n rsvg-convert -w $size -h $size -f png -o $size.png logo.svg\n install -Dm644 $size.png /app/share/icons/hicolor/${size}x${size}/apps/com.rustdesk.RustDesk.png\n done" ], "cleanup": ["/include", "/lib/pkgconfig", "/share/gtk-doc"], diff --git a/res/PKGBUILD b/res/PKGBUILD index 6a9ca4094..4d3911b3b 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -31,4 +31,5 @@ package() { 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/icons/hicolor/256x256/apps/rustdesk.png" + install -Dm 644 $HBB/res/scalable.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" } diff --git a/res/rpm-flutter-suse.spec b/res/rpm-flutter-suse.spec index 1beb7234f..08080424c 100644 --- a/res/rpm-flutter-suse.spec +++ b/res/rpm-flutter-suse.spec @@ -25,11 +25,13 @@ install -Dm 644 $HBB/res/rustdesk.service -t "%{buildroot}/usr/share/rustdesk/fi 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/icons/hicolor/256x256/apps/rustdesk.png" +install -Dm 644 $HBB/res/scalable.svg "%{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" %files /usr/lib/rustdesk/* /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop diff --git a/res/rpm-flutter.spec b/res/rpm-flutter.spec index 778e161c7..5b4899bff 100644 --- a/res/rpm-flutter.spec +++ b/res/rpm-flutter.spec @@ -25,11 +25,13 @@ install -Dm 644 $HBB/res/rustdesk.service -t "%{buildroot}/usr/share/rustdesk/fi 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/icons/hicolor/256x256/apps/rustdesk.png" +install -Dm 644 $HBB/res/scalable.svg "%{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" %files /usr/lib/rustdesk/* /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop diff --git a/res/rpm-suse.spec b/res/rpm-suse.spec index ea1b0f231..6d190da32 100644 --- a/res/rpm-suse.spec +++ b/res/rpm-suse.spec @@ -24,6 +24,7 @@ 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/icons/hicolor/256x256/apps/rustdesk.png +install $HBB/res/scalable.svg %{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ @@ -32,6 +33,7 @@ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ /usr/lib/rustdesk/libsciter-gtk.so /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop diff --git a/res/rpm.spec b/res/rpm.spec index e9f9849da..ff28a621b 100644 --- a/res/rpm.spec +++ b/res/rpm.spec @@ -24,6 +24,7 @@ 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/icons/hicolor/256x256/apps/rustdesk.png +install $HBB/res/scalable.svg %{buildroot}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg install $HBB/res/rustdesk.desktop %{buildroot}/usr/share/rustdesk/files/ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ @@ -32,6 +33,7 @@ install $HBB/res/rustdesk-link.desktop %{buildroot}/usr/share/rustdesk/files/ /usr/lib/rustdesk/libsciter-gtk.so /usr/share/rustdesk/files/rustdesk.service /usr/share/icons/hicolor/256x256/apps/rustdesk.png +/usr/share/icons/hicolor/scalable/apps/rustdesk.svg /usr/share/rustdesk/files/rustdesk.desktop /usr/share/rustdesk/files/rustdesk-link.desktop /usr/share/rustdesk/files/__pycache__/* diff --git a/res/scalable.svg b/res/scalable.svg new file mode 100644 index 000000000..50cab67a3 --- /dev/null +++ b/res/scalable.svg @@ -0,0 +1,88 @@ + + From 5cb4413655f06b1e5c40bdb1b686b30d5f1cc749 Mon Sep 17 00:00:00 2001 From: SelfRef Date: Tue, 1 Aug 2023 19:33:06 +0200 Subject: [PATCH 4/4] Add missing dirs --- build.py | 6 ++++++ res/rpm-suse.spec | 2 ++ res/rpm.spec | 2 ++ 3 files changed, 10 insertions(+) diff --git a/build.py b/build.py index 98d8aa30f..378cce940 100755 --- a/build.py +++ b/build.py @@ -311,6 +311,8 @@ def build_flutter_deb(version, features): system2('mkdir -p tmpdeb/etc/rustdesk/') system2('mkdir -p tmpdeb/etc/pam.d/') system2('mkdir -p tmpdeb/usr/share/rustdesk/files/systemd/') + system2('mkdir -p tmpdeb/usr/share/icons/hicolor/256x256/apps/') + system2('mkdir -p tmpdeb/usr/share/icons/hicolor/scalable/apps/') system2('mkdir -p tmpdeb/usr/share/applications/') system2('mkdir -p tmpdeb/usr/share/polkit-1/actions') system2('rm tmpdeb/usr/bin/rustdesk || true') @@ -353,6 +355,8 @@ def build_deb_from_folder(version, binary_folder): system2('mkdir -p tmpdeb/usr/bin/') system2('mkdir -p tmpdeb/usr/lib/rustdesk') system2('mkdir -p tmpdeb/usr/share/rustdesk/files/systemd/') + system2('mkdir -p tmpdeb/usr/share/icons/hicolor/256x256/apps/') + system2('mkdir -p tmpdeb/usr/share/icons/hicolor/scalable/apps/') system2('mkdir -p tmpdeb/usr/share/applications/') system2('mkdir -p tmpdeb/usr/share/polkit-1/actions') system2('rm tmpdeb/usr/bin/rustdesk || true') @@ -585,6 +589,8 @@ def main(): 'mv target/release/bundle/deb/rustdesk*.deb ./rustdesk.deb') system2('dpkg-deb -R rustdesk.deb tmpdeb') system2('mkdir -p tmpdeb/usr/share/rustdesk/files/systemd/') + system2('mkdir -p tmpdeb/usr/share/icons/hicolor/256x256/apps/') + system2('mkdir -p tmpdeb/usr/share/icons/hicolor/scalable/apps/') system2( 'cp res/rustdesk.service tmpdeb/usr/share/rustdesk/files/systemd/') system2( diff --git a/res/rpm-suse.spec b/res/rpm-suse.spec index 6d190da32..d84e14812 100644 --- a/res/rpm-suse.spec +++ b/res/rpm-suse.spec @@ -20,6 +20,8 @@ The best open-source remote desktop client software, written in Rust. mkdir -p %{buildroot}/usr/bin/ mkdir -p %{buildroot}/usr/lib/rustdesk/ mkdir -p %{buildroot}/usr/share/rustdesk/files/ +mkdir -p %{buildroot}/usr/share/icons/hicolor/256x256/apps/ +mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable/apps/ 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/ diff --git a/res/rpm.spec b/res/rpm.spec index ff28a621b..6ce788ae7 100644 --- a/res/rpm.spec +++ b/res/rpm.spec @@ -20,6 +20,8 @@ The best open-source remote desktop client software, written in Rust. mkdir -p %{buildroot}/usr/bin/ mkdir -p %{buildroot}/usr/lib/rustdesk/ mkdir -p %{buildroot}/usr/share/rustdesk/files/ +mkdir -p %{buildroot}/usr/share/icons/hicolor/256x256/apps/ +mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable/apps/ 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/