From aaa3b85f8d6b375b1bc78b634ed63adae9687da1 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 19 Jan 2025 10:30:31 +0100
Subject: [PATCH] fontconfig: Update to 2.16.0

Both patches are included in the new release
---
 mingw-w64-fontconfig/0010-fix-relocation.patch | 13 -------------
 mingw-w64-fontconfig/PKGBUILD                  | 18 +++++-------------
 2 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 mingw-w64-fontconfig/0010-fix-relocation.patch

diff --git a/mingw-w64-fontconfig/0010-fix-relocation.patch b/mingw-w64-fontconfig/0010-fix-relocation.patch
deleted file mode 100644
index 5e7397d980..0000000000
--- a/mingw-w64-fontconfig/0010-fix-relocation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fontconfig-2.15.0/src/meson.build.orig	2024-02-18 11:57:16.082497200 +0100
-+++ fontconfig-2.15.0/src/meson.build	2024-02-18 11:56:40.872987500 +0100
-@@ -57,8 +57,9 @@
- # Define FcPublic appropriately for exports on windows
- fc_extra_c_args = []
- 
--if cc.get_argument_syntax() == 'msvc'
-+if host_machine.system() == 'windows' and get_option('default_library') == 'shared'
-   fc_extra_c_args += '-DFcPublic=__declspec(dllexport)'
-+  fc_extra_c_args += '-DDLL_EXPORT'
- endif
- 
- libfontconfig = library('fontconfig',
diff --git a/mingw-w64-fontconfig/PKGBUILD b/mingw-w64-fontconfig/PKGBUILD
index 76e5490308..41d23effc6 100644
--- a/mingw-w64-fontconfig/PKGBUILD
+++ b/mingw-w64-fontconfig/PKGBUILD
@@ -4,8 +4,8 @@
 _realname=fontconfig
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.15.0
-pkgrel=2
+pkgver=2.16.0
+pkgrel=1
 pkgdesc="A library for configuring and customizing font access (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -23,23 +23,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-freetype")
 install=${_realname}-${MSYSTEM}.install
 source=("https://www.freedesktop.org/software/fontconfig/release/fontconfig-${pkgver}.tar.xz"
-        0010-fix-relocation.patch
         0011-conf-copy-instead-of-symlink.patch
-        fontconfig.hook.in
-        https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/a76b95105ca26c600279b2daf4bd43b37a918823.patch)
-sha256sums=('63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e'
-            '1506f01dcc7c8b80a9e7fbe56720742bd9134c8e4c3321579fd44dbe1aac028d'
+        fontconfig.hook.in)
+sha256sums=('6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220'
             '73ed74a1f4624466084d219e2fbc0d5780da9f63763f1307629251e58cccf2cd'
-            'ad4ce48983045d7f39b40ca9e04d4be2eaa9177b89dcc516388d779c131a88bc'
-            'c225c156c4732a492c9588c8d33705ca29af6f3195f201f4012b09ff012f1831')
+            'ad4ce48983045d7f39b40ca9e04d4be2eaa9177b89dcc516388d779c131a88bc')
 
 prepare() {
   cd "${_realname}-${pkgver}"
 
-  # backport because it seems relevant for us
-  patch -p1 -i "${srcdir}"/a76b95105ca26c600279b2daf4bd43b37a918823.patch
-
-  patch -p1 -i "${srcdir}"/0010-fix-relocation.patch
   patch -p1 -i "${srcdir}"/0011-conf-copy-instead-of-symlink.patch
 }