Merge lp:~artmello/gallery-app/gallery-app-snap_u8 into lp:gallery-app

[Arthur Mello]

Changes to snapcraft.yaml to handle wrapper/setup folder changes
Add setup folder with icon and desktop file
Fix runningInstalled checks to handle when running from snap pkg

Changes to snapcraft.yaml to handle wrapper/setup folder changes
Add setup folder with icon and desktop file
Fix runningInstalled checks to handle when running from snap pkg

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1337
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1760
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/428
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1760
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1605
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1605/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/24/rebuild

review: Approve (continuous-integration)

Unmerged revisions

1337. By Arthur Mello on 2016-10-05

Merge renato changes to enable snap to work on unity8

1336. By Arthur Mello on 2016-10-05

Make snap work correctly on unity 7 by checking if it is running like a snap

1335. By Arthur Mello on 2016-10-03

Add missing var

1334. By Arthur Mello on 2016-10-03

Update config.h.in to handle bug #1629009

1333. By Arthur Mello on 2016-10-03

Changes to make gallery snap work on unity8

=== added directory 'setup'
=== added directory 'setup/gui'
=== added file 'setup/gui/gallery-app.desktop'
--- setup/gui/gallery-app.desktop	1970-01-01 00:00:00 +0000
+++ setup/gui/gallery-app.desktop	2016-10-06 01:34:16 +0000
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Version=1.0
+Name=Gallery
+GenericName=Ubuntu Photo Viewer
+Comment=Browse your photographs
+Keywords=Photographs;Pictures;Albums
+Exec=gallery-app %u
+Icon=/snap/gallery-app/current/setup/gui/icon.png
+StartupNotify=true
+Terminal=false
+Type=Application
+MimeType=image/jpg;image/jpeg;
+Categories=Graphics;Photography;RasterGraphics;Viewer;
+X-Ayatana-Appmenu-Show-Stubs=false
+X-Ubuntu-Touch=true
+X-Ubuntu-Single-Instance=true
+X-Ubuntu-Default-Department-ID=accessories
+X-Ubuntu-Splash-Show-Header=true

=== added file 'setup/gui/icon.png'
Binary files setup/gui/icon.png	1970-01-01 00:00:00 +0000 and setup/gui/icon.png	2016-10-06 01:34:16 +0000 differ
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-09-02 15:59:56 +0000
+++ snapcraft.yaml	2016-10-06 01:34:16 +0000
@@ -2,16 +2,16 @@
 version: 2.9.1
 summary: Gallery app
 description: Gallery application for your photo collection
-confinement: strict
+confinement: devmode # use "strict" to enforce system access only via declared interfaces
 
 apps:
   gallery-app:
-    command: bin/wrapper
-    plugs: [unity7, opengl, home, thumbnailer]
+    command: bin/wrapper --desktop_file_hint=unity8 "$@"
+    plugs: [unity7, opengl, home]  # FIXME: Add 'thumbnailer' interface when it gets merged on snapd
 
 parts:
   gallery:
-    source: ./
+    source: .
     plugin: cmake
     configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
     build-packages:
@@ -32,6 +32,10 @@
       - xdg-user-dirs
       - qtdeclarative5-ubuntu-ui-extras0.2
       - qtdeclarative5-ubuntu-thumbnailer0.1
+      - suru-icon-theme
+      - mir-graphics-drivers-desktop
+      # FIXME: This is necessary for now, to detect mouse and keyboard
+      - unity8-private
     after: [desktop/qt5]
 
   gallery-copy:
@@ -39,5 +43,4 @@
     plugin: dump
     organize:
       wrapper: bin/wrapper
-      test.jpg: test/test.jpg
 

=== modified file 'src/config.h.in'
--- src/config.h.in	2015-05-08 14:55:36 +0000
+++ src/config.h.in	2016-10-06 01:34:16 +0000
@@ -23,6 +23,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QString>
 
+static QString SNAP_ENV = qgetenv("SNAP");
+
 inline bool isClick() {
 #ifdef CLICK_MODE
     return true;
@@ -37,18 +39,24 @@
     return installed;
 }
 
+inline bool isSnap() {
+    return !SNAP_ENV.isEmpty();
+}
+
 inline void setOrganization() {
     QCoreApplication::setOrganizationName("@APP_PACKAGE_NAME@");
 }
 
 inline QString galleryDirectory()
 {
-    if (isClick()) {
-        return QString(".");
+    if (isSnap()) {
+        return SNAP_ENV + "@CMAKE_INSTALL_PREFIX@/@GALLERY_DIR@/";
+    } else if (isClick()) {
+        return QDir::currentPath();
     } else if (isRunningInstalled()) {
-        return QString("@CMAKE_INSTALL_PREFIX@/@GALLERY_DIR@");
+        return QString("@CMAKE_INSTALL_PREFIX@/@GALLERY_DIR@/");
     } else {
-        return QString("@gallery_src_SOURCE_DIR@");
+        return QString("@CMAKE_SOURCE_DIR@/");
     }
 }
 #endif // __CONFIG_H__

=== modified file 'src/util/resource.cpp'
--- src/util/resource.cpp	2016-08-26 18:16:34 +0000
+++ src/util/resource.cpp	2016-10-06 01:34:16 +0000
@@ -41,7 +41,7 @@
       m_databaseDirectory(""),
       m_thumbnailDirectory("")
 {
-    if (isClick()) {
+    if (isSnap() || isClick()) {
         setOrganization();
     }
     if (!pictureDir.isEmpty() && QDir(pictureDir).exists()) {
@@ -97,7 +97,7 @@
  */
 QUrl Resource::getRcUrl(const QString& path)
 {
-    if (isClick() || isRunningInstalled()) {
+    if (isSnap() || isClick() || isRunningInstalled()) {
         return QUrl::fromLocalFile(galleryDirectory() + "/rc/" + path);
     } else {
         return QUrl::fromLocalFile(galleryDirectory() + "/../rc/" + path);

=== modified file 'wrapper'
--- wrapper	2016-09-21 18:18:58 +0000
+++ wrapper	2016-10-06 01:34:16 +0000
@@ -1,4 +1,27 @@
-#!/bin/sh
+#!/bin/bash
+
+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
+
+if [ "$DESKTOP_SESSION" == "unity8" ]; then
+    # Qt Platform to Mir
+    export QT_QPA_PLATFORM=ubuntumirclient
+    # Mir runtime
+    export MIR_SOCKET=$XDG_RUNTIME_DIR/mir_socket
+    export MIR_CLIENT_PLATFORM_PATH=$SNAP/usr/lib/$ARCH/mir/client-platform
+fi
+
+# Unity8 private
+export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/unity8/qml
+
+# Tell libGL where to find the drivers
+export LIBGL_DRIVERS_PATH=$SNAP/usr/lib/$ARCH/dri
+export LD_LIBRARY_PATH="$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH"
 
 # FIXME: this is a workaround for XDG variables
 # not being set adequately