From 47a22368d249aac94528820743fd8196cc8edefa Mon Sep 17 00:00:00 2001
From: wieczerm <system_halted@protonmail.com>
Date: Wed, 28 Oct 2026 13:49:28 +0100
Subject: [PATCH] fontconfig: update to 2.18.3.

Drop fix-noto-download-error.patch: upstream changes, no run-test.sh

Local build testing: x86_64, x86_64-musl, crosscompile armv6l
---
 .../patches/fix-noto-download-error.patch     | 26 -------------------
 srcpkgs/fontconfig/template                   |  8 ++++--
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/fontconfig/patches/fix-noto-download-error.patch

diff --git a/srcpkgs/fontconfig/patches/fix-noto-download-error.patch b/srcpkgs/fontconfig/patches/fix-noto-download-error.patch
deleted file mode 100644
index efc1434fdea60a..00000000000000
--- a/srcpkgs/fontconfig/patches/fix-noto-download-error.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Test is failing because of relying on downloading noto.zip which now gives HTTP 403 error.
-Don't rely on google for anything.
-diff --git a/test/run-test.sh b/test/run-test.sh
-index 9b3c91c8..7aa9d273 100644
---- a/test/run-test.sh
-+++ b/test/run-test.sh
-@@ -521,18 +521,7 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" "$BUILDTESTDIR"/my-fonts.conf "$BUILDTESTDI
- 
- fi # if [ "x$EXEEXT" = "x" ]
- 
--if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
--    dotest "MT-safe global config"
--    prep
--    curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
--    (cd "$FONTDIR"; unzip noto.zip)
--    if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
--        touch -m -t "$(fdate ${SOURCE_DATE_EPOCH})" "$FONTDIR"
--    fi
--    "$BUILDTESTDIR"/test-crbug1004254
--else
--    echo "No test-crbug1004254: skipped"
--fi
-+echo "No test-crbug1004254: skipped"
- 
- if [ "x$EXEEXT" = "x" ]; then
- 
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index bef12e5d6bc033..35812ae4bda1b2 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'fontconfig'
 pkgname=fontconfig
-version=2.17.1
+version=2.18.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
@@ -13,7 +13,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.fontconfig.org"
 distfiles="https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${version}/fontconfig-${version}.tar.xz"
-checksum=9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541
+checksum=4f7b554a38cdf78c033f666c8871f3749e14a094f65a07f630c91ed0b43d35e3
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" ac_cv_va_copy=C99"
+fi
 
 post_install() {
 	if [ "$CROSS_BUILD" ]; then