[gnome-characters] [snap] Fix dangling symlink and build for release rather than debug

[Ken VanDine <kvandine src gnome org>]

commit 847169126bc06c87cbc70917be98fe37948b591a
Author: Ken VanDine <ken vandine org>
Date:   Fri Aug 3 10:39:47 2018 -0400

    [snap] Fix dangling symlink and build for release rather than debug

 snap/snapcraft.yaml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index fe1f39c..d7e990c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -35,7 +35,7 @@ slots:
 
 apps:
   gnome-characters:
-    command: desktop-launch gnome-characters
+    command: desktop-launch ${SNAP}/usr/share/org.gnome.Characters/org.gnome.Characters
     plugs:
       - browser-support
       - desktop
@@ -44,10 +44,10 @@ apps:
       - home
       - unity7
       - wayland
-    desktop: usr/share/applications/org.gnome.CharactersDevel.desktop
+    desktop: usr/share/applications/org.gnome.Characters.desktop
     environment:
       GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
-      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/gnome-characters
+      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/org.gnome.Characters
 
 parts:
   iso-codes:
@@ -98,16 +98,18 @@ parts:
     after: [gnome-desktop]
     source: .
     plugin: meson
-    meson-parameters: [--prefix=/usr]
+    meson-parameters: [--buildtype=release, --prefix=/snap/gnome-characters/current/usr]
     organize:
       snap/gnome-characters/current/usr: usr
     override-build: |
       sed -i.bak -e 's|=gnome-characters$|=${SNAP}/meta/gui/gnome-characters.png|g' 
data/org.gnome.Characters.desktop.in
+      sed -i.bak -e 
's|=@bindir@/gnome-characters$|=${SNAP}/usr/share/org.gnome.Characters/org.gnome.Characters|g' 
data/org.gnome.Characters.desktop.in
       sed -i.bak -e 's|@GJS@|/snap/gnome-characters/current/usr/bin/gjs|g' src/org.gnome.Characters.in
       sed -i.bak -e 's|@GJS@|/snap/gnome-characters/current/usr/bin/gjs|g' 
src/org.gnome.Characters.BackgroundService.in
       snapcraftctl build
       mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
       cp ../src/data/icons/hicolor/256x256/apps/gnome-characters.png $SNAPCRAFT_PART_INSTALL/meta/gui/
+      rm -f $SNAPCRAFT_PART_INSTALL/snap/gnome-characters/current/usr/bin/gnome-characters
     build-attributes: ['no-system-libraries']
     build-packages:
       - desktop-file-utils
@@ -136,9 +138,11 @@ parts:
       - gir1.2-gtk-3.0
       - gir1.2-gnomedesktop-3.0
       - libreadline6
+      - libunistring0
     prime:
       - "usr/bin/gjs*"
       - "usr/lib/*/girepository-1.0*"
       - "usr/lib/*/libmozjs*"
       - "usr/lib/*.*"
       - "lib/*/libreadline.so*"
+      - "usr/lib/*/libunistring.so*"