English
fontconfig.patch
资源名称：vlc-1.0.5.zip [点击查看]
上传用户：kjfoods
上传日期：2020-07-06
资源大小：29949k
文件大小：5k
源码类别：
midi
开发平台：
Unix_Linux
- --- fontconfig/src/Makefile.am Mon Sep 18 07:06:41 2006
- +++ fontconfig/src/Makefile.am Sat Aug 18 20:48:45 2007
- ***************
- *** 31,35 ****
- install-libtool-import-lib:
- - $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
- $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
- --- 31,34 ----
- --- fontconfig/src/Makefile.in Sun Dec 3 10:27:33 2006
- +++ fontconfig/src/Makefile.in Sat Aug 18 20:53:40 2007
- ***************
- *** 614,618 ****
- @OS_WIN32_TRUE@install-libtool-import-lib:
- - @OS_WIN32_TRUE@ $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
- @OS_WIN32_TRUE@ $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
- --- 614,617 ----
- --- fontconfig/src/fcinit.c Sun Dec 3 07:10:30 2006
- +++ fontconfig/src/fcinit.c Sun Aug 19 00:52:07 2007
- ***************
- *** 26,32 ****
- --- 26,94 ----
- #include <stdlib.h>
- + #ifdef _WIN32
- + #define STRICT
- + #include <windows.h>
- + #undef STRICT
- +
- + static char *IsWindowsDir(char *p_dir_in, char **p_dir_out)
- + {
- + *p_dir_out = NULL;
- +
- + if( ! strcmp( p_dir_in, "WINDOWSFONTDIR" ))
- + {
- + int rc;
- +
- + *p_dir_out = malloc( 1000 );
- + if( !*p_dir_out )
- + {
- + fprintf( stderr, "Fontconfig error: out of memory" );
- + return p_dir_in;
- + }
- + rc = GetWindowsDirectory( *p_dir_out, 800 );
- + if( rc == 0 || rc > 800 )
- + {
- + fprintf( stderr, "Fontconfig error: GetWindowsDirectory failed" );
- + free( *p_dir_out );
- + *p_dir_out = NULL;
- +
- + return p_dir_in;
- + }
- + if( (*p_dir_out)[ rc - 1 ] != '\' )
- + strcpy( (*p_dir_out)+rc, "\" );
- + strcat( *p_dir_out, "fonts" );
- +
- + return *p_dir_out;
- + }
- + else if( ! strcmp( p_dir_in, "WINDOWSTEMPDIR" ))
- + {
- + int rc;
- +
- + *p_dir_out = malloc( 1000 );
- + if( !*p_dir_out )
- + {
- + fprintf( stderr, "Fontconfig error: out of memory" );
- + return p_dir_in;
- + }
- + rc = GetTempPath( 800, *p_dir_out );
- + if( rc == 0 || rc > 800 )
- + {
- + fprintf( stderr, "Fontconfig error: GetTempPath failed" );
- + free( *p_dir_out );
- + *p_dir_out = NULL;
- +
- + return p_dir_in;
- + }
- + return *p_dir_out;
- + }
- + return p_dir_in;
- + }
- + #else
- + #define IsWindowsDir(A, B) A
- + #endif
- +
- static FcConfig *
- FcInitFallbackConfig (void)
- {
- + char *p_dir_out = NULL;
- FcConfig *config;
- ***************
- *** 34,40 ****
- if (!config)
- goto bail0;
- ! if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS))
- goto bail1;
- ! if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR))
- goto bail1;
- return config;
- --- 96,106 ----
- if (!config)
- goto bail0;
- ! if (!FcConfigAddDir (config, (FcChar8 *) IsWindowsDir(FC_DEFAULT_FONTS, &p_dir_out)))
- goto bail1;
- ! if (p_dir_out)
- ! free(p_dir_out);
- ! p_dir_out = NULL;
- !
- ! if (!FcConfigAddCacheDir (config, (FcChar8 *) IsWindowsDir(FC_CACHEDIR, &p_dir_out)))
- goto bail1;
- return config;
- ***************
- *** 43,46 ****
- --- 109,114 ----
- FcConfigDestroy (config);
- bail0:
- + if (p_dir_out)
- + free(p_dir_out);
- return 0;
- }
- ***************
- *** 73,84 ****
- if (config->cacheDirs && config->cacheDirs->num == 0)
- {
- fprintf (stderr,
- "Fontconfig warning: no <cachedir> elements found. Check configuration.n");
- fprintf (stderr,
- "Fontconfig warning: adding <cachedir>%s</cachedir>n",
- ! FC_CACHEDIR);
- fprintf (stderr,
- "Fontconfig warning: adding <cachedir>~/.fontconfig</cachedir>n");
- ! if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR) ||
- !FcConfigAddCacheDir (config, (FcChar8 *) "~/.fontconfig"))
- {
- --- 141,158 ----
- if (config->cacheDirs && config->cacheDirs->num == 0)
- {
- + char *p_dir_out = NULL;
- +
- fprintf (stderr,
- "Fontconfig warning: no <cachedir> elements found. Check configuration.n");
- fprintf (stderr,
- "Fontconfig warning: adding <cachedir>%s</cachedir>n",
- ! IsWindowsDir(FC_CACHEDIR, &p_dir_out));
- fprintf (stderr,
- "Fontconfig warning: adding <cachedir>~/.fontconfig</cachedir>n");
- ! if (p_dir_out)
- ! free(p_dir_out);
- ! p_dir_out = NULL;
- !
- ! if (!FcConfigAddCacheDir (config, (FcChar8 *) IsWindowsDir(FC_CACHEDIR, &p_dir_out)) ||
- !FcConfigAddCacheDir (config, (FcChar8 *) "~/.fontconfig"))
- {
- ***************
- *** 86,91 ****
- --- 160,172 ----
- "Fontconfig error: out of memory");
- FcConfigDestroy (config);
- +
- + if (p_dir_out)
- + free(p_dir_out);
- + p_dir_out = NULL;
- +
- return FcInitFallbackConfig ();
- }
- + if (p_dir_out)
- + free(p_dir_out);
- }
