From bdea772469bf66316964e87104f73947f36acd50 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Mon, 23 Dec 2024 15:09:08 -0500
Subject: [PATCH 1/2] Librsvg: Update to 2.59.2

---
 L/Librsvg/build_tarballs.jl | 82 ++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/L/Librsvg/build_tarballs.jl b/L/Librsvg/build_tarballs.jl
index e2ceced48b0..26dcec3818e 100644
--- a/L/Librsvg/build_tarballs.jl
+++ b/L/Librsvg/build_tarballs.jl
@@ -3,57 +3,63 @@
 using BinaryBuilder
 
 name = "Librsvg"
-version = v"2.54.5"
+version = v"2.59.2"
 
 # Collection of sources required to build librsvg
 sources = [
     ArchiveSource("https://download.gnome.org/sources/librsvg/$(version.major).$(version.minor)/librsvg-$(version).tar.xz",
-                  "4f03190f45324d1fa1f52a79dfcded1f64eaf49b3ae2f88eedab0c07617cae6e"),
+                  "ecd293fb0cc338c170171bbc7bcfbea6725d041c95f31385dc935409933e4597"),
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
-cd $WORKSPACE/srcdir/librsvg-*/
+cd $WORKSPACE/srcdir/librsvg-*
 
-autoreconf -fiv
+#TODO autoreconf -fiv
+#TODO 
+#TODO # Delete misleading libtool files
+#TODO rm -vf ${prefix}/lib/*.la
+#TODO 
+#TODO # On most platforms we have to use `${rust_target}` as `host`
+#TODO FLAGS=(--host=${rust_target})
+#TODO if [[ "${target}" == *-mingw* ]]; then
+#TODO     # On Windows using `${rust_target}` wouldn't work:
+#TODO     #
+#TODO     #     Invalid configuration `x86_64-pc-windows-gnu': Kernel `windows' not known to work with OS `gnu'.
+#TODO     #
+#TODO     # Then we have to use `RUST_TARGET` to set the Rust target.  I haven't found
+#TODO     # a combination host and RUST_TARGET that would work on all platforms.  If
+#TODO     # you do, let me know!
+#TODO     FLAGS=(--host=${target} RUST_TARGET="${rust_target}" LIBS="-luserenv -lbcrypt")
+#TODO fi
+#TODO 
+#TODO ./configure \
+#TODO     --build=${MACHTYPE} \
+#TODO     --prefix=${prefix} \
+#TODO     --disable-static \
+#TODO     --enable-pixbuf-loader \
+#TODO     --disable-introspection \
+#TODO     --disable-gtk-doc-html \
+#TODO     --enable-shared \
+#TODO     "${FLAGS[@]}"
+#TODO make
+#TODO make install
+#TODO install_license COPYING.LIB
 
