diff --git a/app/configs/application.json b/app/configs/application.json index f599c343e1cddd13b7702213ff1a370bbffbbbd1..33873a28973a08a0ca7c33c0f865ef7bfd35d302 100644 --- a/app/configs/application.json +++ b/app/configs/application.json @@ -1,7 +1,7 @@ { "id": "ocs-manager", "name": "ocs-manager", - "version": "0.6.5", + "version": "0.7.0", "organization": "Opendesktop.org", "domain": "org.opendesktop.ocs-manager", "icon": ":/desktop/ocs-manager.svg", diff --git a/lib/lib.pri b/lib/lib.pri index d41e159ef3e75d2c0e51edfd3115d73768342368..1502f3ce3bafb5782c6677a7a34c8fec741b1c31 100644 --- a/lib/lib.pri +++ b/lib/lib.pri @@ -7,23 +7,23 @@ unix:!ios:!android { LIBS += \ -L$${PWD}/AppImageUpdate-prebuilt/src/ -lappimageupdate \ - -L$${PWD}/AppImageUpdate-prebuilt/src/elf/ -lelf \ -L$${PWD}/AppImageUpdate-prebuilt/lib/zsync2/src/ -lzsync2 \ + $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/hashlib/hashlib.a \ + -L$${PWD}/AppImageUpdate-prebuilt/lib/ -lcpr \ -L$${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/libzsync/ -lzsync \ -L$${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/librcksum/ -lrcksum \ -L$${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/zlib/ -lzsync2_libz \ - -L$${PWD}/AppImageUpdate-prebuilt/lib/ -lcpr \ - $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/hashlib/hashlib.a + -L$${PWD}/AppImageUpdate-prebuilt/lib/libappimage/src/libappimage_shared/ -lappimage_shared PRE_TARGETDEPS += \ $${PWD}/AppImageUpdate-prebuilt/src/libappimageupdate.a \ - $${PWD}/AppImageUpdate-prebuilt/src/elf/libelf.a \ $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/src/libzsync2.a \ + $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/hashlib/hashlib.a \ + $${PWD}/AppImageUpdate-prebuilt/lib/libcpr.a \ $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/libzsync/libzsync.a \ $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/librcksum/librcksum.a \ $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/zlib/libzsync2_libz.a \ - $${PWD}/AppImageUpdate-prebuilt/lib/libcpr.a \ - $${PWD}/AppImageUpdate-prebuilt/lib/zsync2/lib/hashlib/hashlib.a + $${PWD}/AppImageUpdate-prebuilt/lib/libappimage/src/libappimage_shared/libappimage_shared.a LIBS += -lcurl } diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild index a95815e16dc5ee231ebe7c0d6e31eb89001309a4..562a4d733aa1013da3b5a5d815a32bfaad4831dd 100755 --- a/pkg/appimage/appimagebuild +++ b/pkg/appimage/appimagebuild @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME='ocs-manager' -PKGVER='0.6.5' +PKGVER='0.7.0' PKGREL='1' curl -fsSL -o linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage diff --git a/scripts/package b/scripts/package index 63a89e36ddeead7accc05bbadf952589bae9a8e6..e7b6b58adf94cfd31bf177f5ad12a4c8b4bafc96 100755 --- a/scripts/package +++ b/scripts/package @@ -11,10 +11,17 @@ PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)" BUILDDIR="${PROJDIR}/build_${PKGNAME}" appimage() { # docker-image: ubuntu:14.04 + install_build_deps_appimage + add_pkguser + 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}*-x86_64.AppImage")" +} + +install_build_deps_appimage() { apt update -qq 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 cmake automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev apt -y install libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar apt -y install software-properties-common @@ -25,14 +32,7 @@ appimage() { # docker-image: ubuntu:14.04 apt -y install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets curl -fsSL https://cmake.org/files/v3.12/cmake-3.12.1-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C / - apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev - - useradd -m ${PKGUSER} - chown -R ${PKGUSER} "${PROJDIR}" - - 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}*-x86_64.AppImage")" + apt -y install automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev } build_appimage() { @@ -45,6 +45,11 @@ build_appimage() { ./appimagebuild } +add_pkguser() { + useradd -m ${PKGUSER} + chown -R ${PKGUSER} "${PROJDIR}" +} + export_srcarchive() { if [ "${1}" ]; then $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${1}" HEAD)