Dependency version bumps

- Update HarfBuzz to 11.3.3.
- Update vipsdisp to 4.1.0.
- Add libtool patch to fix C++ linkage.

Author: kleisauke

README.md

@@ -25,7 +25,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [freetype]      | 2.13.3    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.16    | LGPLv3                                                       |
 | [glib]          | 2.85.2    | LGPLv3                                                       |
-| [harfbuzz]      | 11.3.2    | MIT Licence                                                  |
+| [harfbuzz]      | 11.3.3    | MIT Licence                                                  |
 | [highway]       | 1.2.0     | Apache-2.0 License, BSD 3-Clause                             |
 | [lcms]          | 2.17      | MIT Licence                                                  |
 | [libarchive]    | 3.8.1     | BSD 2-Clause                                                 |

build/overrides.mk

@@ -117,8 +117,8 @@ cfitsio_FILE     := cfitsio-$(cfitsio_VERSION).tar.gz
 cfitsio_URL      := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$(cfitsio_FILE)
 
 # upstream version is 11.2.1
-harfbuzz_VERSION  := 11.3.2
-harfbuzz_CHECKSUM := d58ada9b2d28821245e8bdb8b94a4e2dad01a08c50d57feb027b32e84c9abfb1
+harfbuzz_VERSION  := 11.3.3
+harfbuzz_CHECKSUM := e1fbca6b32a91ae91ecd9eb2ca8d47a5bfe2b1cb2e54855ab7a0b464919ef358
 harfbuzz_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/harfbuzz-[0-9]*.patch)))
 harfbuzz_GH_CONF  := harfbuzz/harfbuzz/releases,,,,,.tar.xz
 
@@ -205,6 +205,7 @@ zlib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))
 #  Removed: jasper, libiconv
 #  Replaced: jpeg with libjpeg-turbo
 # lcms:
+#  Added: meson-wrapper
 #  Removed: jpeg, tiff
 # libtiff:
 #  Replaced: jpeg with libjpeg-turbo
@@ -219,7 +220,7 @@ zlib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))
 #  Added: libjpeg-turbo, lcms
 #  Removed: boost, curl, qt6-qtbase, libwebp
 # librsvg:
-#  Added: libxml2, rust, $(BUILD)~cargo-c
+#  Added: meson-wrapper, libxml2, rust, $(BUILD)~cargo-c
 #  Removed: gdk-pixbuf, libcroco, libgsf
 # Cairo:
 #  Removed: lzo
@@ -228,6 +229,7 @@ zlib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))
 # libjpeg-turbo:
 #  Replaced: yasm with $(BUILD)~nasm
 # libxml2:
+#  Added: meson-wrapper
 #  Removed: libiconv, xz, zlib
 # Fontconfig:
 #  Added: meson-wrapper
@@ -246,17 +248,17 @@ freetype_DEPS           := $(subst brotli bzip2,meson-wrapper,$(freetype_DEPS))
 freetype-bootstrap_DEPS := $(subst brotli bzip2,meson-wrapper,$(freetype-bootstrap_DEPS))
 glib_DEPS               := cc meson-wrapper gettext libffi zlib
 gdk-pixbuf_DEPS         := cc meson-wrapper glib libjpeg-turbo libpng tiff
-lcms_DEPS               := $(filter-out jpeg tiff ,$(lcms_DEPS))
+lcms_DEPS               := $(subst jpeg tiff,meson-wrapper,$(lcms_DEPS))
 tiff_DEPS               := cc libjpeg-turbo libwebp zlib
 imagemagick_DEPS        := cc libxml2 openjpeg lcms libjpeg-turbo
 graphicsmagick_DEPS     := $(imagemagick_DEPS)
 openexr_DEPS            := cc imath zlib
 poppler_DEPS            := cc cairo libjpeg-turbo freetype glib openjpeg lcms libpng tiff zlib
-librsvg_DEPS            := cc cairo glib pango libxml2 rust $(BUILD)~cargo-c
+librsvg_DEPS            := cc meson-wrapper cairo glib pango libxml2 rust $(BUILD)~cargo-c
 cairo_DEPS              := $(filter-out lzo ,$(cairo_DEPS))
 matio_DEPS              := $(filter-out hdf5 ,$(matio_DEPS))
 libjpeg-turbo_DEPS      := $(subst yasm,$(BUILD)~nasm,$(libjpeg-turbo_DEPS))
-libxml2_DEPS            := cc
+libxml2_DEPS            := cc meson-wrapper
 fontconfig_DEPS         := cc meson-wrapper expat freetype-bootstrap
 libexif_DEPS            := $(filter-out  gettext,$(libexif_DEPS))
 harfbuzz_DEPS           := cc meson-wrapper cairo freetype-bootstrap glib

build/patches/libtool-2-fixes.patch

@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Manoj Gupta <[email protected]>
+Date: Wed, 10 Oct 2018 10:50:23 +0300
+Subject: [PATCH 1/2] Pick up clang_rt static archives compiler internal libraries
+
+Libtool checks only for libraries linked as -l* when trying to
+find internal compiler libraries. Clang, however uses the absolute
+path to link its internal libraries e.g. compiler_rt. This patch
+handles clang's statically linked libraries when finding internal
+compiler libraries.
+https://crbug.com/749263
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866
+
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e606cd2358dd526d79837ce9f98da159c1d02bf7]
+
+diff --git a/aclocal/libtool.m4 b/aclocal/libtool.m4
+index 1111111..2222222 100644
+--- a/aclocal/libtool.m4
++++ b/aclocal/libtool.m4
+@@ -7581,7 +7581,7 @@ if AC_TRY_EVAL(ac_compile); then
+   for p in `eval "$output_verbose_link_cmd"`; do
+     case $prev$p in
+ 
+-    -L* | -R* | -l*)
++    -L* | -R* | -l* | */libclang_rt.*.a)
+        # Some compilers place space between "-{L,R}" and the path.
+        # Remove the space.
+        if test x-L = "$p" ||
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]>
+Date: Mon, 19 Aug 2019 13:34:51 +0300
+Subject: [PATCH 2/2] Allow statically linking compiler support libraries when
+ linking a library
+
+For cases with deplibs_check_method="file_magic ..." (as it is for mingw),
+there were previously no way that a static library could be accepted
+here.
+
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=2f505131b5f29b0de6338bf9d13b7ceadf617d96]
+
+diff --git a/libtool/build-aux/ltmain.sh b/libtool/build-aux/ltmain.sh
+index 1111111..2222222 100644
+--- a/libtool/build-aux/ltmain.sh
++++ b/libtool/build-aux/ltmain.sh
+@@ -8045,8 +8045,15 @@ func_mode_link ()
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+-	    # Linking convenience modules into shared libraries is allowed,
+-	    # but linking other static libraries is non-portable.
++	    # Linking convenience modules and compiler provided static libraries
++	    # into shared libraries is allowed, but linking other static
++	    # libraries is non-portable.
++	    case $deplib in
++	      */libgcc*.$libext | */libclang_rt*.$libext)
++		deplibs="$deplib $deplibs"
++		continue
++	      ;;
++	    esac
+ 	    case " $dlpreconveniencelibs " in
+ 	    *" $deplib "*) ;;
+ 	    *)