From 214be330725538069f3cd5072750cd10e54b4131 Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Thu, 21 Dec 2023 15:17:47 +0000
Subject: [PATCH] Bug fix: Help files are not included in AppImages

Include yelp-tools (yelp-build) as a dependency.
---
 .github/workflows/appimage-aarch64.yml         | 1 +
 .github/workflows/appimage-minimal-aarch64.yml | 5 +++--
 .github/workflows/appimage-minimal-x86_64.yml  | 3 ++-
 .github/workflows/appimage-x86_64.yml          | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/appimage-aarch64.yml b/.github/workflows/appimage-aarch64.yml
index 21561127..44c5f02b 100644
--- a/.github/workflows/appimage-aarch64.yml
+++ b/.github/workflows/appimage-aarch64.yml
@@ -47,6 +47,7 @@ jobs:
             yes | sudo apt-get install python3 python3-pip python3-setuptools  python3-wheel ninja-build
             yes | sudo apt-get install meson
             yes | sudo apt-get install pandoc
+            yes | sudo apt-get install yelp-tools
             mkdir -p $GITHUB_WORKSPACE/AppDir
             mkdir -p $GITHUB_WORKSPACE/AppDir/usr
             meson setup -Ddevel=disabled -Ddoxygen=disabled -Dyelp-build=disabled -Dprefix=$GITHUB_WORKSPACE/AppDir/usr build
diff --git a/.github/workflows/appimage-minimal-aarch64.yml b/.github/workflows/appimage-minimal-aarch64.yml
index 42dc3b5f..b80edc78 100644
--- a/.github/workflows/appimage-minimal-aarch64.yml
+++ b/.github/workflows/appimage-minimal-aarch64.yml
@@ -20,7 +20,7 @@ jobs:
         base_image: ${{ matrix.base_image }}
         cpu: ${{ matrix.cpu }}
         cpu_info: ${{ matrix.cpu_info }}
-        image_additional_mb: 1000
+        image_additional_mb: 8000
         bind_mount_repository: false
         import_github_env: true
         export_github_env: true
@@ -34,9 +34,10 @@ jobs:
             yes | sudo apt-get install meson
             yes | sudo apt-get install pandoc
             yes | sudo apt-get install gettext
+            yes | sudo apt-get install yelp-tools
             mkdir -p $GITHUB_WORKSPACE/AppDir
             mkdir -p $GITHUB_WORKSPACE/AppDir/usr
-            meson setup -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpdf=disabled -Dspell=disabled -Dsubprojects=false  -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp-pixbuf-loader=disabled -Dyelp-build=disabled -Dprefix=$GITHUB_WORKSPACE/AppDir/usr build
+            meson setup -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpdf=disabled -Dspell=disabled -Dsubprojects=false  -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp-pixbuf-loader=disabled -Dprefix=$GITHUB_WORKSPACE/AppDir/usr build
             ninja -C build install
             tar -czvf geeqie.gz $GITHUB_WORKSPACE/
 
diff --git a/.github/workflows/appimage-minimal-x86_64.yml b/.github/workflows/appimage-minimal-x86_64.yml
index effac76d..316a8263 100644
--- a/.github/workflows/appimage-minimal-x86_64.yml
+++ b/.github/workflows/appimage-minimal-x86_64.yml
@@ -9,6 +9,7 @@ jobs:
     - run: sudo apt-get install build-essential libgtk-3-dev libgtk-3-bin
     - run: sudo apt-get install pandoc
     - run: sudo apt-get install gettext
+    - run: sudo apt-get install yelp-tools
 
     - uses: actions/checkout@v3
     - run: git fetch --tags --force
@@ -18,7 +19,7 @@ jobs:
       with:
         action: build
         directory: build
-        setup-options: -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpdf=disabled -Dspell=disabled -Dsubprojects=false -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp-pixbuf-loader=disabled -Dyelp-build=disabled
+        setup-options: -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpdf=disabled -Dspell=disabled -Dsubprojects=false -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp-pixbuf-loader=disabled
         options: --verbose
         meson-version: 1.0.1
 
diff --git a/.github/workflows/appimage-x86_64.yml b/.github/workflows/appimage-x86_64.yml
index 6d9954a6..6e2bbf04 100644
--- a/.github/workflows/appimage-x86_64.yml
+++ b/.github/workflows/appimage-x86_64.yml
@@ -22,6 +22,7 @@ jobs:
     - run: sudo apt-get install webp-pixbuf-loader
     - run: sudo apt-get install pandoc
     - run: sudo apt-get install gettext
+    - run: sudo apt-get install yelp-tools
 
     - uses: actions/checkout@v3
     - run: git fetch --tags --force
-- 
2.20.1