ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Fix unknown type name locale_t on mac ARM64 TB (take 2)

Browse Source 
In file included from fcarch.c:24:
./fcint.h:678:9: error: unknown type name 'locale_t'
typedef locale_t FcLocale;
        ^
./fcint.h:680:19: error: use of undeclared identifier 'LC_CTYPE_MASK'
    FC_LC_CTYPE = LC_CTYPE_MASK,
                  ^
./fcint.h:681:21: error: use of undeclared identifier 'LC_NUMERIC_MASK'
    FC_LC_NUMERIC = LC_NUMERIC_MASK,
                    ^
./fcint.h:682:18: error: use of undeclared identifier 'LC_TIME_MASK'
    FC_LC_TIME = LC_TIME_MASK,
                 ^
./fcint.h:683:21: error: use of undeclared identifier 'LC_COLLATE_MASK'
    FC_LC_COLLATE = LC_COLLATE_MASK,
                    ^
./fcint.h:684:22: error: use of undeclared identifier 'LC_MONETARY_MASK'
    FC_LC_MONETARY = LC_MONETARY_MASK,
                     ^
./fcint.h:685:22: error: use of undeclared identifier 'LC_MESSAGES_MASK'
    FC_LC_MESSAGES = LC_MESSAGES_MASK,
                     ^
./fcint.h:689:19: error: use of undeclared identifier 'LC_ALL_MASK'
    FC_LC_PAPER = LC_ALL_MASK,
                  ^
./fcint.h:694:18: error: use of undeclared identifier 'LC_ALL_MASK'
    FC_LC_NAME = LC_ALL_MASK,
                 ^
./fcint.h:699:21: error: use of undeclared identifier 'LC_ALL_MASK'
    FC_LC_ADDRESS = LC_ALL_MASK,
                    ^
./fcint.h:704:23: error: use of undeclared identifier 'LC_ALL_MASK'
    FC_LC_TELEPHONE = LC_ALL_MASK,
                      ^
./fcint.h:709:25: error: use of undeclared identifier 'LC_ALL_MASK'
    FC_LC_MEASUREMENT = LC_ALL_MASK,
                        ^
./fcint.h:714:28: error: use of undeclared identifier 'LC_ALL_MASK'
    FC_LC_IDENTIFICATION = LC_ALL_MASK,
                           ^
./fcint.h:716:17: error: use of undeclared identifier 'LC_ALL_MASK'
    FC_LC_ALL = LC_ALL_MASK,
                ^
14 errors generated.

I copied pasted the ifdef from src/fcstr.c

Change-Id: I82eb9382ab317af91da7ddd1432a974829458b93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208262
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Julien Nabet
2026-07-19 21:31:49 +02:00
parent 0ebcec3593
commit b76fe8a06f
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/fontconfig/UnpackedTarball_fontconfig.mk
Vendored
+6
View File
@@ -24,6 +24,12 @@ $(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 \
external/fontconfig/locale_t_macOS.patch.1
Vendored
+14
View File
@@ -0,0 +1,14 @@
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>