From 4467ad763dfc6e19399e8bf94907bb5877c62562 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 24 Jul 2026 09:52:52 +0200 Subject: [PATCH] Revert "Fix unknown type name locale_t on mac ARM64 TB (take 2)" This reverts commit b76fe8a06f9c58f3f17e09c292dfa9baadb1b5d6. It didn't help macOS ARM TB Change-Id: I9db0fc059da8576b362c2b939f8d47e63ac4b676 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208539 Tested-by: Julien Nabet Reviewed-by: Julien Nabet --- external/fontconfig/UnpackedTarball_fontconfig.mk | 6 ------ external/fontconfig/locale_t_macOS.patch.1 | 14 -------------- 2 files changed, 20 deletions(-) delete mode 100644 external/fontconfig/locale_t_macOS.patch.1 diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk b/external/fontconfig/UnpackedTarball_fontconfig.mk index 4556883521f9..19b093e7ca39 100644 --- a/external/fontconfig/UnpackedTarball_fontconfig.mk +++ b/external/fontconfig/UnpackedTarball_fontconfig.mk @@ -24,12 +24,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ )) endif -ifeq ($(OS),MACOSX) -$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ - external/fontconfig/locale_t_macOS.patch.1 \ -)) -endif - ifeq ($(OS),LINUX) $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ external/fontconfig/fontconfig_deprecated.new.patch.1 \ diff --git a/external/fontconfig/locale_t_macOS.patch.1 b/external/fontconfig/locale_t_macOS.patch.1 deleted file mode 100644 index 2d813bec295b..000000000000 --- a/external/fontconfig/locale_t_macOS.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur fontconfig.org/src/fcint.h fontconfig/src/fcint.h ---- fontconfig.org/src/fcint.h 2026-07-19 16:48:28.916116391 +0200 -+++ fontconfig/src/fcint.h 2026-07-19 16:50:01.131629047 +0200 -@@ -29,6 +29,10 @@ - # include - #endif - -+#ifdef HAVE_XLOCALE_H -+#include -+#endif -+ - #include "fcstdint.h" - - #include