Set FONTCONFIG_PATH before --listfonts on macOS

Also, search more system folders for fonts on macOS.
This commit is contained in:
Mark Kim 2023-06-10 16:18:53 -04:00
parent 1d212475b9
commit d6dbd39231
2 changed files with 12 additions and 8 deletions

View file

@ -19,6 +19,10 @@
<dir>/Library/Application Support/TuxPaint/fonts</dir>
<dir>/Library/Application Support/TuxPaint/fonts/locale</dir>
<dir>/Library/Fonts</dir>
<dir>/Network/Library/Fonts</dir>
<dir>/System/Library/Fonts</dir>
<!--
Accept deprecated 'mono' alias, replacing it with 'monospace'
-->

View file

@ -30418,6 +30418,14 @@ int main(int argc, char *argv[])
printf("Tux Paint log - %s\n", logTime);
#endif
#if defined(__MACOS__)
/* Pango uses Fontconfig which requires /opt/local/etc/fonts/fonts.conf. This
* file may not exist on the runtime system, however, so we copy the file
* into our app bundle at compile time, and tell Fontconfig here to look for
* the file within the app bundle. */
putenv((char *)"FONTCONFIG_PATH=Resources/etc");
#endif
chdir_to_binary(argv[0]);
setup_config(argv);
@ -30436,14 +30444,6 @@ int main(int argc, char *argv[])
CLOCK_ASM(time2);
#endif
#if defined(__MACOS__)
/* Pango uses Fontconfig which requires /opt/local/etc/fonts/fonts.conf. This
* file may not exist on the runtime system, however, so we copy the file
* into our app bundle at compile time, and tell Fontconfig here to look for
* the file within the app bundle. */
putenv((char *)"FONTCONFIG_PATH=Resources/etc");
#endif
#if defined(FC_DEBUG)
/*
* Enable fontconfig debugging. See "debug.h"