ubuntu-touch-coreapps-reviewers team mailing list archive

[Renato Araujo Oliveira Filho <renato.filho@xxxxxxxxxxxxx>]

Renato Araujo Oliveira Filho has proposed merging lp:~renatofilho/ubuntu-calendar-app/snappy-runtime into lp:ubuntu-calendar-app.

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)

For more details, see:
https://code.launchpad.net/~renatofilho/ubuntu-calendar-app/snappy-runtime/+merge/310200
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~renatofilho/ubuntu-calendar-app/snappy-runtime into lp:ubuntu-calendar-app.

=== added directory 'snap'
=== added directory 'snap/ubuntu-app-platform'
=== renamed file 'ubuntu-calendar-app.wrapper' => 'snap/ubuntu-calendar-app.wrapper'
--- ubuntu-calendar-app.wrapper	2016-09-29 14:58:50 +0000
+++ snap/ubuntu-calendar-app.wrapper	2016-11-07 15:51:19 +0000
@@ -1,26 +1,11 @@
-#!/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
+#!/bin/bash
 
 # 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
+export QML2_IMPORT_PATH=$SNAP/usr/lib/$ARCH/qt5/qml:$QML2_IMPORT_PATH
+export QML2_IMPORT_PATH=$SNAP/lib/$ARCH:$QML2_IMPORT_PATH
 
 # 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
+  
+exec "$SNAP/ubuntu-app-platform/usr/lib/x86_64-linux-gnu/qt5/bin/qmlscene" "$@" $SNAP/usr/share/calendar-app/calendar.qml
 

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-10-07 14:33:55 +0000
+++ snapcraft.yaml	2016-11-07 15:51:19 +0000
@@ -8,14 +8,13 @@
 apps:
     ubuntu-calendar-app:
         command: desktop-launch $SNAP/bin/ubuntu-calendar-app --desktop_file_hint=unity8 "$@"
+        plugs: [platform, gsettings, unity7, opengl]
 
 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,39 @@
         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: []
+            # - 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
+        snap: []
+        after: [desktop-ubuntu-app-platform]
+
+    desktop-ubuntu-app-platform:
+        source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+        source-subdir: qt
+        plugin: make
+        make-parameters: ["FLAVOR=qt5-app-platform"]
+        # developer should use stable-phone-overlay PPA for Qt 5.6 to match the platform snap
+        build-packages:
+          - qtbase5-dev
+          - dpkg-dev
 
     environment:
-        source: .
+        source: snap/
         plugin: dump
         organize:
             ubuntu-calendar-app.wrapper: bin/ubuntu-calendar-app