Dependency version bumps

MXE Updates:
- Update GLib to 2.83.3.
- Update libpng to 1.6.46.

Author: kleisauke

README.md

@@ -24,7 +24,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [fontconfig]    | 2.16.0    | [fontconfig Licence] (BSD-like)                              |
 | [freetype]      | 2.13.3    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.16    | LGPLv3                                                       |
-| [glib]          | 2.83.2    | LGPLv3                                                       |
+| [glib]          | 2.83.3    | LGPLv3                                                       |
 | [harfbuzz]      | 10.2.0    | MIT Licence                                                  |
 | [highway]       | 1.2.0     | Apache-2.0 License, BSD 3-Clause                             |
 | [lcms]          | 2.16      | MIT Licence                                                  |
@@ -33,7 +33,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [libffi]        | 3.4.6     | MIT Licence                                                  |
 | [libheif]       | 1.19.5    | LGPLv3                                                       |
 | [libimagequant] | 2.4.1¹    | BSD 2-Clause                                                 |
-| [libpng]        | 1.6.45    | [libpng License version 2]                                   |
+| [libpng]        | 1.6.46    | [libpng License version 2]                                   |
 | [librsvg]       | 2.59.2    | LGPLv3                                                       |
 | [libspng]       | 0.7.4     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.7.0     | [libtiff License] (BSD-like)                                 |

build.sh

@@ -184,7 +184,7 @@ fi
 mkdir -p $tmpdir
 
 # Ensure latest Debian stable base image
-$oci_runtime pull docker.io/library/buildpack-deps:bullseye
+$oci_runtime pull docker.io/library/buildpack-deps:bookworm
 
 # Create a machine image with all the required build tools pre-installed
 $oci_runtime build -t libvips-build-win-mxe container

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="c24870649b739d648aa878627f2e0e1266f8aa4d"
+revision="d734fd4f78f6b629e352aa47c93288d5e0ea9114"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

build/plugins/llvm-mingw/compiler-rt-sanitizers.mk

@@ -2,7 +2,6 @@
 
 PKG             := compiler-rt-sanitizers
 $(PKG)_WEBSITE  := https://compiler-rt.llvm.org/
-$(PKG)_VERSION  := 19.1.7
 $(PKG)_DEPS     := cc
 $(PKG)_TYPE     := meta
 

build/plugins/llvm-mingw/llvm-mingw.mk

@@ -72,10 +72,10 @@ define $(PKG)_PRE_BUILD
     chmod 0755 '$(PREFIX)/bin/$(TARGET)-windres'
 
     $(foreach EXEC, clang-target ld objdump, \
+        $(INSTALL) -m755 '$(SOURCE_DIR)/wrappers/$(EXEC)-wrapper.sh' '$(PREFIX)/$(TARGET)/bin'; \
         $(SED) -i -e 's|^DEFAULT_TARGET=.*|DEFAULT_TARGET=$(PROCESSOR)-w64-mingw32|' \
                   -e 's|^DIR=.*|DIR="$(PREFIX)/$(BUILD)/bin"|' \
-                  -e 's|$$FLAGS "$$@"|$$FLAGS --sysroot="$(PREFIX)/$(TARGET)" "$$@"|' '$(SOURCE_DIR)/wrappers/$(EXEC)-wrapper.sh'; \
-        $(INSTALL) -m755 '$(SOURCE_DIR)/wrappers/$(EXEC)-wrapper.sh' '$(PREFIX)/$(TARGET)/bin';)
+                  -e 's|$$FLAGS "$$@"|$$FLAGS --sysroot="$(PREFIX)/$(TARGET)" "$$@"|' '$(PREFIX)/$(TARGET)/bin/$(EXEC)-wrapper.sh';)
 
     $(INSTALL) -m644 '$(SOURCE_DIR)/wrappers/mingw32-common.cfg' '$(PREFIX)/$(BUILD)/bin'
     $(INSTALL) -m644 '$(SOURCE_DIR)/wrappers/$(PROCESSOR)-w64-windows-gnu.cfg' '$(PREFIX)/$(BUILD)/bin'

build/plugins/llvm-mingw/llvm.mk

