From 399d1b73fee5baf793caec7698be6035330b3b0f Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Fri, 27 Oct 2023 15:40:01 +0100
Subject: [PATCH] Include pandoc in AppImage generation files

Pandoc is need to create README.html, which is an entry in the run-time
Help menu
---
 .github/workflows/appimage-aarch64.yml         | 2 +-
 .github/workflows/appimage-minimal-aarch64.yml | 3 ++-
 .github/workflows/appimage-minimal-x86_64.yml  | 3 ++-
 .github/workflows/appimage-x86_64.yml          | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/appimage-aarch64.yml b/.github/workflows/appimage-aarch64.yml
index 538f85c8..75f3f7a2 100644
--- a/.github/workflows/appimage-aarch64.yml
+++ b/.github/workflows/appimage-aarch64.yml
@@ -45,7 +45,7 @@ jobs:
             yes | sudo apt-get install git
             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 gettext
+            yes | sudo apt-get install pandoc
             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 da8a4777..6df19fbd 100644
--- a/.github/workflows/appimage-minimal-aarch64.yml
+++ b/.github/workflows/appimage-minimal-aarch64.yml
@@ -32,10 +32,11 @@ jobs:
             yes | sudo apt-get install git
             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 gettext
             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 -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=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 -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=disabled -Dyelp-build=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 49c744f3..071841e5 100644
--- a/.github/workflows/appimage-minimal-x86_64.yml
+++ b/.github/workflows/appimage-minimal-x86_64.yml
@@ -7,6 +7,7 @@ jobs:
     steps:
     - run: sudo apt-get update
     - 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
 
     - uses: actions/checkout@v3
@@ -17,7 +18,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 -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=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 -Dtiff=disabled -Dvideothumbnailer=disabled -Dwebp=disabled -Dyelp-build=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 5ab33c72..2352a663 100644
--- a/.github/workflows/appimage-x86_64.yml
+++ b/.github/workflows/appimage-x86_64.yml
@@ -18,6 +18,7 @@ jobs:
     - run: sudo apt-get install libpoppler-glib-dev
     - run: sudo apt-get install libraw-dev libomp-dev
     - run: sudo apt-get install libwebp-dev
+    - run: sudo apt-get install pandoc
     - run: sudo apt-get install gettext
 
     - uses: actions/checkout@v3
-- 
2.20.1