Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
iphydf committed Dec 26, 2024
1 parent 5d4bb25 commit 0f50568
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
20 changes: 11 additions & 9 deletions appimage/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ readonly BUILD_DIR
QTOX_APP_DIR="$BUILD_DIR"/QTox.AppDir
readonly QTOX_APP_DIR

wget -c 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)
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

# update information to be embeded in AppImage
Expand All @@ -43,19 +44,20 @@ 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 \
-DDESKTOP_NOTIFICATIONS=ON \
-DUPDATE_CHECK=ON
cmake --build .
-DUPDATE_CHECK=ON \
-B _build
cmake --build _build
#rm -fr QTox.AppDir
cmake --install . --prefix QTox.AppDir/usr
cmake --install _build --prefix QTox.AppDir/usr

export QTDIR=/usr/lib/qt6
export QTDIR=/work/qt
export LD_LIBRARY_PATH="/work/lib64:$QTDIR/lib"

eval ./appimagetool-*.AppImage --appimage-extract-and-run -s deploy $QTOX_APP_DIR/usr/share/applications/*.desktop
./appimagetool-*.AppImage --appimage-extract-and-run -s deploy $QTOX_APP_DIR/usr/share/applications/*.desktop

# 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

eval ./appimagetool-*.AppImage --appimage-extract-and-run $QTOX_APP_DIR

./appimagetool-*.AppImage --appimage-extract-and-run $QTOX_APP_DIR
2 changes: 1 addition & 1 deletion src/widget/form/genericchatform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <QtGlobal>

#ifdef SPELL_CHECKING
#include <KF6/SonnetUi/sonnet/spellcheckdecorator.h>
#include <sonnet/spellcheckdecorator.h>
#endif

/**
Expand Down

0 comments on commit 0f50568

Please sign in to comment.