From e999ba8ffd7a371af016eeeb51f9bac93d3dec44 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 23 Oct 2023 13:12:40 +0200 Subject: [PATCH 1/2] Update AppImage build configuration This update removes various icon-theme exclusions from the AppImage build configuration and includes specific hicolor icon files. It also adds new environment variables and path mappings for handling user data more efficiently within the AppImage. This aims to optimize the packing process and improve the resultant AppImage's compatibility and performance. Contributes to CURA-11132 --- packaging/AppImage-builder/AppImageBuilder.yml.jinja | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packaging/AppImage-builder/AppImageBuilder.yml.jinja b/packaging/AppImage-builder/AppImageBuilder.yml.jinja index 2d9d3f48e0..cede44755a 100644 --- a/packaging/AppImage-builder/AppImageBuilder.yml.jinja +++ b/packaging/AppImage-builder/AppImageBuilder.yml.jinja @@ -48,12 +48,10 @@ AppDir: main include: - xdg-desktop-portal-kde:amd64 - exclude: - - hicolor-icon-theme - - adwaita-icon-theme - - humanity-icon-theme + exclude: [] files: - include: [] + include: + - usr/share/icons/hicolor/* exclude: - usr/share/man - usr/share/doc/*/README.* @@ -67,6 +65,9 @@ AppDir: QT_PLUGIN_PATH: "$APPDIR/qt/plugins" QML2_IMPORT_PATH: "$APPDIR/qt/qml" QT_QPA_PLATFORMTHEME: xdgdesktopportal + XDG_DATA_HOME: "$APPDIR/usr/share" + path_mappings: + - /usr/share:$APPDIR/usr/share test: fedora-30: image: appimagecrafters/tests-env:fedora-30 From dd2a80876f10a1c3b5e2e8ad331526e3a3b6ca1f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 23 Oct 2023 14:52:05 +0200 Subject: [PATCH 2/2] Update package dependencies in AppImageBuilder The changes include adding several packages to the list of dependencies for the AppImage-builder, such as libgtk, librsvg2, imagemagick and icon themes. Furthermore, adjustments were made to the runtime environment variables (GDK_PIXBUF_MODULEDIR and GDK_PIXBUF_MODULE_FILE). Excluded file paths were also updated to exclude unnecessary documentation files. Contributes to CURA-11132 --- .../AppImageBuilder.yml.jinja | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/packaging/AppImage-builder/AppImageBuilder.yml.jinja b/packaging/AppImage-builder/AppImageBuilder.yml.jinja index cede44755a..1cf321d7a5 100644 --- a/packaging/AppImage-builder/AppImageBuilder.yml.jinja +++ b/packaging/AppImage-builder/AppImageBuilder.yml.jinja @@ -47,17 +47,26 @@ AppDir: - sourceline: deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie main include: - - xdg-desktop-portal-kde:amd64 + - xdg-desktop-portal-kde + - libgtk-3-0 + - librsvg2-2 + - librsvg2-common + - libgdk-pixbuf2.0-0 + - libgdk-pixbuf2.0-bin + - libgdk-pixbuf2.0-common + - imagemagick + - shared-mime-info + - gnome-icon-theme-symbolic + - hicolor-icon-theme exclude: [] files: - include: - - usr/share/icons/hicolor/* + include: [] exclude: - - usr/share/man - - usr/share/doc/*/README.* - - usr/share/doc/*/changelog.* - - usr/share/doc/*/NEWS.* - - usr/share/doc/*/TODO.* + - usr/share/man + - usr/share/doc/*/README.* + - usr/share/doc/*/changelog.* + - usr/share/doc/*/NEWS.* + - usr/share/doc/*/TODO.* runtime: env: APPDIR_LIBRARY_PATH: "$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" @@ -65,7 +74,8 @@ AppDir: QT_PLUGIN_PATH: "$APPDIR/qt/plugins" QML2_IMPORT_PATH: "$APPDIR/qt/qml" QT_QPA_PLATFORMTHEME: xdgdesktopportal - XDG_DATA_HOME: "$APPDIR/usr/share" + 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 path_mappings: - /usr/share:$APPDIR/usr/share test: