Merge pull request #5177 from SelfRef/bugfix/icon-name-in-desktop-file
Fix icon name in .desktop entry to allow theming
This commit is contained in:
RustDesk
GitHub
commit
6f3af14623
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
18
build.py
18
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')
|
||||
@ -319,7 +321,9 @@ 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/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg')
|
||||
system2(
|
||||
'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop')
|
||||
system2(
|
||||
@ -351,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')
|
||||
@ -359,7 +365,9 @@ 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/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg')
|
||||
system2(
|
||||
'cp ../res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop')
|
||||
system2(
|
||||
@ -581,10 +589,14 @@ 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(
|
||||
'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/scalable.svg tmpdeb/usr/share/icons/hicolor/scalable/apps/rustdesk.svg')
|
||||
system2(
|
||||
'cp res/rustdesk.desktop tmpdeb/usr/share/applications/rustdesk.desktop')
|
||||
system2(
|
||||
|
||||
@ -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"],
|
||||
|
||||
@ -30,5 +30,6 @@ 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"
|
||||
install -Dm 644 $HBB/res/scalable.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/rustdesk.svg"
|
||||
}
|
||||
|
||||
@ -24,12 +24,14 @@ 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"
|
||||
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/rustdesk/files/rustdesk.png
|
||||
/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
|
||||
|
||||
|
||||
@ -24,12 +24,14 @@ 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"
|
||||
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/rustdesk/files/rustdesk.png
|
||||
/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
|
||||
|
||||
|
||||
@ -20,10 +20,13 @@ 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/
|
||||
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/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/
|
||||
|
||||
@ -31,7 +34,8 @@ 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/icons/hicolor/scalable/apps/rustdesk.svg
|
||||
/usr/share/rustdesk/files/rustdesk.desktop
|
||||
/usr/share/rustdesk/files/rustdesk-link.desktop
|
||||
|
||||
|
||||
@ -20,10 +20,13 @@ 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/
|
||||
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/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/
|
||||
|
||||
@ -31,7 +34,8 @@ 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/icons/hicolor/scalable/apps/rustdesk.svg
|
||||
/usr/share/rustdesk/files/rustdesk.desktop
|
||||
/usr/share/rustdesk/files/rustdesk-link.desktop
|
||||
/usr/share/rustdesk/files/__pycache__/*
|
||||
|
||||
@ -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
|
||||
|
||||
88
res/scalable.svg
Normal file
88
res/scalable.svg
Normal file
@ -0,0 +1,88 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
style="isolation:isolate"
|
||||
viewBox="66.993 897.484 32 32.000001"
|
||||
version="1.1"
|
||||
id="svg11"
|
||||
sodipodi:docname="design.svg"
|
||||
xml:space="preserve"
|
||||
inkscape:export-filename="216333102-4d10c195-be66-4fa0-97ca-70a71756b25e.png"
|
||||
inkscape:export-xdpi="3733.2917"
|
||||
inkscape:export-ydpi="3733.2917"
|
||||
inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
|
||||
width="32"
|
||||
height="32"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||
id="defs15"><linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#a"
|
||||
id="linearGradient765"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(26.000475,0,0,25.999358,17.984526,891.74869)"
|
||||
x1="0.14773831"
|
||||
y1="0.85134232"
|
||||
x2="0.84543866"
|
||||
y2="0.15443686" /></defs><sodipodi:namedview
|
||||
id="namedview13"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
inkscape:zoom="1.8436908"
|
||||
inkscape:cx="11.119001"
|
||||
inkscape:cy="90.307984"
|
||||
inkscape:window-width="1440"
|
||||
inkscape:window-height="847"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="25"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg11"
|
||||
showguides="true" /><linearGradient
|
||||
id="a"
|
||||
x1="0.14773831"
|
||||
x2="0.84543866"
|
||||
y1="0.85134232"
|
||||
y2="0.15443686"
|
||||
gradientTransform="matrix(26.301,0,0,26.331,90.673535,911.7572)"
|
||||
gradientUnits="userSpaceOnUse"><stop
|
||||
offset="0"
|
||||
stop-color="#004ba6"
|
||||
id="stop4"
|
||||
style="stop-color:#0071ff;stop-opacity:1;" /><stop
|
||||
offset="1"
|
||||
stop-color="#00bfe1"
|
||||
id="stop6"
|
||||
style="stop-color:#00bfe1;stop-opacity:1;" /></linearGradient><g
|
||||
id="g763"
|
||||
inkscape:export-filename="../../Desktop/path9.png"
|
||||
inkscape:export-xdpi="768"
|
||||
inkscape:export-ydpi="768"
|
||||
transform="translate(52.008497,8.73577)"><g
|
||||
id="g761"
|
||||
inkscape:export-filename="./g369.png"
|
||||
inkscape:export-xdpi="3733.2917"
|
||||
inkscape:export-ydpi="3733.2917"><rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="rect757"
|
||||
width="32"
|
||||
height="32"
|
||||
x="14.984506"
|
||||
y="888.74823"
|
||||
rx="5"
|
||||
ry="5" /><path
|
||||
fill="url(#a)"
|
||||
d="m 40.309479,897.8163 -2.13532,2.12189 c -0.37566,0.3367 -0.557321,0.87878 -0.34675,1.33694 1.422559,2.97602 0.882559,6.52382 -1.45146,8.85602 -2.33502,2.33131 -5.88696,2.8707 -8.866524,1.44881 -0.43892,-0.1965 -0.953964,-0.03 -1.292057,0.31269 l -2.169919,2.16641 c -0.255052,0.2498 -0.3806,0.6023 -0.34007,0.95579 0.04054,0.3545 0.243189,0.6695 0.54767,0.8541 5.1129,3.09451 11.678999,2.30561 15.911089,-1.9116 4.232081,-4.2162 5.03876,-10.77258 1.9554,-15.88729 -0.17696,-0.31103 -0.48935,-0.52234 -0.84425,-0.5717 -0.35489,-0.0503 -0.71276,0.0681 -0.967809,0.31794 z M 21.84293,895.5107 c -4.252844,4.20042 -5.086212,10.75775 -2.019657,15.88535 0.176955,0.312 0.488356,0.5233 0.843254,0.5727 0.354897,0.05 0.712761,-0.0679 0.968802,-0.319 l 2.123457,-2.1091 c 0.384554,-0.3367 0.572151,-0.8847 0.358619,-1.3488 -1.422557,-2.976 -0.883552,-6.52373 1.451458,-8.85593 2.334022,-2.33127 5.886947,-2.87085 8.865525,-1.44997 0.433981,0.19451 0.94211,0.033 1.281191,-0.29971 l 2.181779,-2.1792 c 0.255051,-0.24884 0.380601,-0.60134 0.340071,-0.95581 -0.04149,-0.35349 -0.24319,-0.66847 -0.54767,-0.85411 -5.121801,-3.06787 -11.678015,-2.25523 -15.893292,1.97185 z"
|
||||
id="path759"
|
||||
inkscape:export-filename="../../Desktop/path9.png"
|
||||
inkscape:export-xdpi="2599.3848"
|
||||
inkscape:export-ydpi="2599.3848"
|
||||
style="fill:url(#linearGradient765);stroke-width:0.987991"
|
||||
sodipodi:nodetypes="ccccccccccccccccccccccccccc" /></g></g></svg>
|
||||
|
After Width: | Height: | Size: 4.2 KiB |
Loading…
x
Reference in New Issue
Block a user