[gnome-mines] snap: updates from ubuntu-desktop bzr branch



commit 8b78f41cbdb12c1f4bdd5e037db9eafa8fcef909
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Thu Jan 31 18:08:47 2019 -0500

    snap: updates from ubuntu-desktop bzr branch

 snap/snapcraft.yaml | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 529b69c..8865970 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -11,14 +11,27 @@ description: |
   game. If you get stuck, you can ask for a hint: there’s a time penalty, but
   that’s better than hitting a mine!
 
-grade: devel # must be 'stable' to release into candidate/stable channels
+grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
 
+# Launchpad doesn't recognize these fields yet
+passthrough:
+  license: GPL-3.0+
+  title: GNOME Mines
+
 plugs:
-    gnome-3-26-1604:
-      interface: content
-      target: $SNAP/gnome-platform
-      default-provider: gnome-3-26-1604:gnome-3-26-1604
+  gnome-3-26-1604:
+    interface: content
+    target: $SNAP/gnome-platform
+    default-provider: gnome-3-26-1604
+  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
@@ -34,12 +47,11 @@ apps:
       - desktop
       - desktop-legacy
       - gsettings
-      - pulseaudio
       - unity7
       - wayland
     desktop: usr/share/applications/gnome-mines.desktop
     environment:
-      PATH: $SNAP/usr/games:$PATH
+      GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
 
 parts:
   gnome-mines:
@@ -47,26 +59,25 @@ parts:
     after: [desktop-gnome-platform]
     source: .
     source-type: git
-    prepare:
+    override-build: |
       sed -i.bak -e 's|=gnome-mines$|=${SNAP}/meta/gui/gnome-mines.png|g' data/gnome-mines.desktop.in
-    install: |
+      snapcraftctl build
       mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
       cp ../src/data/icons/hicolor/256x256/gnome-mines.png $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp data/gnome-mines.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
-    plugin: autotools
-    configflags: [--prefix=/snap/gnome-mines/current/usr, --bindir=/snap/gnome-mines/current/usr/games]
+      cp ../install/snap/gnome-mines/current/usr/share/applications/gnome-mines.desktop 
$SNAPCRAFT_PART_INSTALL/meta/gui/
+    plugin: meson
+    meson-parameters: [--prefix=/snap/gnome-mines/current/usr]
     organize:
       snap/gnome-mines/current/usr: usr
     build-packages:
-      - appstream-util
-      - gnome-pkg-tools
-      - intltool
+      - gettext
+      - itstool
       - libglib2.0-dev
       - libgnome-games-support-1-dev
       - libgtk-3-dev
       - librsvg2-dev
+      - libxml2-utils
       - valac
-      - yelp-tools
   libraries:
     plugin: nil
     stage-packages:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]