Merge lp:~3v1n0/snappy-playpen/hello-unity-fixes into lp:snappy-playpen

[Marco Trevisan (Treviño)]

Fixed hello-unity, to properly build and run in snap environment.

Since the upstream code needs some patches, I've played a little with it including an example of "quilt" plugin, which allows to use quilt patches to fix upstream code (upstream fixes parially live at lp:~3v1n0/hello-unity/sandbox-support).

[lp:~3v1n0/snappy-playpen/hello-unity-fixes]

51. By Marco Trevisan (Treviño) on 2016-05-17

HelloUnity: use cached files and user data around

52. By Marco Trevisan (Treviño) on 2016-05-17

HelloUnity: use snap version to chose which data or cache path use

[Michael Hall (mhall119)]

Built a snap using this, but got apparmor error when running it:

May 16 23:00:34 mhall-thinkpad kernel: [10792.749388] audit: type=1400 audit(1463457634.502:103): apparmor="DENIED" operation="open" profile="snap.hello-unity.hello-unity" name="/home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/stage/usr/lib/python2.7/os.py" pid=18146 comm="hello-unity" requested_mask="r" denied_mask="r" fsuid=1000 ouid=1000
May 16 23:00:34 mhall-thinkpad kernel: [10792.749452] audit: type=1400 audit(1463457634.502:104): apparmor="DENIED" operation="open" profile="snap.hello-unity.hello-unity" name="/home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/stage/usr/lib/python2.7/os.pyc" pid=18146 comm="hello-unity" requested_mask="r" denied_mask="r" fsuid=1000 ouid=1000

[Michael Hall (mhall119)]

Even installing with --devmode running the app fails:

mhall@mhall-thinkpad:~/projects/Ubuntu/snaps/snappy-playpen/hello-unity$ /snap/bin/hello-unity
Traceback (most recent call last):
  File "/snap/hello-unity/100001/usr/bin/hello-unity", line 4, in <module>
    __import__('pkg_resources').run_script('hello-unity==0.4', 'hello-unity')
  File "/snap/hello-unity/100001/usr/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 719, in run_script
    self.require(requires)[0].run_script(script_name, ns)
  File "/snap/hello-unity/100001/usr/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 1496, in run_script
    raise ResolutionError("No script named %r" % script_name)
pkg_resources.ResolutionError: No script named 'hello-unity'

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Mhmhmh.... Wait, are you sure you installed this snap version? Because this should run /snap/hello-unity/current/opt/bin/hello-unity which is not using the run_script thing.

I also had this problem, but also desktop files should actually run
  /snap/hello-unity/current/bin/hello-unity

Which is a wrapper that eventually calls the script above

[Michael Hall (mhall119)]

I removed and rebuilt everything, installed with --devmode, still getting this:

mhall@mhall-thinkpad:~/projects/Ubuntu/snaps$ hello-unity
Traceback (most recent call last):
  File "/snap/hello-unity/100001/usr/bin/hello-unity", line 4, in <module>
    __import__('pkg_resources').run_script('hello-unity==0.4', 'hello-unity')
  File "/snap/hello-unity/100001/usr/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 719, in run_script
    self.require(requires)[0].run_script(script_name, ns)
  File "/snap/hello-unity/100001/usr/lib/python2.7/dist-packages/pkg_resources/__init__.py", line 1496, in run_script
    raise ResolutionError("No script named %r" % script_name)
pkg_resources.ResolutionError: No script named 'hello-unity'

[Jamie Strandboge (jdstrand)]

I get a different result. Note, I 'snap remove hello-unity' and then 'snap install ./hello-unity_0.4-snap2_amd64.snap'.

Note I didn't install it with --devmode. When I run it I see:

Traceback (most recent call last):
  File "/snap/hello-unity/100001/usr/lib/python2.7/dist-packages/site.py", line 75, in <module>
    __boot()
  File "/snap/hello-unity/100001/usr/lib/python2.7/dist-packages/site.py", line 3, in __boot
    import os
ImportError: No module named os

and the following apparmor denials:
audit: type=1400 audit(1463513788.872:142): apparmor="DENIED" operation="open" profile="snap.hello-unity.hello-unity" name="/home/jamie/bzr-pulls/snappy-playpen/hello-unity/stage/usr/lib/python2.7/os.py" pid=31432 comm="hello-unity" requested_mask="r" denied_mask="r" fsuid=1000 ouid=1000
audit: type=1400 audit(1463513788.872:143): apparmor="DENIED" operation="open" profile="snap.hello-unity.hello-unity" name="/home/jamie/bzr-pulls/snappy-playpen/hello-unity/stage/usr/lib/python2.7/os.pyc" pid=31432 comm="hello-unity" requested_mask="r" denied_mask="r" fsuid=1000 ouid=1000

