Dependency version bumps

- Update Cairo to 1.18.4.
- Update librsvg to 2.59.91.
- Update ImageMagick to 6.9.13-23.

MXE Updates:
- Update GLib to 2.84.0.

Author: kleisauke

README.md

@@ -18,13 +18,13 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | Dependency      | Version   | Used under the terms of                                      |
 |-----------------|-----------|--------------------------------------------------------------|
 | [aom]           | 3.12.0    | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
-| [cairo]         | 1.18.2    | Mozilla Public License 2.0                                   |
+| [cairo]         | 1.18.4    | Mozilla Public License 2.0                                   |
 | [cgif]          | 0.5.0     | MIT Licence                                                  |
 | [expat]         | 2.6.4     | MIT Licence                                                  |
 | [fontconfig]    | 2.16.0    | [fontconfig Licence] (BSD-like)                              |
 | [freetype]      | 2.13.3    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.16    | LGPLv3                                                       |
-| [glib]          | 2.83.5    | LGPLv3                                                       |
+| [glib]          | 2.84.0    | LGPLv3                                                       |
 | [harfbuzz]      | 10.4.0    | MIT Licence                                                  |
 | [highway]       | 1.2.0     | Apache-2.0 License, BSD 3-Clause                             |
 | [lcms]          | 2.17      | MIT Licence                                                  |
@@ -34,7 +34,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [libheif]       | 1.19.7    | LGPLv3                                                       |
 | [libimagequant] | 2.4.1¹    | BSD 2-Clause                                                 |
 | [libpng]        | 1.6.47    | [libpng License version 2]                                   |
-| [librsvg]       | 2.59.90   | LGPLv3                                                       |
+| [librsvg]       | 2.59.91   | LGPLv3                                                       |
 | [libspng]       | 0.7.4     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.7.0     | [libtiff License] (BSD-like)                                 |
 | [libvips]       | 8.16.0    | LGPLv3                                                       |
@@ -94,7 +94,7 @@ Same as libvips-web + these extra dependencies:
 | [cfitsio]       | 4.5.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
 | [gdk-pixbuf]    | 2.42.12   | LGPLv3                                                       |
-| [imagemagick]   | 6.9.13-22 | [ImageMagick License] (Apache-2.0-like)                      |
+| [imagemagick]   | 6.9.13-23 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.9     | BSD 3-Clause                                                 |
 | [libdicom]      | 1.1.0     | MIT Licence                                                  |
 | [libjxl]        | 0.11.1    | BSD 3-Clause                                                 |

build/build.sh

@@ -45,7 +45,7 @@ fi
 # Always checkout a particular revision which will successfully build.
 # This ensures that it will not suddenly break a build.
 # Note: Must be regularly updated.
-revision="7e76b638d6d6c96686d733f676c734ec688fa0ec"
+revision="d8aaa42070904230cfddb7d62f6ce03e295e74ae"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

build/overrides.mk

@@ -47,8 +47,8 @@ libarchive_FILE     := libarchive-$(libarchive_VERSION).tar.xz
 libarchive_URL      := https://github.com/libarchive/libarchive/releases/download/v$(libarchive_VERSION)/$(libarchive_FILE)
 
 # upstream version is 7, we want ImageMagick 6
-imagemagick_VERSION  := 6.9.13-22
-imagemagick_CHECKSUM := 5cadcf46363a44ee0f81b87043e39a37621cf637c8feddef73b960a1563cf8b5
+imagemagick_VERSION  := 6.9.13-23
+imagemagick_CHECKSUM := 4447407b87be9825c5607738afd5b0dc55cce9ef0c3ebc5677a0c5f20685ad5e
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 
@@ -61,8 +61,8 @@ graphicsmagick_FILE     := GraphicsMagick-$(graphicsmagick_VERSION).tar.xz
 graphicsmagick_URL      := https://$(SOURCEFORGE_MIRROR)/project/graphicsmagick/graphicsmagick/$(graphicsmagick_VERSION)/$(graphicsmagick_FILE)
 
 # upstream version is 2.40.21
