From 260176f7685e6fcc1feb3aadfe9b3bd1c04e2925 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Tue, 13 Feb 2024 20:35:06 +0200
Subject: [PATCH] Switching to appimage-builder to generate AppImage.

---
 .cirrus.yml                       |  11 ++-
 dist/AppImage/AppImageBuilder.yml | 126 ++++++++++++++++++++++++++++++
 dist/AppImage/_icon               | Bin 8432 -> 0 bytes
 dist/AppImage/appimage.yml        |  71 -----------------
 scripts/appimage-deploy.sh        |   2 +-
 5 files changed, 132 insertions(+), 78 deletions(-)
 create mode 100644 dist/AppImage/AppImageBuilder.yml
 delete mode 100644 dist/AppImage/_icon
 delete mode 100644 dist/AppImage/appimage.yml

diff --git a/.cirrus.yml b/.cirrus.yml
index 189dc32a7..da97517ef 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -111,7 +111,7 @@ linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
     - qbs -p autotest-runner -d build profile:qt5 config:release
     - ccache -s
 
-linuxdeployqt_task_template: &LINUXDEPLOYQT_TASK_TEMPLATE
+appimage_task_template: &APPIMAGE_TASK_TEMPLATE
   pip_cache:
     folder: ${PIP_CACHE_DIR}
   install_script:
@@ -136,10 +136,9 @@ linuxdeployqt_task_template: &LINUXDEPLOYQT_TASK_TEMPLATE
     - qbs setup-qt /opt/qt515/bin/qmake qt5
     - qbs config defaultProfile qt5
     - qbs config profiles.qt5.baseProfile ${COMPILER}
