[gimp/osx-build: 44/55] Copy better FontConfig defaults into OS X build.

[Sven Claussner <sclaussner src gnome org>]

commit 44655f9eff12efbdf2ef9ab13c9f46623e62e758
Author: Sven Claussner <sclaussner src gnome org>
Date:   Sat Jun 14 11:30:20 2014 +0200

    Copy better FontConfig defaults into OS X build.
    
    Add fonts directories. Cache in user's home cache. Etc.

 build/osx/custom/fonts.conf         |    6 +++---
 build/osx/gimp-2.8-python.bundle    |    5 ++---
 build/osx/gimp-master-python.bundle |    5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/build/osx/custom/fonts.conf b/build/osx/custom/fonts.conf
index 15bf763..a288dc3 100644
--- a/build/osx/custom/fonts.conf
+++ b/build/osx/custom/fonts.conf
@@ -25,9 +25,9 @@
 
        <dir>/usr/share/fonts</dir>
        <dir>/usr/X11R6/lib/X11/fonts</dir>
-        <dir>/opt/local/share/fonts</dir>
-        <dir>/System/Library/Fonts</dir>
-        <dir>/Network/Library/Fonts</dir>
+       <dir>/opt/local/share/fonts</dir>
+       <dir>/System/Library/Fonts</dir>
+       <dir>/Network/Library/Fonts</dir>
        <dir>/Library/Fonts</dir>
        <dir>~/Library/Fonts</dir>
        <dir>~/.fonts</dir>
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
index bbcdbd5..475853c 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -228,10 +228,9 @@
                ${project}/custom/gtkrc
        </data>
 
-
        <!-- Copy in better FontConfig defaults -->
-       <!--<data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf"> ${project}/custom/fonts.conf 
-               </data> -->
+       <data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf"> ${project}/custom/fonts.conf
+       </data>
 
        <!-- Copy in icons -->
        <data dest="${bundle}/Contents/Resources">${project}/gimp.icns</data>
diff --git a/build/osx/gimp-master-python.bundle b/build/osx/gimp-master-python.bundle
index 796c33b..509f33d 100755
--- a/build/osx/gimp-master-python.bundle
+++ b/build/osx/gimp-master-python.bundle
@@ -230,10 +230,9 @@
                ${project}/custom/gtkrc
        </data>
 
-
        <!-- Copy in better FontConfig defaults -->
-       <!--<data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf"> ${project}/custom/fonts.conf 
-               </data> -->
+       <data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf"> ${project}/custom/fonts.conf
+       </data>
 
        <!-- Copy in icons -->
        <data dest="${bundle}/Contents/Resources">${project}/gimp.icns</data>