deployqt

CI/build-appimg.sh

@@ -46,13 +46,6 @@ cp unix/librecad appdir/usr/bin/
 cp unix/resources/plugins/*.so appdir/usr/lib/librecad/
 cp -r unix/resources/qm appdir/usr/share/librecad/
 
-#Qt6 so
-for q_dir in $(echo $LD_LIBRARY_PATH|sed -e 's/:/ /g')
-do
-	echo "copying ${q_dir}"
-	find ${q_dir} -type f -iname "libqt6*svg.so*" -exec cp -ax '{}' ';'
-done
-
 cp desktop/librecad.desktop appdir/usr/share/applications/
 cp desktop/org.librecad.librecad.appdata.xml appdir/usr/share/metainfo/
 
@@ -64,7 +57,9 @@ cp -r librecad/support/patterns appdir/usr/share/librecad/
 cp CI/librecad.svg appdir/usr/share/icons/hicolor/scalable/apps/
 convert -resize 256x256 CI/librecad.svg appdir/usr/share/icons/hicolor/256x256/apps/librecad.png
 
-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)
-chmod +x appimagetool-*.AppImage
-./appimagetool-*.AppImage -s deploy appdir/usr/share/applications/librecad.desktop
-VERSION=`git describe --tags --always` ./appimagetool-*.AppImage appdir/
+wget -q https://github.com/omergoktas/linuxdeployqt/releases/download/latest/linuxdeployqt-x86_64.AppImage
+
+chmod +x linuxdeployqt-x86_64.AppImage
+./linuxdeployqt-x86_64.AppImage appdir/usr/bin/librecad -qmake=$(which qmake6) -appimage
+#./appimagetool-*.AppImage -s deploy appdir/usr/bin/librecad.desktop
+#VERSION=`git describe --tags --always` ./appimagetool-*.AppImage appdir/