-    - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --jobs $(nproc) profile:qt5 config:release modules.buildconfig.enableCcache:${ENABLE_CCACHE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root modules.buildconfig.enableAppImage:true
+    - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --jobs $(nproc) profile:qt5 config:release modules.buildconfig.enableCcache:${ENABLE_CCACHE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/AppDir modules.buildconfig.enableAppImage:true modules.buildconfig.enableRPath:false
     - qbs -p autotest-runner -d build profile:qt5 config:release
-    - export LD_LIBRARY_PATH=/opt/qt515/lib:$CIRRUS_WORKING_DIR/build/install-root/usr/local/lib/valentina:$LD_LIBRARY_PATH
-    - linuxdeployqt $CIRRUS_WORKING_DIR/build/install-root/usr/local/share/applications/ua.com.smart-pattern.valentina.desktop -appimage -qmake='/opt/qt515/bin/qmake' -executable-dir=$CIRRUS_WORKING_DIR/build/install-root/usr/local/bin -extra-plugins=iconengines,platformthemes/libqgtk3.so
+    - appimage-builder --recipe dist/AppImage/AppImageBuilder.yml --appdir $CIRRUS_WORKING_DIR/build/AppDir --skip-test
     - ccache -s
   deploy_script:
     - pwd
@@ -209,7 +208,7 @@ linux_task:
             cpu: 2 
             memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
     - container:
-        image: dismine/linuxdeployqt:latest
+        image: dismine/appimage-builder:latest
       env:
         COMPILER: gcc
         QMAKE_SPEC: "linux-g++"
@@ -218,7 +217,7 @@ linux_task:
         PIP_CACHE_DIR: ${HOME}/.cache/pip
       matrix:
         - name: 'AppImage'
-          << :  *LINUXDEPLOYQT_TASK_TEMPLATE
+          << :  *APPIMAGE_TASK_TEMPLATE
           env:
             ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae]
             DEPLOY: "true"
diff --git a/dist/AppImage/AppImageBuilder.yml b/dist/AppImage/AppImageBuilder.yml
new file mode 100644
index 000000000..e165cb847
--- /dev/null
+++ b/dist/AppImage/AppImageBuilder.yml
@@ -0,0 +1,126 @@
+# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
+version: 1
+AppDir:
+  app_info:
+    id: ua.com.smart-pattern.valentina
+    name: Valentina
+    icon: valentina
+    version: continuous
+    exec: usr/local/bin/valentina
+    exec_args: $@
+  apt:
+    arch:
+    - amd64
+    allow_unauthenticated: true
+    sources:
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ focal main restricted
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ focal-updates main restricted
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ focal universe
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ focal-updates universe
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ focal multiverse
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ focal-updates multiverse
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ focal-backports main restricted
+        universe multiverse
+    - sourceline: deb http://security.ubuntu.com/ubuntu focal-security main restricted
+    - sourceline: deb http://security.ubuntu.com/ubuntu focal-security universe
+    - sourceline: deb http://security.ubuntu.com/ubuntu focal-security multiverse
+    - sourceline: deb http://ppa.launchpad.net/beineri/opt-qt-5.15.4-focal/ubuntu
+        focal main
+    include:
+    - xdg-desktop-portal-kde
+    - libgtk-3-0
+    - libgtk-3-common
+    - librsvg2-2
+    - librsvg2-common:amd64
+    - liblzma5:amd64
+    - libpcre3:amd64
+    - libgdk-pixbuf2.0-0
+    - libgdk-pixbuf2.0-bin
+    - libgdk-pixbuf2.0-common
+    - qt515base
+    - qt515imageformats
+    - qt515svg
+    - qt515xmlpatterns
+    - libpango-1.0-0
+  files:
+    include: []
+    exclude:
+    - usr/share/man
+    - usr/share/doc/*/README.*
+    - usr/share/doc/*/changelog.*
+    - usr/share/doc/*/NEWS.*
+    - usr/share/doc/*/TODO.*
+    - usr/lib/x86_64-linux-gnu/libQt5*
+    - opt/qt515/include
+    - opt/qt515/bin/opt/qt515/bin/fixqt4headers.pl
+    - opt/qt515/bin/moc
+    - opt/qt515/bin/qdbuscpp2xml
+    - opt/qt515/bin/qdbusxml2cpp
+    - opt/qt515/bin/qlalr
+    - opt/qt515/bin/qmake
+    - opt/qt515/bin/qt.conf
+    - opt/qt515/bin/qt515-env.sh
+    - opt/qt515/bin/qvkgen
+    - opt/qt515/bin/rcc
+    - opt/qt515/bin/syncqt.pl
+    - opt/qt515/bin/uic
+    - opt/qt515/doc
+    - opt/qt515/examples
+    - opt/qt515/mkspecs
+    - opt/qt515/lib/cmake
+    - opt/qt515/lib/metatypes
+    - opt/qt515/lib/pkgconfig
+    - opt/qt515/lib/*.a
+    - opt/qt515/lib/*.la
+    - opt/qt515/lib/*.prl
+    - opt/qt515/lib/libQt5AccessibilitySupport.*
+    - opt/qt515/lib/libQt5Bootstrap.*
+    - opt/qt515/lib/libQt5DeviceDiscoverySupport.*
+    - opt/qt515/lib/libQt5EdidSupport.*
+    - opt/qt515/lib/libQt5EglFSDeviceIntegration.*
+    - opt/qt515/lib/libQt5EglSupport.*
+    - opt/qt515/lib/libQt5EventDispatcherSupport.*
+    - opt/qt515/lib/libQt5FbSupport.*
+    - opt/qt515/lib/libQt5FontDatabaseSupport.*
+    - opt/qt515/lib/libQt5GlxSupport.*
+    - opt/qt515/lib/libQt5InputSupport.*
+    - opt/qt515/lib/libQt5LinuxAccessibilitySupport.*
+    - opt/qt515/lib/libQt5OpenGL.*
+    - opt/qt515/lib/libQt5OpenGLExtensions.*
+    - opt/qt515/lib/libQt5PlatformCompositorSupport.*
+    - opt/qt515/lib/libQt5ServiceSupport.*
+    - opt/qt515/lib/libQt5ThemeSupport.*
+    - opt/qt515/lib/libQt5VulkanSupport.*
+    - opt/qt515/lib/libQt5XcbQpa.*
+    - opt/qt515/lib/libQt5XkbCommonSupport.*
+    - opt/qt515/plugins/egldeviceintegrations
+    - opt/qt515/plugins/platforminputcontexts
+    - opt/qt515/plugins/sqldrivers
+    - opt/qt515/plugins/xcbglintegrations
+  runtime:
+    env:
+      APPDIR_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/opt/qt515/lib:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders:$APPDIR/usr/local/lib/valentina"
+      LD_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/opt/qt515/lib:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders:$APPDIR/usr/local/lib/valentina"
+      QT_PLUGIN_PATH: "$APPDIR/opt/qt515/plugins"
+      QT_QPA_PLATFORMTHEME: xdgdesktopportal
+      GDK_PIXBUF_MODULEDIR: $APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
+      GDK_PIXBUF_MODULE_FILE: $APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
+  test:
+    fedora-30:
+      image: appimagecrafters/tests-env:fedora-30
+      command: ./AppRun
+    debian-stable:
+      image: appimagecrafters/tests-env:debian-stable
+      command: ./AppRun
+    archlinux-latest:
+      image: appimagecrafters/tests-env:archlinux-latest
+      command: ./AppRun
+    centos-7:
+      image: appimagecrafters/tests-env:centos-7
+      command: ./AppRun
+    ubuntu-xenial:
+      image: appimagecrafters/tests-env:ubuntu-xenial
+      command: ./AppRun
+AppImage:
+  arch: x86_64
+  update-information: guess
diff --git a/dist/AppImage/_icon b/dist/AppImage/_icon
deleted file mode 100644
index 99d1a087cdd11c25dcd62af5cf0111645b3ebc91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8432
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
SXqW8(0000<MNUMnLSTXo`{V}z

diff --git a/dist/AppImage/appimage.yml b/dist/AppImage/appimage.yml
deleted file mode 100644
index 24406dec2..000000000
--- a/dist/AppImage/appimage.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Building an AppImage for Valentina in openSuse Build Service (OBS)
-#
-# Unfortunately the C++ compiler in the appimage build service is stuck with C++11
-#
-
-app: valentina
-# binpatch: true
-
-# resources required at build time
-build:
-  # packages which get installed in the build enviroment.
-  # These are NOT part of the resulting image.
-  packages:
-    - gcc-c++
-    - libqt5-qtbase-devel
-    - pkgconfig(Qt5Svg)
-    - pkgconfig(Qt5Core)
-    - pkgconfig(Qt5Gui)
-    - pkgconfig(Qt5Network)
-    - pkgconfig(Qt5PrintSupport)
-    - pkgconfig(Qt5Widgets)
-    - pkgconfig(Qt5Xml)
-    - pkgconfig(Qt5Concurrent)
-    - pkgconfig(Qt5XmlPatterns)
-    - pkgconfig(zlib)
-    - libQt5Core-devel
-    - libpng-devel
-    - libqt5-linguist-devel
-    - libicu-devel # to be able to fix the icu data path
-    - linuxdeployqt # required tooling, see script section
-
-# resources which will become available as part of the source.
-# The "appimage" source service needs to be enabled to process these.
-#  git:
-#    - https://gitlab.com/smart-pattern/valentina.git
-#  hg:
-#    - ....
-#  svn:
-#    - ....
-#
-  files:
-    - "https://gitlab.com/smart-pattern/valentina/-/archive/develop/valentina-develop.tar.gz"
-
-# OPTIONAL: ingredient packages are packages which become part of the AppImage.
-#           you may want to remove parts of their content in script section.
-ingredients:
-  packages:
-    - libqt5-qtimageformats
-
-script:
-# OPTIONAL: compile or modify the AppDir. The environment variables:
-#           - $BUILD_SOURCE_DIR point to the source directory
-#           - $BUILD_APPDIR point to the AppDir. This directory will become the content of the AppImage
-  - cd $BUILD_SOURCE_DIR
-  - tar zxvf $BUILD_SOURCE_DIR/valentina-develop.tar.gz
-  - mv -v valentina-develop valentina
-  - cd $BUILD_SOURCE_DIR/valentina
-  - qmake-qt5 PREFIX=/usr PREFIX_LIB=/usr/lib LRELEASE=lrelease-qt5 Valentina.pro -r DEFINES+=APPIMAGE "CONFIG += noTests noRunPath no_ccache noDebugSymbols"
-  - make -j$(nproc)
-  - make INSTALL_ROOT=$BUILD_APPDIR -j$(nproc) install
-
-# create the image file
-  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-  - rm -rf /usr/share/licenses/libqt5-qtimageformats
-# bundle icu's data
-  - mkdir -p $BUILD_APPDIR/usr/share/icu
-  - cp /usr/share/icu/*/icudt*.dat $BUILD_APPDIR/usr/share/icu/
-  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/ua.com.smart-pattern.valentina.desktop -bundle-non-qt-libs -verbose=2 -no-strip
-# Show what we have done
-  - find $BUILD_APPDIR/
diff --git a/scripts/appimage-deploy.sh b/scripts/appimage-deploy.sh
index 444321ba2..3b67ca464 100755
--- a/scripts/appimage-deploy.sh
+++ b/scripts/appimage-deploy.sh
@@ -25,7 +25,7 @@ if [[ "$DEPLOY" == "true" ]]; then
     check_failure "Unable to clean stale artifacts.";
 
     print_info "Start uploading.";
-    python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/Valentina-continuous-x86_64.AppImage "/0.7.x/Linux/valentina-${TARGET_PLATFORM}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.AppImage";
+    python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/Valentina-continuous-x86_64.AppImage "/0.7.x/Linux/valentina-${TARGET_PLATFORM}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.AppImage";
     check_failure "Unable to upload Valentina's AppImage.";
 
     print_info "Successfully uploaded.";