Merge lp:~libqtelegram-team/telegram-app/snap-telegram-app-take3 into lp:telegram-app

[Roberto Mier Escandon]

Rewritting snapcraft.yaml for have

- snap dependencies got from git instead of having them already locally
- build in yakkety distro (tested ok)
- having available old way of creating click packages, also, as usual
- set as default LXD_IMAGE_ALIAS the value ubuntu-sdk-15.04-armhf

Rewritting snapcraft.yaml for have

- snap dependencies got from git instead of having them already locally
- build in yakkety distro (tested ok)
- having available old way of creating click packages, also, as usual
- set as default LXD_IMAGE_ALIAS the value ubuntu-sdk-15.04-armhf

[lp:~libqtelegram-team/telegram-app/snap-telegram-app-take3]

253. By Roberto Mier Escandon on 2016-11-22

set as default value for LXD_IMAGE_ALIAS ubuntu-sdk-15.04-armhf

254. By Roberto Mier Escandon on 2016-11-22

removed not needed definition

255. By Roberto Mier Escandon on 2016-11-22

added snap subfolder

256. By Roberto Mier Escandon on 2016-11-22

added base qt5 packages to build the app

[Jin (jindallo)]

@Roberto,

Awesome work, Roberto!

This MP works good and verified pass,
I will merge it for you.

Then for the .snap size reducing work,
will also do after verified.

Thanks.

review: Approve

=== modified file 'README.md'
--- README.md	2016-11-22 08:45:33 +0000
+++ README.md	2016-11-22 22:06:28 +0000
@@ -225,8 +225,63 @@
 > 3. Enable Send button - #326 - Remove `connected || !NetworkingStatus` IF statement so you only have `if (state == “attach”) {...}` in
 > `onClicked:`.
 