If I do:
$ grep -r 'jamie/bzr-pulls' ./*|grep -v pyc

I see a ton of absolute paths to my snap build directory rather then the snap install directory (/snap/hello-unity/current/).

[Michael Hall (mhall119)]

My mistake, I messed up my bzr merge and that was causing all of the problems. I had to use --devmode, and amd also getting some apparmor denials,but the app runs and most of the Unity API use works too, approving

review: Approve

[Michael Hall (mhall119)]

Marco, can you propose these patches to the upstream project so I can merge them there?

[Marco Trevisan (Treviño) (3v1n0)]

Michael, sure... Changes are already in lp:~3v1n0/hello-unity/sandbox-support (I planned to get these merged upstream too), but I also wanted to use this example to show how to patch upstream code.

However, we still need to include a patch (the one that changes the name of the .desktop file), so You could still merge it and update the downstream patches accordingly (remove the first two of the serie).

=== modified file 'hello-unity/hello-unity.wrapper' (properties changed: +x to -x)
--- hello-unity/hello-unity.wrapper	2016-04-09 02:39:30 +0000
+++ hello-unity/hello-unity.wrapper	2016-05-17 01:04:22 +0000
@@ -1,6 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
-ARCH='i386-linux-gnu'
+if [ "$SNAP_ARCH" == "amd64" ]; then
+  ARCH='x86_64-linux-gnu'
+elif [ "$SNAP_ARCH" == "armhf" ]; then
+  ARCH="arm-linux-gnueabihf"
+else
+  ARCH="$SNAP_ARCH-linux-gnu"
+fi
 
 export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH:$LD_LIBRARY_PATH
 
@@ -12,16 +18,12 @@
 export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/mesa-egl:$LD_LIBRARY_PATH
 
 # XDG Config
-export XDG_CONFIG_DIRS=$SNAP/etc/xdg:$XDG_CONFIG_DIRS
-export XDG_CONFIG_DIRS=$SNAP/usr/xdg:$XDG_CONFIG_DIRS
+export XDG_CONFIG_DIRS=$SNAP/etc:$XDG_CONFIG_DIRS
+
 # Note: this doesn't seem to work, QML's LocalStorage either ignores
 # or fails to use $SNAP_USER_DATA if defined here
-export XDG_DATA_DIRS=$SNAP_USER_DATA:$XDG_DATA_DIRS
 export XDG_DATA_DIRS=$SNAP/usr/share:$XDG_DATA_DIRS
 
-# Not good, needed for fontconfig
-export XDG_DATA_HOME=$SNAP/usr/share
-
 # Font Config
 export FONTCONFIG_PATH=$SNAP/etc/fonts/config.d
 export FONTCONFIG_FILE=$SNAP/etc/fonts/fonts.conf
@@ -32,5 +34,76 @@
 # Necessary for the SDK to find the translations directory
 export APP_DIR=$SNAP
 
-cd $SNAP
-usr/bin/python $SNAP/usr/bin/hello-unity
+# Set XDG_DATA_HOME to local path, dependent on snap version
+export XDG_DATA_HOME=$SNAP_USER_DATA/.local-$SNAP_VERSION/share
+export XDG_DATA_DIRS=$XDG_DATA_HOME:$XDG_DATA_DIRS
+mkdir -p $XDG_DATA_HOME
+
+# Set cache folder to local path, dependent on snap version
+export XDG_CACHE_HOME=$SNAP_USER_DATA/.cache-$SNAP_VERSION
+mkdir -p $XDG_CACHE_HOME
+
+# Setup GI Repository typelibs (needed as some packages doesn't support multiarch)
+export GI_TYPELIB_PATH=$SNAP/usr/lib/$ARCH/girepository-1.0:$SNAP/usr/lib/girepository-1.0
+
+# Not good, needed for fontconfig and themes
+ln -sf $SNAP/usr/share/{fontconfig,fonts,fonts-*,themes} $XDG_DATA_HOME
+
+# Gio modules and cache
+export GIO_MODULE_DIR=$XDG_CACHE_HOME/gio-modules
+
+if [ ! -d $GIO_MODULE_DIR ]; then
+  mkdir -p $GIO_MODULE_DIR
+  ln -s $SNAP/usr/lib/$ARCH/gio/modules/*.so $GIO_MODULE_DIR
+  $SNAP/usr/lib/$ARCH/glib-2.0/gio-querymodules $GIO_MODULE_DIR
+fi
+
+# Build mime.cache
+if [ ! -d $XDG_DATA_HOME/mime ]; then
+  cp -a $SNAP/usr/share/mime $XDG_DATA_HOME
+  update-mime-database $XDG_DATA_HOME/mime
+fi
+
+# Setup GDK pixbuf loaders
+export GDK_PIXBUF_MODULE_FILE=$XDG_CACHE_HOME/gdk-pixbuf-loaders.cache
+export GDK_PIXBUF_MODULEDIR=$SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/2.10.0/loaders
+
+if [ ! -e $GDK_PIXBUF_MODULE_FILE ]; then
+  $SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > $GDK_PIXBUF_MODULE_FILE
+fi
+
+# Keep an array of data dirs, for looping through them
+IFS=':' read -r -a data_dirs_array <<< "$XDG_DATA_DIRS"
+
+# Setup compiled gsettings schema
+GS_SCHEMA_DIR=$XDG_DATA_HOME/glib-2.0/schemas
+
+if [ ! -d $GS_SCHEMA_DIR ]; then
+  mkdir -p $GS_SCHEMA_DIR
+  for d in "${data_dirs_array[@]}"; do
+    ln -s $d/glib-2.0/schemas/*.xml $GS_SCHEMA_DIR
+  done
+
+  $SNAP/usr/lib/$ARCH/glib-2.0/glib-compile-schemas $GS_SCHEMA_DIR
+fi
+
+# Icon themes cache
+if [ ! -d $XDG_DATA_HOME/icons ]; then
+  mkdir -p $XDG_DATA_HOME/icons
+  for d in "${data_dirs_array[@]}"; do
+    for i in $d/icons/*; do
+      if [ -d "$i" ]; then
+        theme_dir=$XDG_DATA_HOME/icons/$(basename "$i")
+        mkdir -p "$theme_dir"
+        ln -s $i/* "$theme_dir"
+        $SNAP/usr/sbin/update-icon-caches "$theme_dir"
+        gtk-update-icon-cache-3.0 "$theme_dir"
+      fi
+    done
+  done
+fi
+
+# GTK modules
+export GTK_PATH=$SNAP/usr/lib/$ARCH/gtk-3.0
+
+exec $SNAP/usr/bin/python $SNAP/opt/bin/hello-unity

=== added directory 'hello-unity/parts'
=== added directory 'hello-unity/parts/plugins'
=== added file 'hello-unity/parts/plugins/x-quilt.py'
--- hello-unity/parts/plugins/x-quilt.py	1970-01-01 00:00:00 +0000
+++ hello-unity/parts/plugins/x-quilt.py	2016-05-17 01:04:22 +0000
@@ -0,0 +1,106 @@
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Author: Marco Trevisan <[e-mail]>
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A simple snapcraft plugin that allows to use quilt patches with any
+source package.
+
+In order to use this, the yaml file should contain:
+ - A part that only fetches the sources (you can use the copy plugin or
+   a dummy project plugin, that only extends BasePlugin)
+ - A part that uses this plugin (quilt) and that has the `after:` and
+   `target-part:` parameters containing the part defined above
+ - A part that uses the actual builder plugin for such sources, that has
+   the previous part (patches) in the `after:` list, and that uses as
+   `sources:` the sources part.
+
+For example:
+
+    parts:
+      upstream-src:
+        plugin: copy
+        source: https://github.com/ubuntu-core/snapcraft.git
+        files:
+          README.md: docs/README.md
+
+      patches:
+        plugin: quilt
+        source: https://github.com/3v1n0/my-snapcraft-patches.git
+        target-part: upstream-src
+        after: [upstream-src]
+
+      setup:
+        plugin: python3
+        source: ./parts/upstream-src/src/
+        build-packages:
+          - python-distutils-extra
+        after: [patches]
+"""
+
+import os
+import stat
+
+import snapcraft
+
+class QuiltPlugin(snapcraft.BasePlugin):
+
+    @classmethod
+    def schema(cls):
+        schema = super().schema()
+
+        schema['properties']['patches-dir'] = {
+            'type': 'string',
+            'default': '',
+        }
+
+        schema['properties']['target-part'] = {
+            'type': 'string'
+        }
+
+        schema['required'].append('target-part')
+
+        return schema
+
+    def __init__(self, name, options, project):
+        super().__init__(name, options, project)
+        self.build_packages.extend(['quilt'])
+        
+        self.patch_dir = os.path.join(self.sourcedir, self.options.patches_dir)
+        self.target_dir = os.path.join(self.project.parts_dir, self.options.target_part)
+        self.target_src = os.path.join(self.target_dir, "src")
+
+    def build(self):
+        super().build()
+ 
+        if not os.path.exists(self.target_src) or \
+           not os.path.exists(os.path.join(self.target_dir, "state", "pull")):
+            raise EnvironmentError('Target part not fetched, fix order in yaml file: {}'.format(self.options.target_part))
+
+        if os.path.exists(self.patch_dir):
+            os.environ['QUILT_PATCHES'] = self.patch_dir
+            self.run(['quilt', 'push', '-a'], cwd=self.target_src)
+            
+    def clean_build(self):
+        super().clean_build()
+
+        if os.path.exists(self.patch_dir) and \
+           os.path.exists(os.path.join(self.partdir, "state", "build")):
+            try:
+                os.environ['QUILT_PATCHES'] = self.patch_dir
+                self.run(['quilt', 'pop', '-a', '-f'], cwd=self.target_src)
+            except:
+                pass
+

=== added directory 'hello-unity/patches'
=== added file 'hello-unity/patches/ignore-sound-tab-if-missing-indicator.patch'
--- hello-unity/patches/ignore-sound-tab-if-missing-indicator.patch	1970-01-01 00:00:00 +0000
+++ hello-unity/patches/ignore-sound-tab-if-missing-indicator.patch	2016-05-17 01:04:22 +0000
@@ -0,0 +1,22 @@
+Index: hello-unity-snapped/hello_unity/window.py
+===================================================================
+--- hello-unity-snapped.orig/hello_unity/window.py
++++ hello-unity-snapped/hello_unity/window.py
+@@ -3,6 +3,7 @@
+ from gettext import gettext as _
+ 
+ from gi.repository import Gdk    
++from gi.repository import Gio
+ from gi.repository import Gtk
+ from gi.repository import GtkSource
+ 
+@@ -53,7 +54,8 @@ application can integrate with Ubuntu Un
+         self.add_section(_("Launcher"), HelloLauncher(self))
+         self.add_section(_("Indicator"), HelloIndicator(self))
+         self.add_section(_("Message Menu"), HelloMessageMenu(self))
+-        self.add_section(_("Sound Menu"), HelloSoundMenu(self))
++        if Gio.SettingsSchemaSource.get_default().lookup('com.canonical.indicator.sound', False):
++                self.add_section(_("Sound Menu"), HelloSoundMenu(self))
+         #self.add_section(_("Dash"), hello_unity.HelloUnitySection(self))
+         self.add_section(_("Notifications"), HelloNotifications(self))
+ 

=== added file 'hello-unity/patches/series'
--- hello-unity/patches/series	1970-01-01 00:00:00 +0000
+++ hello-unity/patches/series	2016-05-17 01:04:22 +0000
@@ -0,0 +1,3 @@
+use-xdg-dirs-to-get-file-paths.patch
+ignore-sound-tab-if-missing-indicator.patch
+use-snappy-desktop-id.patch

=== added file 'hello-unity/patches/use-snappy-desktop-id.patch'
--- hello-unity/patches/use-snappy-desktop-id.patch	1970-01-01 00:00:00 +0000
+++ hello-unity/patches/use-snappy-desktop-id.patch	2016-05-17 01:04:22 +0000
@@ -0,0 +1,39 @@
+Index: hello-unity-snapped/hello_unity/launcher.py
+===================================================================
+--- hello-unity-snapped.orig/hello_unity/launcher.py
++++ hello-unity-snapped/hello_unity/launcher.py
+@@ -34,7 +34,7 @@ class HelloLauncher(hello_unity.HelloUni
+         
+         # Get a reference to the launcher for this application.  The .desktop
+         # file give Unity information about the Application's name and icon
+-        self.launcher = Unity.LauncherEntry.get_for_desktop_id("hello-unity.desktop")
++        self.launcher = Unity.LauncherEntry.get_for_desktop_id("hello-unity_hello-unity.desktop")
+ 
+         # Create the quicklist menu
+         quicklist = Dbusmenu.Menuitem.new()
+Index: hello-unity-snapped/hello_unity/messagemenu.py
+===================================================================
+--- hello-unity-snapped.orig/hello_unity/messagemenu.py
++++ hello-unity-snapped/hello_unity/messagemenu.py
+@@ -28,7 +28,7 @@ class HelloMessageMenu(hello_unity.Hello
+     def __init__(self, window):
+ 
+         # Create an "app" to represent the Hello Unity application
+-        self.app = MessagingMenu.App.new("hello-unity.desktop")
++        self.app = MessagingMenu.App.new("hello-unity_hello-unity.desktop")
+         self.app.connect("activate-source", self.remove_indication)
+ 
+         # Register this app with the messaging menu
+Index: hello-unity-snapped/hello_unity/soundmenu.py
+===================================================================
+--- hello-unity-snapped.orig/hello_unity/soundmenu.py
++++ hello-unity-snapped/hello_unity/soundmenu.py
+@@ -41,7 +41,7 @@ class HelloSoundMenu(hello_unity.HelloUn
+             self.sound_menu_settings.set_strv('blacklisted-media-players', [p for p in self.blacklisted_players if p != 'hello-unity'])
+ 
+         # Create a hello-unity music player instance
+-        self.player = Unity.MusicPlayer.new('hello-unity.desktop')
++        self.player = Unity.MusicPlayer.new('hello-unity_hello-unity.desktop')
+         self.player.props.title = _('Hello Unity')
+ 
+         # What to do when the user presses the indicator buttons

=== added file 'hello-unity/patches/use-xdg-dirs-to-get-file-paths.patch'
--- hello-unity/patches/use-xdg-dirs-to-get-file-paths.patch	1970-01-01 00:00:00 +0000
+++ hello-unity/patches/use-xdg-dirs-to-get-file-paths.patch	2016-05-17 01:04:22 +0000
@@ -0,0 +1,78 @@
+Index: hello-unity-snapped/hello_unity/__init__.py
+===================================================================
+--- hello-unity-snapped.orig/hello_unity/__init__.py
++++ hello-unity-snapped/hello_unity/__init__.py
+@@ -1,10 +1,20 @@
+ import os
+ from gi.repository import Gtk
++from xdg.BaseDirectory import xdg_data_dirs
+ 
+ COLOR_ICON_PATH = 'hello-unity'
+ MONO_ICON_PATH = 'hello-unity-mono-dark'
+ ATTENTION_ICON_PATH = 'hello-unity-attention'
+ 
++def get_icon_path(basename):
++    for dir in xdg_data_dirs:
++        path = '%s/pixmaps/%s.svg' % (dir, basename)
++        icon = Gtk.Image.new_from_file(path)
++        pixbuf = icon.get_pixbuf()
++        if pixbuf:
++            return path
++
++
+ class HelloUnitySection(object):
+ 
+     def get_controls(self):
+Index: hello-unity-snapped/hello_unity/soundmenu.py
+===================================================================
+--- hello-unity-snapped.orig/hello_unity/soundmenu.py
++++ hello-unity-snapped/hello_unity/soundmenu.py
+@@ -2,6 +2,7 @@
+ 
+ # Used for making text translatable
+ from gettext import gettext as _
++from xdg.BaseDirectory import xdg_data_dirs
+ 
+ # Import the base UI toolkit modules
+ from gi.repository import Gdk    
+@@ -201,7 +202,9 @@ class HelloSoundMenu(hello_unity.HelloUn
+         data.props.album = "Unity Showcase"
+ 
+         # You can also set the cover art for this track
+-        data.props.art_location = Gio.File.new_for_path('/usr/share/pixmaps/%s.svg' % hello_unity.ATTENTION_ICON_PATH)
++        attention_icon = hello_unity.get_icon_path(hello_unity.ATTENTION_ICON_PATH)
++        if attention_icon:
++                data.props.art_location = Gio.File.new_for_path(attention_icon)
+ 
+         # Set the new track metadata as the current track in the sound menu
+         self.player.props.current_track = data
+Index: hello-unity-snapped/hello_unity/window.py
+===================================================================
+--- hello-unity-snapped.orig/hello_unity/window.py
++++ hello-unity-snapped/hello_unity/window.py
+@@ -19,14 +19,21 @@ class HelloWindow(Gtk.Window):
+         Gtk.Window.__init__(self, title=_("Hello Unity"))
+ 
+         self.set_default_size(500, 500)
+-        self.color_icon = Gtk.Image.new_from_file('/usr/share/pixmaps/%s.svg' % hello_unity.COLOR_ICON_PATH)
+-
+-        self.set_icon(self.color_icon.get_pixbuf())
++        
++        icon_path = hello_unity.get_icon_path(hello_unity.COLOR_ICON_PATH)
++        
++        if icon_path:
++                color_icon = Gtk.Image.new_from_file(icon_path)
++                pixbuf = color_icon.get_pixbuf()
++                self.set_icon(pixbuf)
+ 
+         self.content = Gtk.VBox()
+ 
+         self.header = Gtk.HBox()
+-        self.header.pack_start(Gtk.Image.new_from_pixbuf(self.color_icon.get_pixbuf().scale_simple(64, 64,  0)), False, False, 10)
++        if icon_path:
++                img = Gtk.Image.new_from_pixbuf(pixbuf.scale_simple(64, 64,  0))
++                self.header.pack_start(img, False, False, 10)
++ 
+         intro = Gtk.Label()
+         intro.set_markup(_('''
+ <b>Hello Unity!</b>

=== added directory 'hello-unity/setup'
=== added directory 'hello-unity/setup/gui'
=== added file 'hello-unity/setup/gui/hello-unity.desktop'
--- hello-unity/setup/gui/hello-unity.desktop	1970-01-01 00:00:00 +0000
+++ hello-unity/setup/gui/hello-unity.desktop	2016-05-17 01:04:22 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=HelloUnity
+X-GNOME-FullName=Hello Unity
+Comment=Unity Integration Showcase
+Categories=GNOME;Utility;
+Exec=hello-unity
+Icon=${SNAP}/usr/share/pixmaps/hello-unity.svg
+Terminal=false
+Type=Application
+Version=0.4

=== removed file 'hello-unity/snapcraft.log'
--- hello-unity/snapcraft.log	2016-04-09 02:39:30 +0000
+++ hello-unity/snapcraft.log	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-Preparing to pull hello-unity 
-
Hit http://us.archive.ubuntu.com/ubuntu xenial InRelease
-
Hit http://us.archive.ubuntu.com/ubuntu xenial-updates InRelease
-
Hit http://security.ubuntu.com/ubuntu xenial-security InRelease
-
Fetched 0 B in 0s (0 B/s)
-Skipping blacklisted from manifest packages: ['adduser', 'apt', 'apt-utils', 'base-files', 'base-passwd', 'bash', 'bsdutils', 'coreutils', 'dash', 'debconf', 'debconf-i18n', 'debianutils', 'diffutils', 'dmsetup', 'dpkg', 'e2fslibs', 'e2fsprogs', 'file', 'findutils', 'gcc-4.9-base', 'gcc-5-base', 'gnupg', 'gpgv', 'grep', 'gzip', 'hostname', 'init', 'initscripts', 'insserv', 'libacl1', 'libapparmor1', 'libattr1', 'libaudit-common', 'libaudit1', 'libblkid1', 'libbz2-1.0', 'libc-bin', 'libc6', 'libcap2', 'libcap2-bin', 'libcomerr2', 'libcryptsetup4', 'libdb5.3', 'libdebconfclient0', 'libdevmapper1.02.1', 'libgcc1', 'libgcrypt20', 'libgpg-error0', 'libgpm2', 'libkmod2', 'liblocale-gettext-perl', 'liblzma5', 'libmagic1', 'libmount1', 'libncurses5', 'libncursesw5', 'libpam-modules', 'libpam-modules-bin', 'libpam-runtime', 'libpam0g', 'libpcre3', 'libreadline6', 'libselinux1', 'libsemanage-common', 'libsemanage1', 'libsepol1', 'libslang2', 'libsmartcols1', 'libss2', 'libstdc++6', 'libsystemd0', 'libtext-charwidth-perl', 'libtext-iconv-perl', 'libtext-wrapi18n-perl', 'libtinfo5', 'libudev1', 'libusb-0.1-4', 'libustr-1.0-1', 'libuuid1', 'locales', 'login', 'lsb-base', 'makedev', 'manpages', 'manpages-dev', 'mawk', 'mount', 'multiarch-support', 'ncurses-base', 'ncurses-bin', 'passwd', 'perl-base', 'procps', 'readline-common', 'sed', 'sensible-utils', 'systemd', 'systemd-sysv', 'sysv-rc', 'sysvinit-utils', 'tar', 'tzdata', 'ubuntu-keyring', 'udev', 'util-linux', 'zlib1g']
-
Fetched 0 B in 0s (0 B/s)
-Pulling hello-unity 
-No revisions or tags to pull.
-python2 /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/bin/easy_install --prefix /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr pip
-Searching for pip
-Best match: pip 8.1.1
-Processing pip-8.1.1-py2.7.egg
-pip 8.1.1 is already the active version in easy-install.pth
-Installing pip script to /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/bin
-Installing pip2.7 script to /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/bin
-Installing pip2 script to /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/bin
-
-Using /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/lib/python2.7/dist-packages/pip-8.1.1-py2.7.egg
-Processing dependencies for pip
-Finished processing dependencies for pip
-python2 /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/bin/pip2 install --global-option=build_ext --global-option=-I/home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/include/python2.7 --target /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/lib/python2.7/site-packages .
-Processing /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/src
-Installing collected packages: hello-unity
-  Running setup.py install for hello-unity: started
-    Running setup.py install for hello-unity: finished with status 'error'
-    Complete output from command /home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/bin/python2 -u -c "import setuptools, tokenize;__file__='/tmp/pip-WmPupa-build/setup.py';exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" build_ext -I/home/mhall/projects/Ubuntu/snaps/snappy-playpen/hello-unity/parts/hello-unity/install/usr/include/python2.7 install --record /tmp/pip-GIIwsc-record/install-record.txt --single-version-externally-managed --compile --home=/tmp/tmpKTEaYf:
-    ERROR: Python module indicator not found
-    ERROR: Python module launcher not found
-    ERROR: Python module messagemenu not found
-    ERROR: Python module soundmenu not found
-    ERROR: Python module notifications not found
-    usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
-       or: -c --help [cmd1 cmd2 ...]
-       or: -c --help-commands
-       or: -c cmd --help
-    
-    error: option --single-version-externally-managed not recognized
-    
-    ----------------------------------------

=== modified file 'hello-unity/snapcraft.yaml'
--- hello-unity/snapcraft.yaml	2016-04-14 14:47:59 +0000
+++ hello-unity/snapcraft.yaml	2016-05-17 01:04:22 +0000
@@ -1,5 +1,5 @@
 name: hello-unity
-version: 0.4-snap1
+version: 0.4-snap2
 summary: Unity APIs demonstration tool
 description: Simple tool for demonstrating Unity's integration APIs
 
@@ -9,21 +9,54 @@
     plugs: [unity7]
 
 parts:
-  hello-unity:
-    plugin: python2
+  upstream-src:
+    plugin: copy
     source: lp:hello-unity
     source-type: bzr
+    files:
+      hello-unity: opt/bin/hello-unity
+      hello-unity.svg: usr/share/pixmaps/hello-unity.svg
+      hello-unity-mono-light.svg: usr/share/pixmaps/hello-unity-mono-light.svg
+      hello-unity-attention.svg: usr/share/pixmaps/hello-unity-attention.svg
+      hello-unity-mono-dark.svg: usr/share/pixmaps/hello-unity-mono-dark.svg
+
+  patches:
+    plugin: quilt
+    source: ./patches
+    stage-packages: [python-xdg]
+    target-part: upstream-src
+    after: [upstream-src]
+
+  setup:
+    plugin: python2
+    source: ./parts/upstream-src/src/
     build-packages:
       - python-distutils-extra
+    after: [patches]
+
+  deps:
+    plugin: nil
     stage-packages:
-      - python-distutils-extra
+      - python-gi
       - gir1.2-unity-5.0
       - gir1.2-notify-0.7
       - gir1.2-appindicator3-0.1
       - gir1.2-indicate-0.7
+      - gir1.2-messagingmenu-1.0
       - gir1.2-gtk-3.0
       - gir1.2-gtksource-3.0
 
+  integration:
+    plugin: nil
+    stage-packages:
+      - dmz-cursor-theme
+      - indicator-sound
+      - light-themes
+      - ttf-ubuntu-font-family
+    snap:
+      - usr/share
+      - -usr/share/doc
+
   environment:
     plugin: copy
     files: