Dependency version bumps

- Update GLib to 2.73.0.

MXE Updates:
- Update LibTIFF to 4.4.0.

Author: kleisauke

README.md

@@ -25,7 +25,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [freetype]      | 2.12.1    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.12    | LGPLv3                                                       |
 | [gdk-pixbuf]    | 2.42.8    | LGPLv3                                                       |
-| [glib]          | 2.72.1    | LGPLv3                                                       |
+| [glib]          | 2.73.0    | LGPLv3                                                       |
 | [harfbuzz]      | 4.3.0     | MIT Licence                                                  |
 | [lcms]          | 2.13.1    | MIT Licence                                                  |
 | [libexif]       | 0.6.24    | LGPLv3                                                       |
@@ -36,7 +36,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [libpng]        | 1.6.37    | [libpng License version 2]                                   |
 | [librsvg]       | 2.54.3    | LGPLv3                                                       |
 | [libspng]       | 0.7.2     | BSD 2-Clause                                                 |
-| [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
+| [libtiff]       | 4.4.0     | [libtiff License] (BSD-like)                                 |
 | [libvips]       | 8.12.2    | LGPLv3                                                       |
 | [libwebp]       | 1.2.2     | New BSD License                                              |
 | [libxml2]       | 2.9.14    | MIT Licence                                                  |

build.sh

@@ -7,15 +7,15 @@ Usage: $(basename "$0") [OPTIONS] [DEPS] [ARCH] [TYPE]
 Build Windows binaries for libvips in a container
 
 OPTIONS:
-	--help					Show the help and exit
+	--help			Show the help and exit
 	-c, --commit <COMMIT>	The commit to build libvips from
-	-r, --ref <REF>			The branch or tag to build libvips from
-	--nightly				Build libvips from tip-of-tree (alias of -r master)
-	--with-hevc				Build libheif with the HEVC-related dependencies
-	--with-debug			Build binaires with debug symbols
-	--without-llvm			Build binaires with GCC
-	--without-mozjpeg		Build binaires with libjpeg-turbo
-	--without-zlib-ng		Build binaires with vanilla zlib
+	-r, --ref <REF>		The branch or tag to build libvips from
+	--nightly		Build libvips from tip-of-tree (alias of -r master)
+	--with-hevc		Build libheif with the HEVC-related dependencies
+	--with-debug		Build binaires with debug symbols
+	--without-llvm		Build binaires with GCC
+	--without-mozjpeg	Build binaires with libjpeg-turbo
+	--without-zlib-ng	Build binaires with vanilla zlib
 
 DEPS:
 	The group of dependencies to build libvips with,
@@ -160,7 +160,7 @@ else
 fi
 
 # Ensure latest Debian stable base image
-$oci_runtime pull buildpack-deps:buster
+$oci_runtime pull buildpack-deps:bullseye
 
 # Create a machine image with all the required build tools pre-installed
 $oci_runtime build -t libvips-build-win-mxe container

build/build.sh

@@ -51,7 +51,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="23cb13d8aec6bbd51ef3671b0e975c61d7dbd0ad"
+revision="c8a846658a349da3e4676a69f9b01cbf13205dbe"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

build/libheif.mk

@@ -9,6 +9,9 @@ $(PKG)_GH_CONF  := strukturag/libheif/releases,v
 $(PKG)_DEPS     := cc aom
 
 define $(PKG)_BUILD
+    # need to regenerate the configure script
+    cd '$(SOURCE_DIR)' && autoreconf -fi
+
     # Disable multithreading when building with Win32 threads to
     # avoid a dependency on mingw-std-threads (which we only use
     # in the "all" variant). Disabling multithreading only affects

build/overrides.mk

@@ -79,8 +79,8 @@ 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.70.2
-glib_VERSION  := 2.72.1
-glib_CHECKSUM := c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2
+glib_VERSION  := 2.73.0
+glib_CHECKSUM := 3673f10515f4bcfb9ee2ce0a921a18fa359c36fab388b19819467e7b09506870
 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
@@ -170,7 +170,6 @@ libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFIL
 harfbuzz_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/harfbuzz-[0-9]*.patch)))
 libxml2_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libxml2-[0-9]*.patch)))
 poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
-tiff_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/tiff-[0-9]*.patch)))
 meson_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/meson-[0-9]*.patch)))
 mingw-w64_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mingw-w64-[0-9]*.patch)))
 fontconfig_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/fontconfig-[0-9]*.patch)))

build/patches/glib-2-fixes.patch

@@ -42,7 +42,7 @@ diff --git a/meson.build b/meson.build
 index 1111111..2222222 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2087,40 +2087,17 @@ endif
+@@ -2030,40 +2030,17 @@ endif
  # proxy-libintl subproject.
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
@@ -85,31 +85,3 @@ index 1111111..2222222 100644
    endif
  endif
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kleis Auke Wolthuizen <github@kleisauke.nl>
-Date: Mon, 13 May 2019 18:00:00 +0200
-Subject: [PATCH 2/2] Disable some tests
-
-
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 1111111..2222222 100644
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -487,7 +487,7 @@ gdbus_example_objectmanager_sources = files(
-   'gdbus-example-objectmanager-server.c',
- )
- 
--if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
-+if host_machine.system() != 'windows' and cc.get_id() != 'clang-cl'
-   test_extra_programs += {
-     # These three are manual-run tests because they need a session bus but don't bring one up themselves
-     # FIXME: these build but don't seem to work!
-@@ -603,7 +603,7 @@ if installed_tests_enabled
-   endforeach
- endif
- 
--if not meson.is_cross_build() or meson.has_exe_wrapper()
-+if not (meson.is_cross_build() or meson.has_exe_wrapper()) and host_machine.system() != 'windows'
- 
-   compiler_type = '--compiler=@0@'.format(cc.get_id())
- 

build/patches/glib-2-without-gregex.patch

@@ -2,7 +2,7 @@ diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
 index 1111111..2222222 100644
 --- a/gio/gsettingsschema.c
 +++ b/gio/gsettingsschema.c
-@@ -551,58 +551,7 @@ start_element (GMarkupParseContext  *context,
+@@ -553,58 +553,7 @@ start_element (GMarkupParseContext  *context,
  static gchar *
  normalise_whitespace (const gchar *orig)
  {
@@ -66,7 +66,7 @@ diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h
 index 1111111..2222222 100644
 --- a/glib/glib-autocleanups.h
 +++ b/glib/glib-autocleanups.h
-@@ -71,8 +71,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GPatternSpec, g_pattern_spec_free)
+@@ -73,8 +73,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GPatternSpec, g_pattern_spec_free)
  G_DEFINE_AUTOPTR_CLEANUP_FUNC(GQueue, g_queue_free)
  G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GQueue, g_queue_clear)
  G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRand, g_rand_free)
@@ -79,7 +79,7 @@ diff --git a/glib/glib.h b/glib/glib.h
 index e72c09da5..d639e645e 100644
 --- a/glib/glib.h
 +++ b/glib/glib.h
-@@ -72,7 +72,6 @@
+@@ -74,7 +74,6 @@
  #include <glib/grcbox.h>
  #include <glib/grefcount.h>
  #include <glib/grefstring.h>

build/patches/glib-static.patch

@@ -12,7 +12,7 @@ diff --git a/gio/giomodule.c b/gio/giomodule.c
 index 1111111..2222222 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
-@@ -1110,27 +1110,8 @@ extern GType _g_win32_network_monitor_get_type (void);
+@@ -1111,27 +1111,8 @@ extern GType _g_win32_network_monitor_get_type (void);
 
  static HMODULE gio_dll = NULL;
 
@@ -42,7 +42,7 @@ index 1111111..2222222 100644
  extern void glib_win32_init (void);
  extern void gobject_win32_init (void);
 
-@@ -1162,6 +1143,7 @@ giomodule_init_ctor (void)
+@@ -1163,6 +1144,7 @@ giomodule_init_ctor (void)
 
  #else /* G_PLATFORM_WIN32 && GLIB_STATIC_COMPILATION && !G_HAS_CONSTRUCTORS */
  #error Your platform/compiler is missing constructor support