diff --git a/app/configs/application.json b/app/configs/application.json index 8b326ed3821d5afaf65485827fb81c9acd16f2d4..eb288b3004d88f2a00f792788698d3be71dc003b 100644 --- a/app/configs/application.json +++ b/app/configs/application.json @@ -1,7 +1,7 @@ { "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", diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild index 70c941e5a64bb2868d86bfe46148916a4ad59175..22e8929b0b5af616206a5f625168217898620f48 100755 --- a/pkg/appimage/appimagebuild +++ b/pkg/appimage/appimagebuild @@ -1,12 +1,12 @@ #!/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 diff --git a/scripts/package b/scripts/package index 242aa18e8cf74f680514c51a70ea41ede571c6a5..9171ce8a8eaea95d45ef3ef771c6c89d5ca33949 100755 --- a/scripts/package +++ b/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() {