-librsvg_VERSION  := 2.59.90
-librsvg_CHECKSUM := d3d623a9839d2b7eb76a5b0b621c15d02abc4d9a886376c3a53b568206ebf545
+librsvg_VERSION  := 2.59.91
+librsvg_CHECKSUM := b1ff70d5b04441ba2ba3f80404b7d98127128fba1020211e3d99b7bf400e4f83
 librsvg_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch)))
 librsvg_SUBDIR   := librsvg-$(librsvg_VERSION)
 librsvg_FILE     := librsvg-$(librsvg_VERSION).tar.xz
@@ -86,20 +86,20 @@ fribidi_SUBDIR   := fribidi-$(fribidi_VERSION)
 fribidi_FILE     := fribidi-$(fribidi_VERSION).tar.xz
 fribidi_URL      := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
 
-# upstream version is 2.83.4
-glib_VERSION  := 2.83.5
-glib_CHECKSUM := f8342c4f2b713c926db1b34b8bd93dd4cb2515a1102d8419686fe93942c6071c
-glib_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
-glib_SUBDIR   := glib-$(glib_VERSION)
-glib_FILE     := glib-$(glib_VERSION).tar.xz
-glib_URL      := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
-
 # upstream version is 0.6.22
 libexif_VERSION  := 0.6.25
 libexif_CHECKSUM := 62f74cf3bf673a6e24d2de68f6741643718541f83aca5947e76e3978c25dce83
 libexif_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libexif-[0-9]*.patch)))
 libexif_GH_CONF  := libexif/libexif/releases,v,,,,.tar.xz
 
+# upstream version is 1.18.2
+cairo_VERSION  := 1.18.4
+cairo_CHECKSUM := 445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb
+cairo_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/cairo-[0-9]*.patch)))
+cairo_SUBDIR   := cairo-$(cairo_VERSION)
+cairo_FILE     := cairo-$(cairo_VERSION).tar.xz
+cairo_URL      := https://cairographics.org/releases/$(cairo_FILE)
+
 # upstream version is 0.43.4
 pixman_VERSION  := 0.44.2
 pixman_CHECKSUM := 50baf820dde0c5ff9714d03d2df4970f606a3d3b1024f5404c0398a9821cc4b0
@@ -682,6 +682,7 @@ define libwebp_BUILD
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB) $(MXE_DISABLE_PROGRAMS)
 endef
 
+# Disable the DWrite font backend to ensure compat with Windows Nano Server
 # node-canvas needs a Cairo with SVG support, so compile with -Dpng=enabled
 # ensure the FontConfig backend is enabled
 # build with -Dzlib=disabled to disable the script, PostScript and PDF surfaces

build/patches/cairo-1-fixes.patch

@@ -15,7 +15,7 @@ diff --git a/meson.build b/meson.build
 index 1111111..2222222 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -70,10 +70,6 @@ if cc.get_id() != 'msvc'
+@@ -71,10 +71,6 @@ if cc.get_id() != 'msvc'
      '-fno-common'
    ]
 

build/patches/cairo-1-nanoserver-compat.patch

@@ -10,7 +10,7 @@ diff --git a/meson.build b/meson.build
 index 1111111..2222222 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -483,29 +483,6 @@ if host_machine.system() == 'windows'
+@@ -485,29 +485,6 @@ if host_machine.system() == 'windows'
 
    add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp'])
 

build/patches/librsvg-2-fixes.patch

@@ -13,7 +13,7 @@ diff --git a/meson.build b/meson.build
 index 1111111..2222222 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -339,13 +339,9 @@ if host_system in ['windows', 'linux']
+@@ -350,13 +350,9 @@ if host_system in ['windows', 'linux']
    native_libs = run_command(
      rustc_query_native_static_libs_args,
      capture: true,

build/plugins/vipsdisp/overrides.mk

@@ -6,8 +6,10 @@ glib_CONFIGURE_OPTS = --force-fallback-for=libpcre2-8
 
 # GTK requires cairo-win32, cairo-ps and cairo-pdf
 # https://gitlab.gnome.org/GNOME/gtk/-/issues/5072
+# Also enable the DWrite font backend in Cairo
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/7144
 cairo_PATCHES := $(filter-out $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/../../patches/cairo-1-nanoserver-compat.patch))),$(cairo_PATCHES))
-cairo_CONFIGURE_OPTS = -Dzlib=enabled
+cairo_CONFIGURE_OPTS = -Dzlib=enabled -Ddwrite=enabled
 
 # Override sub-dependencies
 libepoxy_DEPS := $(filter-out  xorg-macros,$(libepoxy_DEPS))