[lightsoff] snap: Update from gnome-3-30 branch then update for appid renaming

[Jeremy Bicha <jbicha src gnome org>]

commit 0b3ecc6e9ec59ed3774c1139b759ade6340f1383
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Thu Jan 31 19:11:43 2019 -0500

    snap: Update from gnome-3-30 branch then update for appid renaming

 snap/snapcraft.yaml | 79 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 55 insertions(+), 24 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7a12b54..961f4cb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -7,16 +7,30 @@ description: |
   too. Your objective is simple: turn off all the lights!
 
   Players who delight in turning off lights will enjoy the huge number of
-  levels.    
+  levels.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
+grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
+base: core18
+
+# Launchpad doesn't recognize these fields yet
+passthrough:
+  license: GPL-2.0+
+  title: Lights Off
 
 plugs:
-    gnome-3-26-1604:
-      interface: content
-      target: $SNAP/gnome-platform
-      default-provider: gnome-3-26-1604:gnome-3-26-1604
+  gnome-3-28-1804:
+    interface: content
+    target: $SNAP/gnome-platform
+    default-provider: gnome-3-28-1804
+  gtk-3-themes:
+    interface: content
+    target: $SNAP/data-dir/themes
+    default-provider: gtk-common-themes
+  icon-themes:
+    interface: content
+    target: $SNAP/data-dir/icons
+    default-provider: gtk-common-themes
 
 slots:
   # for GtkApplication registration
@@ -27,43 +41,60 @@ slots:
 
 apps:
   lightsoff:
-    command: desktop-launch lightsoff
+    command: desktop-launch snapcraft-preload lightsoff
     plugs:
       - desktop
       - desktop-legacy
       - gsettings
-      - pulseaudio
       - opengl
       - unity7
       - wayland
-    desktop: usr/share/applications/lightsoff.desktop
+    desktop: usr/share/applications/org.gnome.LightsOff.desktop
     environment:
-      PATH: $SNAP/usr/games:$PATH
+      GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
 
 parts:
+# Needed by clutter
+  snapcraft-preload:
+    source: https://github.com/sergiusens/snapcraft-preload.git
+    plugin: cmake
+    build-packages:
+      - gcc-multilib
+      - g++-multilib
+
+  desktop-gnome-platform:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: gtk
+    plugin: make
+    make-parameters: ["FLAVOR=gtk3"]
+    build-packages:
+      - build-essential
+      - libgtk-3-dev
+    override-build: |
+      snapcraftctl build
+      mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform
+
   lightsoff:
-    build-attributes: [no-system-libraries]
     after: [desktop-gnome-platform]
-    source: .
+    source: ,
     source-type: git
-    prepare:
-      sed -i.bak -e 's|Icon=lightsoff$|Icon=${SNAP}/meta/gui/lightsoff.svg|g' data/lightsoff.desktop.in
-    install: |
+    override-build: |
+      sed -i.bak -e 's|Icon=org.gnome.LightsOff.svg$|Icon=${SNAP}/meta/gui/org.gnome.LightsOff.svg|g' 
data/org.gnome.LightsOff.desktop.in
+      snapcraftctl build
       mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp ../src/data/icons/hicolor/scalable/lightsoff.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp data/lightsoff.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
-    plugin: autotools
-    configflags: [--prefix=/snap/lightsoff/current/usr, --bindir=/snap/lightsoff/current/usr/games]
+      cp ../src/data/icons/hicolor/scalable/apps/org.gnome.LightsOff.svg $SNAPCRAFT_PART_INSTALL/meta/gui/
+      cp ../install/snap/lightsoff/current/usr/share/applications/org.gnome.LightsOff.desktop 
$SNAPCRAFT_PART_INSTALL/meta/gui/
+    plugin: meson
+    meson-parameters: [--prefix=/snap/lightsoff/current/usr]
     organize:
       snap/lightsoff/current/usr: usr
     build-packages:
-      - appstream-util
-      - gnome-pkg-tools
-      - intltool
-      - libclutter-1.0-dev
+      - gettext
+      - itstool
       - libclutter-gtk-1.0-dev
       - libglib2.0-dev
       - libgtk-3-dev
       - librsvg2-dev
       - valac
-      - yelp-tools
+    stage-packages:
+      - libclutter-gtk-1.0-0