@@ -4,7 +4,6 @@ PKG             := llvm
 $(PKG)_WEBSITE  := https://llvm.org/
 $(PKG)_DESCR    := A collection of modular and reusable compiler and toolchain technologies
 $(PKG)_IGNORE   :=
-# This version needs to be in-sync with the compiler-rt-sanitizers package
 $(PKG)_VERSION  := 19.1.7
 $(PKG)_CHECKSUM := 82401fea7b79d0078043f7598b835284d6650a75b93e64b6f761ea7b63097501
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-[0-9]*.patch)))
@@ -30,7 +29,7 @@ define $(PKG)_BUILD_$(BUILD)
         -DLLVM_ENABLE_ASSERTIONS=OFF \
         -DLLVM_ENABLE_PROJECTS='clang;lld;lldb' \
         -DLLVM_TARGETS_TO_BUILD='AArch64;X86' \
-        -DLLVM_TOOLCHAIN_TOOLS='llvm-ar;llvm-config;llvm-ranlib;llvm-objdump;llvm-rc;llvm-cvtres;llvm-nm;llvm-strings;llvm-readobj;llvm-dlltool;llvm-pdbutil;llvm-objcopy;llvm-strip;llvm-cov;llvm-profdata;llvm-addr2line;llvm-symbolizer;llvm-windres' \
+        -DLLVM_TOOLCHAIN_TOOLS='llvm-ar;llvm-ranlib;llvm-objdump;llvm-rc;llvm-cvtres;llvm-nm;llvm-strings;llvm-readobj;llvm-dlltool;llvm-pdbutil;llvm-objcopy;llvm-strip;llvm-cov;llvm-profdata;llvm-addr2line;llvm-symbolizer;llvm-windres' \
         -DLLVM_BUILD_DOCS=OFF \
         -DLLVM_BUILD_EXAMPLES=OFF \
         -DLLVM_BUILD_TESTS=OFF \

build/plugins/llvm-mingw/rust.mk

@@ -2,21 +2,18 @@ PKG             := rust
 $(PKG)_WEBSITE  := https://www.rust-lang.org/
 $(PKG)_DESCR    := A systems programming language focused on safety, speed and concurrency.
 $(PKG)_IGNORE   :=
-# https://static.rust-lang.org/dist/2025-01-20/rustc-nightly-src.tar.xz.sha256
+# https://static.rust-lang.org/dist/2025-02-01/rustc-nightly-src.tar.xz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 3655b93464e7d2a34abcf2c3cf52a454d83db14e42dabdc573d0cc9615fb5a96
+$(PKG)_CHECKSUM := 77c8be92286d56bcb22286097cab680df83bd4f179066e5af7d3bace7960c5da
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)c-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
-$(PKG)_URL      := https://static.rust-lang.org/dist/2025-01-20/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2025-02-01/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 $(PKG)_DEPS_$(BUILD) := $(BUILD)~llvm
 
-# Build Rust from source to support to ensure that it links
-# against UCRT (the prebuilt Rust binaries are built with
-# --with-default-msvcrt=msvcrt)
 define $(PKG)_BUILD_$(BUILD)
     # x86_64-pc-linux-gnu -> x86_64-unknown-linux-gnu
     $(eval BUILD_RUST := $(firstword $(subst -, ,$(BUILD)))-unknown-linux-gnu)

container/Dockerfile

@@ -1,11 +1,13 @@
 FROM docker.io/library/buildpack-deps:bookworm
 
-RUN apt-get update \
-  && apt-get install -y \
+RUN \
+  apt-get update && \
+  apt-get install -qqy --no-install-recommends \
     # http://mxe.cc/#requirements-debian
-    autopoint bison flex gettext gperf g++-multilib intltool \
-    libc6-dev-i386 libtool-bin libxml-parser-perl lzip p7zip-full \
-    python-is-python3 python3-mako python3-packaging python3-tomli ruby
+    autopoint bison build-essential flex gettext gperf \
+    intltool libtool-bin libxml-parser-perl lzip p7zip-full \
+    python-is-python3 python3-mako python3-packaging python3-tomli \
+    ruby zip
 
 # The build dir is mounted at /data, so this runs the build script in that
 ENTRYPOINT ["/bin/bash", "/data/build.sh"]