Simplify snap configuration reducing work-arounds

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

1 files changed, 22 insertions, 42 deletions

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f4df4fd..1f95431 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -20,13 +20,21 @@ description: |
   
   Chats will generally created as opt-in. So you can decide who may contact you directly and who does not, accepting to a direct chat. Leaving a chat is also always possible.
 adopt-info: messenger-gtk
+icon: resources/icon/full_color.svg
 grade: stable
 confinement: strict
 base: core22
-icon: resources/icon/full_color.svg
+
+slots:
+  messenger-gtk:
+    interface: dbus
+    bus: session
+    name: org.gnunet.Messenger
+
 apps:
   messenger-gtk:
-    command: bin/desktop-launch $SNAP/usr/bin/messenger-gtk
+    command: usr/bin/messenger-gtk
+    extensions: [gnome]
     plugs:
       - desktop
       - desktop-legacy
@@ -39,6 +47,8 @@ apps:
       - audio-playback
       - audio-record
       - gsettings
+    desktop: usr/share/applications/org.gnunet.Messenger.desktop
+    common-id: org.gnunet.Messenger.desktop
 
 plugs:
   gtk-3-themes:
@@ -55,41 +65,7 @@ plugs:
     default-provider: gtk-common-themes
 
 parts:
-  desktop-gtk3:
-    build-packages:
-     - build-essential
-     - libc6-dev
-     - libgtk-3-dev
-     - dpkg-dev
-    make-parameters:
-      - FLAVOR=gtk3
-    plugin: make
-    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
-    source-subdir: gtk
-    stage-packages:
-      - dmz-cursor-theme
-      - light-themes
-      - adwaita-icon-theme
-      - sound-theme-freedesktop
-      - gnome-themes-standard
-      - gnome-icon-theme
-      - fonts-emojione
-      - shared-mime-info
-      - locales-all
-      - xdg-user-dirs
-      - gobject-introspection
-      - libxcursor1
-      - libgtk2.0-0
-      - libgtk-3-0
-      - libevent-2.1-7
-      - libltdl7
-      - libc6
-      - libgdk-pixbuf-2.0-0
-      - libcanberra-gtk-module
-      - libcanberra-gtk3-module
-      - locales-all
   gnunet:
-    after: [ desktop-gtk3 ]
     build-packages:
       - build-essential
       - libc6-dev
@@ -139,7 +115,7 @@ parts:
       done
       rm -r snap_fix
   messenger-gtk:
-    after: [ desktop-gtk3, gnunet, libgnunetchat ]
+    after: [ gnunet, libgnunetchat ]
     build-packages:
       - build-essential
       - libc6-dev
@@ -152,6 +128,7 @@ parts:
       - libgstreamer1.0-dev
       - libgstreamer-plugins-base1.0-dev
       - desktop-file-utils
+      - libffi7
     stage-packages:
       - libglib2.0-0
       - libhandy-1-0
@@ -164,6 +141,13 @@ parts:
       - gir1.2-handy-1
       - gir1.2-pango-1.0
       - locales
+      - gstreamer1.0-plugins-base
+      - gstreamer1.0-plugins-bad
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-gtk3
+      - libglu1-mesa
+      - freeglut3
+      - libltdl7
     source: http://ftpmirror.gnu.org/gnunet/messenger-gtk-0.7.0.tar.gz
     plugin: make
     override-build: |
@@ -174,8 +158,4 @@ parts:
       mkdir -p "$SNAPCRAFT_PART_INSTALL/usr/share/applications"
       mkdir -p "$SNAPCRAFT_PART_INSTALL/usr/share/appdata"
       export INSTALL_DIR="$SNAPCRAFT_PART_INSTALL/usr/"
-      make install
-    override-prime: |
-      snapcraftctl prime
-      rm -f "usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libc_malloc_debug.so"
-      ln -s libc_malloc_debug.so.0 "usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libc_malloc_debug.so"
+      make install
\ No newline at end of file