Ubuntu Pastebin

Paste from didrocks at Tue, 8 Nov 2016 08:18:25 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
=== removed file 'snap/ubuntu-calendar-app.wrapper'
--- snap/ubuntu-calendar-app.wrapper	2016-11-07 15:48:15 +0000
+++ snap/ubuntu-calendar-app.wrapper	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Qt Modules
-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/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-11-07 15:48:15 +0000
+++ snapcraft.yaml	2016-11-08 08:03:18 +0000
@@ -7,7 +7,7 @@
 
 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: [platform, gsettings, unity7, opengl]
 
 plugs:
@@ -53,10 +53,10 @@
         after: [desktop-ubuntu-app-platform]
 
     desktop-ubuntu-app-platform:
-        source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+        source: /home/didrocks/work/ubuntu-core/snapcraft-desktop-helpers
         source-subdir: qt
         plugin: make
-        make-parameters: ["FLAVOR=qt5-app-platform"]
+        make-parameters: ["FLAVOR=qt5appplatform"]
         # developer should use stable-phone-overlay PPA for Qt 5.6 to match the platform snap
         build-packages:
           - qtbase5-dev
@@ -65,5 +65,3 @@
     environment:
         source: snap/
         plugin: dump
-        organize:
-            ubuntu-calendar-app.wrapper: bin/ubuntu-calendar-app
Download as text