Fix #1534: Latest AppImage fails to run

#1534 Revert to Ubuntu 22.04 for AppImage builds. Exr files are not supported. This is not a permanent fix. It is likely the problem is with https://github.com/AppImageCrafters/appimage-builder. An issue exists there: AppImageCrafters/appimage-builder#355
BestImageViewer · Nov 9, 2024 · 4a87c31 · 4a87c31
1 parent a251672
commit 4a87c31
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 35 deletions.
diff --git a/.github/workflows/appimage-aarch64.yml b/.github/workflows/appimage-aarch64.yml
@@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is running Geeqie aarch64 AppImage build
 on: [push]
 jobs:
   Build-AppImage:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         arch: [aarch64]
@@ -42,9 +42,9 @@ jobs:
             yes | sudo apt-get install libgexiv2-dev
             yes | sudo apt-get install libgspell-1-dev
             yes | sudo apt-get install libheif-dev
-            yes | sudo apt-get install libimath-dev
+            # yes | sudo apt-get install libimath-dev
             yes | sudo apt-get install liblua5.3-dev
-            yes | sudo apt-get install libopenexr-dev
+            # yes | sudo apt-get install libopenexr-dev
             yes | sudo apt-get install libpoppler-glib-dev
             yes | sudo apt-get install libraw-dev libomp-dev
             yes | sudo apt-get install libunwind-dev
@@ -55,7 +55,7 @@ jobs:
             yes | sudo apt-get install yelp-tools
             mkdir -p $GITHUB_WORKSPACE/AppDir
             mkdir -p $GITHUB_WORKSPACE/AppDir/usr
-            meson setup -Ddoxygen=disabled -Dyelp-build=disabled -Dprefix=$GITHUB_WORKSPACE/AppDir/usr build
+            meson setup -Ddoxygen=disabled -Dexr=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-aarch64.yml b/.github/workflows/appimage-minimal-aarch64.yml
@@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is running Geeqie minimal aarch64 AppImage build
 on: [push]
 jobs:
   Build-AppImage:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         arch: [aarch64]

diff --git a/.github/workflows/appimage-minimal-x86_64.yml b/.github/workflows/appimage-minimal-x86_64.yml
@@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is running Geeqie minimal x86_64 AppImage build
 on: [push]
 jobs:
   Build-AppImage:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
     - run: sudo apt-get update
     - run: sudo apt-get install build-essential libgtk-3-dev libgtk-3-bin

diff --git a/.github/workflows/appimage-x86_64.yml b/.github/workflows/appimage-x86_64.yml
@@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is running Geeqie x86_64 AppImage build
 on: [push]
 jobs:
   Build-AppImage:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
     - run: sudo apt-get update
     - run: sudo apt-get install build-essential libgtk-3-dev libgtk-3-bin
@@ -20,10 +20,10 @@ jobs:
     - run: sudo apt-get install libgexiv2-dev
     - run: sudo apt-get install libgspell-1-dev
     - run: sudo apt-get install libheif-dev
-    - run: sudo apt-get install libimath-dev
+    # - run: sudo apt-get install libimath-dev
     - run: sudo apt-get install libdjvulibre-dev
     - run: sudo apt-get install liblua5.3-dev
-    - run: sudo apt-get install libopenexr-dev
+    # - run: sudo apt-get install libopenexr-dev
     - run: sudo apt-get install libpoppler-glib-dev
     - run: sudo apt-get install libraw-dev libomp-dev
     - run: sudo apt-get install libunwind-dev
@@ -43,6 +43,8 @@ jobs:
       with:
         action: build
         directory: build
+        setup-options: >
+          -Dexr=disabled
         options: --verbose
         meson-version: 1.0.1
 

diff --git a/AppImageBuilder-aarch64.yml b/AppImageBuilder-aarch64.yml
@@ -19,10 +19,10 @@ AppDir:
     - arm64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble universe
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates universe
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy universe
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates universe
     include:
     - curl
     - evince
@@ -35,15 +35,15 @@ AppDir:
     - libgexiv2-2
     - libgspell-1-2
     - libheif1
-    - libimath-3-1-29
+    # - libimath-3-1-29
     - libjpeg8
     - liblcms2-2
     - liblua5.3-0
-    - libopenexr-3-1-30
+    # - libopenexr-3-1-30
     - libopenjp2-7
-    - libraw23
+    - libraw20
     - librsvg2-common
-    - libtiff6
+    - libtiff5
     - libunwind8
     - libwebp7
 

diff --git a/AppImageBuilder-x86_64.yml b/AppImageBuilder-x86_64.yml
@@ -19,10 +19,10 @@ AppDir:
     - amd64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble main restricted
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble universe
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble-updates main restricted
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble-updates universe
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy main restricted
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy universe
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates main restricted
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates universe
     include:
     - curl
     - evince
@@ -36,15 +36,15 @@ AppDir:
     - libgexiv2-2
     - libgspell-1-2
     - libheif1
-    - libimath-3-1-29
+    # - libimath-3-1-29
     - libjpeg8
     - liblcms2-2
     - liblua5.3-0
-    - libopenexr-3-1-30
+    # - libopenexr-3-1-30
     - libopenjp2-7
-    - libraw23
+    - libraw20
     - librsvg2-common
-    - libtiff6
+    - libtiff5
     - libunwind8
     - libwebp7
 

diff --git a/AppImageBuilderMinimal-aarch64.yml b/AppImageBuilderMinimal-aarch64.yml
@@ -19,13 +19,13 @@ AppDir:
     - arm64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble universe
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates universe
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy universe
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates universe
     include:
     - curl
-    - libtiff6
+    - libtiff5
 
   files:
     include: []

diff --git a/AppImageBuilderMinimal-x86_64.yml b/AppImageBuilderMinimal-x86_64.yml
@@ -19,13 +19,13 @@ AppDir:
     - amd64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble main restricted
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble universe
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble-updates main restricted
-    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ noble-updates universe
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy main restricted
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy universe
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates main restricted
+    - sourceline: deb http://im.archive.ubuntu.com/ubuntu/ jammy-updates universe
     include:
     - curl
-    - libtiff6
+    - libtiff5
 
   files:
     include: []