Merge lp:~renatofilho/ubuntu-calendar-app/snappy-runtime into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

[lp:~renatofilho/ubuntu-calendar-app/snappy-runtime]

900. By Renato Araujo Oliveira Filho on 2016-11-08

Use new launcher.

901. By Renato Araujo Oliveira Filho on 2016-11-09

Added 'mir-graphics-drivers-desktop' as deb. (Temporary solution)

[Timo Jyrinki (timo-jyrinki)]

(mir-graphics-driver-desktop now in platform snap)

review: Needs Fixing

[lp:~renatofilho/ubuntu-calendar-app/snappy-runtime]

902. By Renato Araujo Oliveira Filho on 2016-11-10

Update app icon path.
Remove use of wrapper.

903. By Renato Araujo Oliveira Filho on 2016-11-11

Remove unecessary code from snapcraft.yaml file.

=== modified file 'setup/gui/ubuntu-calendar-app.desktop'
--- setup/gui/ubuntu-calendar-app.desktop	2016-09-29 13:53:06 +0000
+++ setup/gui/ubuntu-calendar-app.desktop	2016-11-11 19:20:32 +0000
@@ -3,7 +3,7 @@
 Type=Application
 Terminal=false
 Exec=ubuntu-calendar-app %u
-Icon=/snap/ubuntu-calendar-app/current/[e-mail]
+Icon=/snap/ubuntu-calendar-app/current/meta/gui/icon.png
 Name=Calendar
 Name[aa]=Aysalu
 Name[am]=የቀን መቁጠሪያ

=== added directory 'snap'
=== added directory 'snap/ubuntu-app-platform'
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-10-07 14:33:55 +0000
+++ snapcraft.yaml	2016-11-11 19:20:32 +0000
@@ -7,15 +7,14 @@
 
 apps:
     ubuntu-calendar-app:
-        command: desktop-launch $SNAP/bin/ubuntu-calendar-app --desktop_file_hint=unity8 "$@"
+        command: desktop-launch qmlscene --desktop_file_hint=unity8 $SNAP/usr/share/calendar-app/calendar.qml
+        plugs: [home, gsettings, opengl, platform, unity7]
 
 plugs:
-    gsettings:
-        interface: gsettings
-    unity7:
-        interface: unity7
-    opengl:
-        interface: opengl
+    platform:
+        interface: content
+        content: ubuntu-app-platform1
+        target: ubuntu-app-platform
 # eds-calendar and address-book not available yet. 
 # FIXME: Fixt that after these interfaces appear on syncd
 #    eds-calendar:
@@ -32,35 +31,9 @@
         build-packages:
             - cmake
             - intltool
-        stage-packages:
-            - accountsservice
-            - accountsservice-ubuntu-schemas
-            - account-plugin-google
-            - qmlscene
-            - qml-module-qt-labs-settings
-            - qml-module-qtcontacts
-            - qml-module-qtorganizer
-            - qml-module-ubuntu-components
-            - qml-module-ubuntu-onlineaccounts
-            - qml-module-ubuntu-onlineaccounts-client
-            - qtdeclarative5-ubuntu-content1
-            - qtdeclarative5-ubuntu-syncmonitor0.1
-            - qtcontact5-galera
-            - qtorganizer5-eds
-            - qtubuntu-desktop
-            - suru-icon-theme
-            - mir-graphics-drivers-desktop
-        stage:
-            - -usr/share/pkgconfig/xkeyboard-config.pc
-            - -usr/share/pkgconfig/shared-mime-info.pc
-        snap:
-            - -usr/lib/python3
-            - -usr/share/doc
-            - -usr/include           
-        after: [desktop-gtk3]
+        stage-packages: []
+        after: [desktop-ubuntu-app-platform]
 
     environment:
-        source: .
+        source: snap/
         plugin: dump
-        organize:
-            ubuntu-calendar-app.wrapper: bin/ubuntu-calendar-app

=== removed file 'ubuntu-calendar-app.wrapper'
--- ubuntu-calendar-app.wrapper	2016-09-29 14:58:50 +0000
+++ ubuntu-calendar-app.wrapper	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-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 QTCHOOSER_NO_GLOBAL_DIR=1
-export QT_SELECT=snappy-qt5
-
-# Qt Libs
-export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/qt5/libs:$LD_LIBRARY_PATH
-
-# Qt Modules
-export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins
-export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/qt5/qml
-export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/lib/$ARCH
-
-# Necessary for the SDK to find the translations directory
-export APP_DIR=$SNAP
-
-exec "$SNAP/bin/desktop-launch" "$SNAP/usr/lib/$ARCH/qt5/bin/qmlscene" "$@" $SNAP/usr/share/calendar-app/calendar.qml
-