From 790193d7f837b75b9f932b0ca313dacce3c005f9 Mon Sep 17 00:00:00 2001
From: TheJackiMonster <thejackimonster@gmail.com>
Date: Sun, 13 Nov 2022 19:55:26 +0100
Subject: Adjust snap configuration addressing some issues

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 snap/snapcraft.yaml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index aaba014..f4df4fd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -79,11 +79,17 @@ parts:
       - 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
@@ -106,6 +112,8 @@ parts:
       - libunistring2
       - libsqlite3-0
       - libmicrohttpd12
+      - libgnutls-dane0
+      - libunbound8
     source: http://ftpmirror.gnu.org/gnunet/gnunet-0.18.1.tar.gz
     plugin: autotools
     autotools-configure-parameters:
@@ -125,9 +133,7 @@ parts:
       for f in $(ls $SNAPCRAFT_STAGE/usr/lib | grep libgnunet.*\.la); do
         mv $SNAPCRAFT_STAGE/usr/lib/$f snap_fix/$f
       done
-      ./configure --prefix=$SNAPCRAFT_STAGE/usr
-      make
-      make install
+      snapcraftctl build
       for f in $(ls snap_fix); do
         mv snap_fix/$f $SNAPCRAFT_STAGE/usr/lib/$f
       done
@@ -148,7 +154,6 @@ parts:
       - desktop-file-utils
     stage-packages:
       - libglib2.0-0
-      - libgdk-pixbuf-2.0-0
       - libhandy-1-0
       - libnotify4
       - libqrencode4
@@ -158,12 +163,10 @@ parts:
       - gir1.2-gtk-3.0
       - gir1.2-handy-1
       - gir1.2-pango-1.0
+      - locales
     source: http://ftpmirror.gnu.org/gnunet/messenger-gtk-0.7.0.tar.gz
     plugin: make
     override-build: |
-      for f in $(ls $SNAPCRAFT_STAGE/usr/lib | grep libgnunetchat); do
-        cp $SNAPCRAFT_STAGE/usr/lib/$f $SNAPCRAFT_PART_INSTALL/usr/lib/$f
-      done
       export LD_LIBRARY_PATH="$SNAPCRAFT_STAGE/usr/lib"
       make release
       mkdir -p "$SNAPCRAFT_PART_INSTALL/usr/bin"
-- 
cgit v1.2.3