feat: add appimage back to ci

.github/workflows/build-test-deploy.yaml

@@ -216,6 +216,33 @@ jobs:
   # Build, test, and deploy jobs (PR and push)
   ################################################################################################
 
+  build-appimage:
+    name: appimage on alpine
+    runs-on: ubuntu-22.04
+    needs: [update-nightly-tag]
+    strategy:
+      matrix:
+        features: [full]
+        build_type: [Release]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache compiler output
+        uses: actions/cache@v4
+        with:
+          path: ".cache/ccache"
+          key: ${{ github.job }}-ccache
+      - name: Install docker-compose
+        run: sudo apt-get install -y docker-compose
+      - name: Run build
+        run: docker-compose run --rm -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e GITHUB_REF=$GITHUB_REF alpine-appimage ./appimage/build.sh --src-dir /qtox
+      - name: Upload appimage
+        uses: actions/upload-artifact@v4
+        with:
+          name: qTox-${{ github.sha }}-x86_64-AppImage
+          path: |
+            qTox-*.AppImage
+            qTox-*.AppImage.zsync
+
   build-android:
     name: Android
     needs: [update-nightly-tag]

appimage/build.sh

@@ -1,100 +1,73 @@
 #!/usr/bin/env bash
 
-# MIT License
-#
+# SPDX-License-Identifier: GPL-3.0-or-later.
 # Copyright © 2019 by The qTox Project Contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Copyright © 2024 The TokTok team
 
 # Fail out on error
 set -exuo pipefail
 
 usage() {
-    echo "$0 --src-dir SRC_DIR"
-    echo "Builds an app image in the CWD based off qtox installation at SRC_DIR"
+  echo "$0 --src-dir SRC_DIR"
+  echo "Builds an app image in the CWD based off qtox installation at SRC_DIR"
 }
 
-while (( $# > 0 )); do
-    case $1 in
-        --src-dir) QTOX_SRC_DIR=$2; shift 2 ;;
-        --help|-h) usage; exit 1 ;;
-        *) echo "Unexpected argument $1"; usage; exit 1;;
-    esac
+while (($# > 0)); do
+  case $1 in
+    --src-dir)
+      QTOX_SRC_DIR=$2
+      shift 2
+      ;;
+    --help | -h)
+      usage
+      exit 1
+      ;;
+    *)
+      echo "Unexpected argument $1"
+      usage
+      exit 1
+      ;;
+  esac
 done
 
 if [ -z "${QTOX_SRC_DIR+x}" ]; then
-    echo "--src-dir is a required argument"
-    usage
-    exit 1
+  echo "--src-dir is a required argument"
+  usage
+  exit 1
 fi
 
 # directory paths
 BUILD_DIR=$(realpath .)
 readonly BUILD_DIR
-QTOX_APP_DIR="$BUILD_DIR"/appdir
+QTOX_APP_DIR="$BUILD_DIR/QTox.AppDir"
 readonly QTOX_APP_DIR
-readonly LOCAL_LIB_DIR="$QTOX_APP_DIR"/local/lib
-# ldqt binary
-readonly LDQT_BIN="/usr/lib/qt5/bin/linuxdeployqt"
 
-# update information to be embeded in AppImage
-readonly UPDATE_INFO="gh-releases-zsync|qTox|qTox|latest|qTox-*.x86_64.AppImage.zsync"
-export GIT_VERSION=$(git -C "${QTOX_SRC_DIR}" rev-parse --short HEAD)
-
-echo $QTOX_APP_DIR
-cmake "${QTOX_SRC_DIR}" -DDESKTOP_NOTIFICATIONS=ON -DUPDATE_CHECK=ON -DCMAKE_BUILD_TYPE=Release
-make -j$(nproc)
-rm -fr appdir
-make DESTDIR=appdir install
-
-unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH;
+rm -f appimagetool-*.AppImage
+wget "https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)"
+chmod +x appimagetool-*.AppImage
 
-readonly QTOX_DESKTOP_FILE="$QTOX_APP_DIR"/usr/local/share/applications/*.desktop
-export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/x86_64-linux-gnu/
+# update information to be embeded in AppImage
+#readonly UPDATE_INFO="gh-releases-zsync|TokTok|qTox|latest|qTox-*.x86_64.AppImage.zsync"
+#export GIT_VERSION=$(git -C "${QTOX_SRC_DIR}" rev-parse --short HEAD)
 
-eval "$LDQT_BIN $QTOX_DESKTOP_FILE -bundle-non-qt-libs -extra-plugins=libsnore-qt5"
+echo "$QTOX_APP_DIR"
+cmake "$QTOX_SRC_DIR" \
+  -G Ninja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_PREFIX_PATH="/work/lib64/cmake;/work/qt/lib/cmake" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DUPDATE_CHECK=ON \
+  -B _build
+cmake --build _build
+#rm -fr QTox.AppDir
+cmake --install _build --prefix QTox.AppDir/usr
 
-# Move the required files to the correct directory
-mv "$QTOX_APP_DIR"/usr/* "$QTOX_APP_DIR/"
-rm -rf "$QTOX_APP_DIR/usr"
+export QTDIR=/work/qt
+export LD_LIBRARY_PATH="/work/lib64:$QTDIR/lib"
 
-# Warning: This is hard coded to debain:stretch.
-libs=(
-# copy OpenSSL libs to AppImage
-/usr/lib/x86_64-linux-gnu/libssl.so
-/usr/lib/x86_64-linux-gnu/libcrypt.so
-/usr/lib/x86_64-linux-gnu/libcrypto.so
-# Also bundle libjack.so* without which the AppImage does not work in Fedora Workstation
-/usr/lib/x86_64-linux-gnu/libjack.so.0
-# And libglib needed by Red Hat and derivatives to work with our old gnutls
-/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0
-/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
-/usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
-/usr/lib/x86_64-linux-gnu/libpango-1.0.so.0
-/usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0
-/usr/lib/x86_64-linux-gnu/libpangocairo-1.0.so.0
-)
+./appimagetool-*.AppImage --appimage-extract-and-run -s deploy "$QTOX_APP_DIR"/usr/share/applications/*.desktop
 
-for lib in "${libs[@]}"; do
-    lib_file_name=$(basename "$lib")
-    cp -P $(echo "$lib"*) "$LOCAL_LIB_DIR"
-    patchelf --set-rpath '$ORIGIN' "$LOCAL_LIB_DIR/$lib_file_name"
-done
+# print all links not contained inside the AppDir
+LD_LIBRARY_PATH='' find "$QTOX_APP_DIR" -type f -exec ldd {} \; 2>&1 | grep '=>' | grep -v "$QTOX_APP_DIR"
 
-appimagetool -u "$UPDATE_INFO" $QTOX_APP_DIR qTox-${GIT_VERSION}.x86_64.AppImage
+./appimagetool-*.AppImage --appimage-extract-and-run "$QTOX_APP_DIR"

docker-compose.yml

@@ -24,6 +24,9 @@ services:
   alpine:
     image: toxchat/qtox:alpine
     <<: *shared_params
+  alpine-appimage:
+    image: toxchat/qtox:alpine-appimage
+    <<: *shared_params
   alpine-static:
     image: toxchat/qtox:alpine-static
     <<: *shared_params

src/widget/form/genericchatform.cpp

@@ -40,7 +40,7 @@
 #include <QtGlobal>
 
 #ifdef SPELL_CHECKING
-#include <KF6/SonnetUi/sonnet/spellcheckdecorator.h>
+#include <sonnet/spellcheckdecorator.h>
 #endif
 
 /**