- Put the fontconfig test flag for the Mac package in the ~/.inkscape-etc/

    directory, along with all the other Mac specific config files.

diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script
index dd98e5f34c59ca60768056978ab3902eee33cf62..62dcafdf57d1b44d4228a3ccc2fe50973650c286 100755 (executable)
--- a/packaging/macosx/Resources/script
+++ b/packaging/macosx/Resources/script
@@ -40,7 +40,7 @@ if [[ $VERSION -le 4 ]]; then
 fi
        
 # Warn the user about time-consuming generation of fontconfig caches.
-test -f "${HOME}/.config/Inkscape/.fccache-new" || exit 12
+test -f "${HOME}/.inkscape-etc/.fccache-new" || exit 12
 
 
 

diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c
index c798e3bf92e0d93b4ade1fb69d95f69dd111e5af..f413d438a48ef818b2917978f89c825ab0e34eac 100644 (file)
--- a/packaging/macosx/ScriptExec/main.c
+++ b/packaging/macosx/ScriptExec/main.c
@@ -243,8 +243,8 @@ static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall,
     ShowFirstStartWarningDialog();
 
     // Note that we've seen the warning.
-    system("test -d \"$HOME/.config/Inkscape\" || mkdir -p \"$HOME/.config/Inkscape\"; "
-           "touch \"$HOME/.config/Inkscape/.fccache-new\"");
+    system("test -d \"$HOME/.inkscape-etc\" || mkdir -p \"$HOME/.inkscape-etc\"; "
+           "touch \"$HOME/.inkscape-etc/.fccache-new\"");
     // Rerun now.
     OSErr err = ExecuteScript(scriptPath, &pid);
     ExitToShell();