From efed803c62b2ba048503e9c2e3a15bd73c1369c3 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 7 Feb 2026 17:08:36 -0800 Subject: [PATCH] builder: revert API versions for Meson 1.10.1 Stable Meson no longer has the bug that forced the API bump. Downgrade builder APIs so old source tarballs will again work with current builder containers, and so common can drop the bug workaround. This partially reverts commit 5d032f0c421988b1e428aacfbcc4b12feafcce1e. Signed-off-by: Benjamin Gilbert --- builder/linux/Dockerfile | 2 +- builder/windows/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/linux/Dockerfile b/builder/linux/Dockerfile index 1ff7335..b4a08b9 100644 --- a/builder/linux/Dockerfile +++ b/builder/linux/Dockerfile @@ -3,7 +3,7 @@ FROM quay.io/almalinuxorg/almalinux:8 # NOTE: try to keep the current container image compatible with the latest # stable source release, so people can conveniently build from the source # tarball -RUN touch /etc/openslide-linux-builder-v7 +RUN touch /etc/openslide-linux-builder-v{5,6} # v7 obsoleted; skip it RUN dnf -y upgrade && \ dnf -y install 'dnf-command(config-manager)' epel-release && \ dnf config-manager --set-enabled powertools && \ diff --git a/builder/windows/Dockerfile b/builder/windows/Dockerfile index 01c8868..8801cf7 100644 --- a/builder/windows/Dockerfile +++ b/builder/windows/Dockerfile @@ -2,7 +2,7 @@ FROM docker.io/gentoo/stage3:latest # NOTE: try to keep the current container image compatible with the latest # stable source release, so people can conveniently build from the source # tarball -RUN touch /etc/openslide-winbuild-builder-v8 +RUN touch /etc/openslide-winbuild-builder-v{6,7} # v8 obsoleted; skip it RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf COPY package.accept_keywords /etc/portage/package.accept_keywords/openslide COPY package.use /etc/portage/package.use/openslide