Merge lp:~larryprice/libertine/ubuntu-app-platform-snap into lp:libertine

[Larry Price]

Use the ubuntu-app-platform interface in the libertine snap.

Use the ubuntu-app-platform interface in the libertine snap.

Using our own qt causes strange crashes when running the snap confined. This has the added benefit of removing ~30MB from our snap, though it forces an additional ~150MB for the platform snap. ¯\_(ツ)_/¯

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:325
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/287/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/591
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/479
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/479
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/479
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/479
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/601
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/583
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/583/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/583
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/583/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/583
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/583/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/583
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/583/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/287/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

MP is On Hold because snappy is not handling (dis)connecting the platform app during multiple installs: https://bugs.launchpad.net/snappy/+bug/1652369

Unmerged revisions

325. By Larry Price on 2016-12-22

Use ubuntu-app-platform snap

=== removed file 'data/snap-runner.wrapper'
--- data/snap-runner.wrapper	2016-12-06 16:14:42 +0000
+++ data/snap-runner.wrapper	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-# additional env modifications on top of desktop-launch
-
-export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/fakechroot:$LD_LIBRARY_PATH
-export DEBOOTSTRAP_DIR=$SNAP/usr/share/debootstrap
-
-# Useful debug variables
-# export FAKECHROOT_DEBUG=1
-# export LIBERTINE_DEBUG=1
-
-exec $SNAP/bin/desktop-launch $@
 
=== modified file 'libertine/libertine.cpp'
--- libertine/libertine.cpp	2016-10-07 18:58:30 +0000
+++ libertine/libertine.cpp	2016-12-22 20:55:57 +0000
@@ -65,7 +65,7 @@
     for (auto const& sub: sub_paths)
     {
       QFileInfo fi(path + "/" + sub + s_main_QML_source_file);
-      if (fi.exists())
+      if (fi.exists() && fi.isReadable())
       {
         return fi.filePath();
       }
@@ -78,7 +78,7 @@
 
 
 /**
- * Constraucts a Libertine application wrapper object.
+ * Constructs a Libertine application wrapper object.
  * @param[in] argc  The count of the number of command-line arguments.
  * @param[in] argv  A vector of command-line arguments.
  *
 
=== added directory 'snap'
=== added file 'snap/snap-runner.wrapper'
--- snap/snap-runner.wrapper	1970-01-01 00:00:00 +0000
+++ snap/snap-runner.wrapper	2016-12-22 20:55:57 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+# additional env modifications on top of desktop-launch
+
+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/fakechroot:$LD_LIBRARY_PATH
+export DEBOOTSTRAP_DIR=$SNAP/usr/share/debootstrap
+
+# Useful debug variables
+# export FAKECHROOT_DEBUG=1
+# export LIBERTINE_DEBUG=1
+
+exec $SNAP/bin/desktop-launch $@
 
=== added directory 'snap/ubuntu-app-platform'
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-12-21 21:47:58 +0000
+++ snapcraft.yaml	2016-12-22 20:55:57 +0000
@@ -10,23 +10,43 @@
   libertine-container-manager:
     command: usr/bin/snap-runner.wrapper libertine-container-manager
   libertine-manager-app:
-    command: usr/bin/snap-runner.wrapper libertine-manager-app
+    command: desktop-launch libertine-manager-app
+    plugs:
+      - unity7
+      - platform
+      - opengl
+      - home
+      - network
   libertine-launch:
-    command: usr/bin/snap-runner.wrapper libertine-launch
+    command: usr/bin/snap-runner.wrapper libertine-launch "$@"
 
   # For debugging purposes
   bash:
     command: usr/bin/snap-runner.wrapper bash
 
+plugs:
+  platform:
+    interface: content
+    content: ubuntu-app-platform1
+    target: ubuntu-app-platform
+    default-provider: ubuntu-app-platform
+
 parts:
   libertine-source:
     plugin: libertine
     source: .
+    snap:
+      - -usr/share/doc
+      - -usr/include
     after:
-      - desktop-qt5
+      - desktop-ubuntu-app-platform
   libertine-deps:
     plugin: libertine-deps
+    snap:
+      - -usr/share/doc
+      - -usr/include
   env:
+    source: snap/
     plugin: dump
     organize:
-      data/snap-runner.wrapper: usr/bin/snap-runner.wrapper
+      snap-runner.wrapper: usr/bin/snap-runner.wrapper