From 2976b6f69b40f14778991851f06251d536297830 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
Date: Sun, 23 Mar 2025 16:14:52 -0700
Subject: [PATCH] Update dependencies for AppImage workflow

Upgrade the runner from Ubuntu 20.04 to 22.04.

Upgrade exiv2 from v0.28.3 to v0.28.5.

Upgrade libjxl from 0.10.3 to 0.11.1.

Use the system librsvg2.
---
 .github/workflows/appimage.yml | 26 +++-----------------------
 tools/makedeb/PKGBUILD.libjxl  |  2 +-
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index f58892f75..407958164 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
     strategy:
@@ -54,38 +54,18 @@ jobs:
 
       - name: Install Exiv2
         run: |
-          EXIV2_VERSION='v0.28.3'
+          EXIV2_VERSION='v0.28.5'
           echo "Cloning Exiv2 $EXIV2_VERSION."
           git clone --depth 1 --branch "$EXIV2_VERSION" https://github.com/Exiv2/exiv2.git ext/exiv2
 
           echo "Configuring build."
           mkdir ext/exiv2/build
           cd ext/exiv2/build
-          cmake -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_BMFF=ON ..
+          cmake -DCMAKE_BUILD_TYPE=Release ..
 
           echo "Building and installing."
           sudo make -j$(nproc) install
 
-      - name: Install Librsvg required min. version
-      # Required min. version is not available for Ubuntu 20.04 LTS (but is for 22.04 LTS) so needs to be built manually
-        run: |
-          LIBRSVG2_VERSION='2.52.2'
-          echo "Cloning Librsvg2 $LIBRSVG2_VERSION."
-          git clone --depth 1 --branch "$LIBRSVG2_VERSION" https://gitlab.gnome.org/GNOME/librsvg.git ext/librsvg2
-
-          echo "Installing required dependencies with apt."
-          DEBIAN_FRONTEND=noninteractive sudo apt install -y rustc cargo gtk-doc-tools libgirepository1.0-dev
-
-          echo "Updating PATH."
-          export PATH="$PATH:/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0"
-
-          echo "Configuring build."
-          cd ext/librsvg2
-          sh autogen.sh
-
-          echo "Building and installing."
-          sudo make install
-
       - name: Configure build
         run: |
           export REF_NAME_FILTERED="$(echo '${{github.ref_name}}' | sed 's/[^A-z0-9_.-]//g')"
diff --git a/tools/makedeb/PKGBUILD.libjxl b/tools/makedeb/PKGBUILD.libjxl
index ed48f846b..91fa4cb98 100644
--- a/tools/makedeb/PKGBUILD.libjxl
+++ b/tools/makedeb/PKGBUILD.libjxl
@@ -2,7 +2,7 @@
 
 _pkgname="libjxl"
 pkgname="$_pkgname"
-pkgver='0.10.3'
+pkgver='0.11.1'
 pkgrel='1'
 pkgdesc='JPEG XL image format reference implementation'
 url='https://github.com/libjxl/libjxl'