From a5dce157ab06bc7b8a4911873cea7577a32bf87e Mon Sep 17 00:00:00 2001
From: Giovanni Panozzo <giovanni@panozzo.it>
Date: Sun, 6 Mar 2022 09:27:10 +0000
Subject: Fixes to snap build

---
 snap/snapcraft.yaml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'snap')

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c134d0f23..19427bbbd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -27,6 +27,7 @@ apps:
     command: usr/bin/remmina
     extensions: [gnome-3-38]
     common-id: org.remmina.Remmina
+    desktop: usr/share/applications/org.remmina.Remmina.desktop
     plugs:
       - alsa
       - audio-playback
@@ -200,6 +201,7 @@ parts:
       - libpcre2-dev
       - python3-dev
       - pyhoca-cli
+      - xdg-utils
     stage-packages:
       - adwaita-icon-theme
       - dmz-cursor-theme
@@ -251,21 +253,14 @@ parts:
     override-build: |
       set -eu
       snapcraftctl build
-      mkdir -pv $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/icons/hicolor/scalable/apps/org.remmina.Remmina.svg $SNAPCRAFT_PART_INSTALL/meta/gui/icon.svg
+
       cp -r $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/metainfo $SNAPCRAFT_PART_INSTALL/usr/share/
-      cp -r $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/icons $SNAPCRAFT_PART_INSTALL/meta/gui/
-      for i in `find $SNAPCRAFT_PART_INSTALL/meta/gui/icons -name "*.svg" -o -name "*.png"`
-      do
-        mv $i "`dirname $i`/snap.$SNAPCRAFT_PROJECT_NAME.`basename $i`"
-      done
       sed --in-place '\|<id>org.remmina.Remmina</id>|a<icon type="stock">snap.remmina.org.remmina.Remmina</icon>' $SNAPCRAFT_PART_INSTALL/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/metainfo/org.remmina.Remmina.appdata.xml
       update-mime-database ${SNAPCRAFT_PART_INSTALL}/usr/share/mime
+
     override-prime: |
       set -eu
       snapcraftctl prime
-      # Fix application icon lookup
-      sed --in-place 's|^Icon=.*|Icon=snap.remmina.org.remmina.Remmina|' usr/share/applications/org.remmina.Remmina.desktop
       # Remove forbidden links (I'm sure the audio won't work anymore)
       rm -f etc/pulse/client.conf.d/01-enable-autospawn.conf lib/systemd/system/pulseaudio-enable-autospawn.service
 
-- 
cgit v1.2.3