-# Delete misleading libtool files
-rm -vf ${prefix}/lib/*.la
-
-# On most platforms we have to use `${rust_target}` as `host`
-FLAGS=(--host=${rust_target})
-if [[ "${target}" == *-mingw* ]]; then
-    # On Windows using `${rust_target}` wouldn't work:
-    #
-    #     Invalid configuration `x86_64-pc-windows-gnu': Kernel `windows' not known to work with OS `gnu'.
-    #
-    # Then we have to use `RUST_TARGET` to set the Rust target.  I haven't found
-    # a combination host and RUST_TARGET that would work on all platforms.  If
-    # you do, let me know!
-    FLAGS=(--host=${target} RUST_TARGET="${rust_target}" LIBS="-luserenv -lbcrypt")
-fi
-
-./configure \
-    --build=${MACHTYPE} \
-    --prefix=${prefix} \
-    --disable-static \
-    --enable-pixbuf-loader \
-    --disable-introspection \
-    --disable-gtk-doc-html \
-    --enable-shared \
-    "${FLAGS[@]}"
-make
-make install
-install_license COPYING.LIB
+meson setup builddir --cross-file=${MESON_TARGET_TOOLCHAIN} --prefix=${prefix}
+meson compile -C builddir
+meson install -C builddir
 """
 
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
-platforms = supported_platforms(; experimental=true)
-# We dont have all dependencies for armv6l
-filter!(p -> arch(p) != "armv6l", platforms)
-# Rust toolchain for i686 Windows is unusable
-filter!(p -> !Sys.iswindows(p) || arch(p) != "i686", platforms)
+platforms = supported_platforms()
+# Rust is not supported on aarch64-*-freebsd
+filter!(p -> !(Sys.isfreebsd(p) && arch(p) == "aarch64"), platforms)
+#TODO # We dont have all dependencies for armv6l
+#TODO filter!(p -> arch(p) != "armv6l", platforms)
+#TODO # Rust toolchain for i686 Windows is unusable
+#TODO filter!(p -> !Sys.iswindows(p) || arch(p) != "i686", platforms)
 
 # The products that we will ensure are always built
 products = [
@@ -75,7 +81,7 @@ dependencies = [
     HostBuildDependency("gdk_pixbuf_jll"),
     BuildDependency("Xorg_xorgproto_jll"),
     Dependency("gdk_pixbuf_jll"),
-    Dependency("Pango_jll"; compat="1.47.0"),
+    Dependency("Pango_jll"; compat="1.55.5"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.

From 6b6ff8b0111bb34187a3c0911cdad876e0551079 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Wed, 25 Dec 2024 12:38:02 -0500
Subject: [PATCH 2/2] Librsvg: Disable riscv64

---
 L/Librsvg/build_tarballs.jl | 38 ++-----------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/L/Librsvg/build_tarballs.jl b/L/Librsvg/build_tarballs.jl
index 26dcec3818e..41ae73b55a0 100644
--- a/L/Librsvg/build_tarballs.jl
+++ b/L/Librsvg/build_tarballs.jl
@@ -15,37 +15,6 @@ sources = [
 script = raw"""
 cd $WORKSPACE/srcdir/librsvg-*
 
-#TODO autoreconf -fiv
-#TODO 
-#TODO # Delete misleading libtool files
-#TODO rm -vf ${prefix}/lib/*.la
-#TODO 
-#TODO # On most platforms we have to use `${rust_target}` as `host`
-#TODO FLAGS=(--host=${rust_target})
-#TODO if [[ "${target}" == *-mingw* ]]; then
-#TODO     # On Windows using `${rust_target}` wouldn't work:
-#TODO     #
-#TODO     #     Invalid configuration `x86_64-pc-windows-gnu': Kernel `windows' not known to work with OS `gnu'.
-#TODO     #
-#TODO     # Then we have to use `RUST_TARGET` to set the Rust target.  I haven't found
-#TODO     # a combination host and RUST_TARGET that would work on all platforms.  If
-#TODO     # you do, let me know!
-#TODO     FLAGS=(--host=${target} RUST_TARGET="${rust_target}" LIBS="-luserenv -lbcrypt")
-#TODO fi
-#TODO 
-#TODO ./configure \
-#TODO     --build=${MACHTYPE} \
-#TODO     --prefix=${prefix} \
-#TODO     --disable-static \
-#TODO     --enable-pixbuf-loader \
-#TODO     --disable-introspection \
-#TODO     --disable-gtk-doc-html \
-#TODO     --enable-shared \
-#TODO     "${FLAGS[@]}"
-#TODO make
-#TODO make install
-#TODO install_license COPYING.LIB
-
 meson setup builddir --cross-file=${MESON_TARGET_TOOLCHAIN} --prefix=${prefix}
 meson compile -C builddir
 meson install -C builddir
@@ -54,12 +23,9 @@ meson install -C builddir
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
 platforms = supported_platforms()
-# Rust is not supported on aarch64-*-freebsd
+# Rust is not supported on aarch64-*-freebsd nor on riscv64-linux-*
 filter!(p -> !(Sys.isfreebsd(p) && arch(p) == "aarch64"), platforms)
-#TODO # We dont have all dependencies for armv6l
-#TODO filter!(p -> arch(p) != "armv6l", platforms)
-#TODO # Rust toolchain for i686 Windows is unusable
-#TODO filter!(p -> !Sys.iswindows(p) || arch(p) != "i686", platforms)
+filter!(p -> !(Sys.islinux(p) && arch(p) == "riscv64"), platforms)
 
 # The products that we will ensure are always built
 products = [