+## **Snap Package**
+
+Alternative to click you can build snap packages instead, to be used in Ubuntu Core and Ubuntu Personal enabled devices.
+Here are the steps:
+
+### Clean
+
+On project folder execute
+
+```sh
+snapcraft clean
+```
+
+### Build
+
+```sh
+snapcraft
+```
+
+### Install snap
+
+You need to install previously ubuntu-snap-platform
+```sh
+snap install ubuntu-app-platform
+```
+
+In case you are not logged in to the store it is needed execute install as sudoer. You can login using
+```sh
+snap login <username>
+```
+
+You will be asked for credential(s)
+
+The first time you install our just created snap package, it is needed also installing ubuntu-app-platform snap. Once installed, it can be used by any other qt application snap:
+
+```sh
+snap install ubuntu-app-platform
+```
+
+```sh
+snap install telegram-app_<version>_<arch>.snap --devmode --edge
+snap connect telegram-app:platform ubuntu-app-platform:platform
+```
+NOTE: --devmode and --edge modifiers are needed while deploying in a non strict mode.
+
+NOTE: Snaps must be connected before running the applications for the first time to the ubuntu-app-platform. If telegram-app has been executed before the snap connect you will see an error message. To fix the problem, uninstall the telegram-app snap, then re-install it and run the snap connect command before executing telegram-app. This is a known limitation in snapd which will be resolved soon.
+
+### Execute
+
+```sh
+telegram-app
+```
+
 ## **References & Tutorials**
 - [Autopilot Tutorials and Guides](https://developer.ubuntu.com/api/autopilot/python/1.5.0/)
 - [Autopilot at a glance](http://www.theorangenotebook.com/2012/11/a-glance-at-autopilot.html)
 - [Getting started with Autopilot](http://www.theorangenotebook.com/2012/11/getting-started-with-autopilot.html)
 - [Your first autopilot test case](http://www.theorangenotebook.com/2012/11/our-first-autopilot-testcase.html)
+- [Snap packaging](http://snapcraft.io)
+
 
=== added file 'make-snap.sh'
--- make-snap.sh	1970-01-01 00:00:00 +0000
+++ make-snap.sh	2016-11-22 22:06:28 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+SNAP_DESKTOP_FILE=setup/gui/telegram-app.desktop
+intltool-merge -d -u po $SNAP_DESKTOP_FILE.in $SNAP_DESKTOP_FILE
+snapcraft
 
=== added directory 'setup'
=== modified file 'setup.sh'
--- setup.sh	2016-11-22 07:01:33 +0000
+++ setup.sh	2016-11-22 22:06:28 +0000
@@ -67,7 +67,7 @@
 function askForLXD() {
     #ask using cli for the lxd alias to use, as that name can be selected by the user when downloaded the image
     if [ -z "$LXD_IMAGE_ALIAS" ]; then
-        LXD_IMAGE_ALIAS=builder-armhf
+        LXD_IMAGE_ALIAS=ubuntu-sdk-15.04-armhf
     fi
     read -p "LXD image to use [$LXD_IMAGE_ALIAS]: " RESPONSE
     RESPONSE="${RESPONSE:-$LXD_IMAGE_ALIAS}"
 
=== added directory 'setup/gui'
=== added file 'setup/gui/icon-large.png'
 Binary files setup/gui/icon-large.png	1970-01-01 00:00:00 +0000 and setup/gui/icon-large.png	2016-11-22 22:06:28 +0000 differ
=== 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-11-22 22:06:28 +0000 differ
=== added file 'setup/gui/telegram-app.desktop'
--- setup/gui/telegram-app.desktop	1970-01-01 00:00:00 +0000
+++ setup/gui/telegram-app.desktop	2016-11-22 22:06:28 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=0.1
+Type=Application
+Terminal=false
+Exec=telegram %u
+Name=Telegram
+Icon=${SNAP}/meta/gui/icon.png
+X-Ubuntu-Touch=true
+X-Ubuntu-Default-Department-ID=communication
+X-Ubuntu-Splash-Show-Header=false
+X-Ubuntu-Splash-Color=White
+X-Ubuntu-Splash-Title=Telegram
+X-Ubuntu-SymbolicIcon=${SNAP}/meta/gui/icon-large.png
 
=== added file 'setup/gui/telegram-app.desktop.in'
--- setup/gui/telegram-app.desktop.in	1970-01-01 00:00:00 +0000
+++ setup/gui/telegram-app.desktop.in	2016-11-22 22:06:28 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=0.1
+Type=Application
+Terminal=false
+Exec=telegram %u
+_Name=Telegram
+Icon=${SNAP}/meta/gui/icon.png
+X-Ubuntu-Touch=true
+X-Ubuntu-Default-Department-ID=communication
+X-Ubuntu-Splash-Show-Header=false
+X-Ubuntu-Splash-Color=White
+_X-Ubuntu-Splash-Title=Telegram
+X-Ubuntu-SymbolicIcon=${SNAP}/meta/gui/icon-large.png
 
=== added directory 'snap'
=== added file 'snap/telegram-app.wrapper'
--- snap/telegram-app.wrapper	1970-01-01 00:00:00 +0000
+++ snap/telegram-app.wrapper	2016-11-22 22:06:28 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ "$SNAP_ARCH" = "amd64" ]; then
+  ARCH="x86_64-linux-gnu"
+elif [ "$SNAP_ARCH" = "armhf" ]; then
+  ARCH="arm-linux-gnueabihf"
+elif [ "$SNAP_ARCH" = "arm64" ]; then
+  ARCH="aarch64-linux-gnu"
+else
+  ARCH="$SNAP_ARCH-linux-gnu"
+fi
+
+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$SNAP/lib/$ARCH:$LD_LIBRARY_PATH
+
+exec $SNAP/lib/$ARCH/bin/telegram
+
 
=== added directory 'snap/ubuntu-app-platform'
=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-11-22 22:06:28 +0000
@@ -0,0 +1,91 @@
+name: telegram-app
+version: 2.3.37.2
+summary: Ubuntu Telegram Applicaiton
+description: The Ubuntu Telegram for all Ubuntu devices
+grade: devel
+confinement: devmode 
+
+apps:
+  telegram-app:
+    command: desktop-launch $SNAP/bin/telegram-app.wrapper --desktop_file_hint=unity8 "$@"
+    plugs: [unity7, opengl, network, home, platform, camera, pulseaudio]
+
+plugs:
+  platform:
+    interface: content
+    content: ubuntu-app-platform1
+    target: ubuntu-app-platform
+    default-provider: ubuntu-app-platform
+
+parts:
+  libqtelegram-ae:
+    source: https://github.com/Aseman-Land/libqtelegram-aseman-edition.git
+    source-type: git
+    source-commit: 7bc3c3d54c744d675aa261bd4a0d335291052ee6
+    plugin: qmake
+    qt-version: qt5
+    options:
+      - PREFIX=/usr
+      - -r
+      # FIXME: workaround for skip gcc 6 build issue with stdlib.h
+      - QMAKE_CFLAGS_ISYSTEM=
+    build-packages:
+      - build-essential
+      - libssl-dev
+      - qtmultimedia5-dev
+    stage-packages:
+      - libthumbnailer-qt-dev
+      - qml-module-ubuntu-connectivity
+      - qtdeclarative5-ubuntu-contacts0.1
+
+  telegramqml:
+    source: https://github.com/Aseman-Land/TelegramQML.git
+    source-type: git
+    source-commit: 7d5110a454af7d9be2370da6de217941bb9d1f1b
+    plugin: qmake
+    qt-version: qt5
+    options:
+      - INCLUDEPATH+=$SNAPCRAFT_STAGE/usr/include/libqtelegram-ae
+      - INCLUDEPATH+=$SNAPCRAFT_STAGE/usr/include/thumbnailer-qt-1.0/unity/thumbnailer/qt
+      - LIBS+=-Lqtelegram-ae
+      - LIBS+=-Lthumbnailer-qt
+      - PREFIX=/usr
+      - -r
+      - BUILD_MODE+=lib
+      - DEFINES+=UBUNTU_PHONE
+      # FIXME: workaround for skip gcc 6 build issue with stdlib.h
+      - QMAKE_CFLAGS_ISYSTEM=
+    build-packages:
+      - intltool
+      - qtdeclarative5-dev
+      - qt5-default
+      - qtbase5-dev
+    after: [libqtelegram-ae]
+
+  telegram-app:
+    source: telegram
+    source-subdir: app
+    plugin: qmake
+    qt-version: qt5
+    options:
+      - INCLUDEPATH+=$SNAPCRAFT_STAGE/usr/include/libqtelegram-ae
+      - INCLUDEPATH+=$SNAPCRAFT_STAGE/usr/include/telegramqml
+      - PREFIX=/usr
+      - DEFINES+=SNAP_MODE
+      - -r
+    snap:
+      - -database
+      - -emojis
+      - -icons
+      - -scope
+      - -stickers
+    after: [telegramqml, desktop-ubuntu-app-platform]
+
+  wrapper:
+    source: snap
+    plugin: dump
+    organize:
+      telegram-app.wrapper: bin/telegram-app.wrapper
+
+
+
 
=== modified file 'telegram/app/app.pro'
--- telegram/app/app.pro	2016-04-06 08:01:54 +0000
+++ telegram/app/app.pro	2016-11-22 22:06:28 +0000
@@ -13,7 +13,7 @@
 
 isEmpty(OPENSSL_INCLUDE_PATH): OPENSSL_INCLUDE_PATH = /usr/include/openssl /usr/local/include/openssl
 
-LIBS += -lssl -lcrypto -lz -lqtelegram-ae -ltelegramqml
+LIBS += -lssl -lcrypto -lz -lqtelegram-ae -ltelegramqml -lthumbnailer-qt
 
 INCLUDEPATH += $${OPENSSL_INCLUDE_PATH} 
 
 
=== modified file 'telegram/app/stickerfilemanager.cpp'
--- telegram/app/stickerfilemanager.cpp	2016-02-29 10:22:26 +0000
+++ telegram/app/stickerfilemanager.cpp	2016-11-22 22:06:28 +0000
@@ -2,7 +2,12 @@
 #include "asemantools/asemandevices.h"
 
 #include <telegramqml.h>
+
+#ifdef SNAP_MODE
+#include <libqtelegram-ae/telegram.h>
+#else
 #include "../../deps/libqtelegram-ae/telegram.h"
+#endif
 
 #include <QList>
 #include <QHash>