Merge pull request #36 from opendesktop/develop

Develop

app/configs/application.json

 {
     "id": "ocs-manager",
     "name": "ocs-manager",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "organization": "Opendesktop.org",
     "domain": "org.opendesktop.ocs-manager",
     "icon": ":/desktop/ocs-manager.svg",

pkg/appimage/appimagebuild

 #!/bin/bash
 
 PKGNAME='ocs-manager'
-PKGVER='0.6.1'
+PKGVER='0.6.2'
 PKGREL='1'
 
-curl -fsSL -o linuxdeployqt.AppImage https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
-chmod 755 linuxdeployqt.AppImage
-./linuxdeployqt.AppImage --appimage-extract
+curl -fsSL -o linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
+chmod 755 linuxdeployqt
+./linuxdeployqt --appimage-extract
 
 ./scripts/prepare
 qmake PREFIX=/usr
@@ -15,6 +15,7 @@ make INSTALL_ROOT="${PKGNAME}.AppDir" install
 
 ./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations
 
+install -D -m 755 /usr/lib/x86_64-linux-gnu/libfreetype.so.6 ${PKGNAME}.AppDir/usr/lib/libfreetype.so.6
 install -D -m 755 /lib/x86_64-linux-gnu/libssl.so.1.0.0 ${PKGNAME}.AppDir/usr/lib/libssl.so.1.0.0
 install -D -m 755 /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 ${PKGNAME}.AppDir/usr/lib/libcrypto.so.1.0.0
 install -D -m 755 /lib/x86_64-linux-gnu/libz.so.1 ${PKGNAME}.AppDir/usr/lib/libz.so.1

scripts/package

@@ -15,7 +15,7 @@ ci_appimage() { # docker-image: ubuntu:14.04
     apt -y install curl git
     #apt -y install build-essential qt5-default libqt5websockets5-dev
     #apt -y install cmake libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
-    apt -y install libssl1.0.0 zlib1g unzip p7zip unar
+    apt -y install libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
 
     apt -y install software-properties-common
     add-apt-repository -y ppa:beineri/opt-qt594-trusty
@@ -32,7 +32,7 @@ ci_appimage() { # docker-image: ubuntu:14.04
 
     su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && "${PKGSCRIPT}" build_appimage" ${PKGUSER}
 
-    transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.AppImage")"
+    transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*-x86_64.AppImage")"
 }
 
 build_appimage() {