[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 894aa18b646b5ecc0f2cc7b9f2c95df235cafb18
Author: Ken Thomases <ken at codeweavers.com>
Date:   Wed Apr 4 17:40:13 2012 -0500

    Revert "gdi32: Load fonts from default Mac external font paths.".
    
    This reverts commit 85a71387dac1ca3ad47970800c8c01743681b528.
    (cherry picked from commit 272cf2a9730865dd5ca32689d62209a4b761e993)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 8a0c096..8a6ed6f 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -3056,7 +3056,6 @@ static void init_font_list(void)
     DWORD valuelen, datalen, i = 0, type, dlen, vlen;
     WCHAR windowsdir[MAX_PATH];
     char *unixname;
-    const char *home;
     const char *data_dir;
 
     delete_external_font_keys();
@@ -3162,6 +3161,7 @@ static void init_font_list(void)
                 ptr = valueA;
                 while (ptr)
                 {
+                    const char* home;
                     LPSTR next = strchr( ptr, ':' );
                     if (next) *next++ = 0;
                     if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) &&
@@ -3182,21 +3182,6 @@ static void init_font_list(void)
         }
         RegCloseKey(hkey);
     }
-
-#ifdef __APPLE__
-    /* Mac default font locations. */
-    ReadFontDir( "/Library/Fonts", TRUE );
-    ReadFontDir( "/Network/Library/Fonts", TRUE );
-    ReadFontDir( "/System/Library/Fonts", TRUE );
-    if ((home = getenv( "HOME" )))
-    {
-        unixname = HeapAlloc( GetProcessHeap(), 0, strlen(home)+15 );
-        strcpy( unixname, home );
-        strcat( unixname, "/Library/Fonts" );
-        ReadFontDir( unixname, TRUE);
-        HeapFree( GetProcessHeap(), 0, unixname );
-    }
-#endif
 }
 
 static BOOL move_to_front(const WCHAR *name)

-- 
Debian Wine packaging