Revert "Fix unknown type name locale_t on mac ARM64 TB (take 2)"
This reverts commit b76fe8a06f.
It didn't help macOS ARM TB
Change-Id: I9db0fc059da8576b362c2b939f8d47e63ac4b676
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208539
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
@@ -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 \
|
||||
|
||||
-14
@@ -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 <config.h>
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_XLOCALE_H
|
||||
+#include <xlocale.h>
|
||||
+#endif
|
||||
+
|
||||
#include "fcstdint.h"
|
||||
|
||||
#include <assert.h>
|
||||
Reference in New Issue
Block a user