From 03c8767eb4600701a67caac8fc6f70f9ba9ebb38 Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Jan 18 2023 12:41:50 +0000
Subject: groups/261.native_packages_x11.group: fontconfig: bump to v2.14.1


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index ff865f1..b79ca5b 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -19,11 +19,11 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")";
 : ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
 : ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
 : ${PKG_FONTCONFIG_DEPENDS:="expat freetype util_linux"};
-: ${PKG_FONTCONFIG_SHA256SUM:=0d297ce6bbad897c91c248aeeeeb401dbc62e0960cfa958e87ec32fd5c2270c1};
-: ${PKG_FONTCONFIG_VERSION:=2.12.93};
-: ${PKG_FONTCONFIG_URL:=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_FONTCONFIG_VERSION}.tar.bz2};
+: ${PKG_FONTCONFIG_SHA256SUM:=298e883f6e11d2c5e6d53c8a8394de58d563902cfab934e6be12fb5a5f361ef0};
+: ${PKG_FONTCONFIG_VERSION:=2.14.1};
+: ${PKG_FONTCONFIG_URL:=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_FONTCONFIG_VERSION}.tar.xz};
 : ${PKG_FONTCONFIG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
-: ${PKG_FONTCONFIG_CONFIGURE_ARGS_EXTRA:=--disable-docs};
+: ${PKG_FONTCONFIG_CONFIGURE_ARGS_EXTRA:="PYTHON=${PREFIX}/bin/python3 --enable-iconv --disable-docs"};
 : ${PKG_FREETYPE_DEPENDS:="bzip2 harfbuzz libpng libz"};
 : ${PKG_FREETYPE_SHA256SUM:=3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8};
 : ${PKG_FREETYPE_VERSION:=2.11.1};
diff --git a/patches/fontconfig-2.14.1.local.patch b/patches/fontconfig-2.14.1.local.patch
new file mode 100644
index 0000000..01ff6c0
--- /dev/null
+++ b/patches/fontconfig-2.14.1.local.patch
@@ -0,0 +1,21 @@
+diff -ru fontconfig-2.14.1.orig/src/fcstat.c fontconfig-2.14.1/src/fcstat.c
+--- fontconfig-2.14.1.orig/src/fcstat.c	2021-07-08 07:47:01.000000000 +0200
++++ fontconfig-2.14.1/src/fcstat.c	2023-01-18 13:38:16.297077648 +0100
+@@ -373,7 +373,7 @@
+ 	p = buf.f_fstypename;
+ #  endif
+     }
+-#elif defined(HAVE_FSTATFS) && (defined(HAVE_STRUCT_STATFS_F_FLAGS) || defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) || defined(__linux__))
++#elif defined(HAVE_FSTATFS) && (defined(HAVE_STRUCT_STATFS_F_FLAGS) || defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) || defined(__linux__) || defined(__midipix__))
+     struct statfs buf;
+ 
+     memset (statb, 0, sizeof (FcStatFS));
+@@ -386,7 +386,7 @@
+ #  endif
+ #  if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
+ 	p = buf.f_fstypename;
+-#  elif defined(__linux__) || defined (__EMSCRIPTEN__)
++#  elif defined(__linux__) || defined(__midipix__) || defined (__EMSCRIPTEN__)
+ 	switch (buf.f_type)
+ 	{
+ 	case 0x6969: /* nfs */