contrib/src/fontconfig/fontconfig-win32.patch

   1 --- fontconfig/src/fcinit.c     2009-06-06 00:59:27.000000000 +0200
   2 +++ fontconfig.good/src/fcinit.c        2009-07-13 14:58:37.000000000 +0200
   3 @@ -24,6 +24,7 @@
   4
   5  #include "fcint.h"
   6  #include <stdlib.h>
   7 +# include <shlobj.h>
   8
   9  static FcConfig *
  10  FcInitFallbackConfig (void)
  11 @@ -35,7 +36,10 @@
  12         goto bail0;
  13      if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS))
  14         goto bail1;
  15 -    if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR))
  16 +    char dir[MAX_PATH+5];
  17 +    SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, dir );
  18 +    strncat( dir, "\\vlc", 4 );
  19 +    if (!FcConfigAddCacheDir (config, (FcChar8 *)dir))
  20         goto bail1;
  21      return config;
  22
  23 --- fontconfig-2.11.1/src/Makefile.in.orig      2014-07-04 22:34:00.932627043 +0200
  24 +++ fontconfig-2.11.1/src/Makefile.in   2014-07-04 22:35:40.630938711 +0200
  25 @@ -838,7 +838,6 @@
  26
  27  @OS_WIN32_TRUE@install-libtool-import-lib: libfontconfig.la
  28  @OS_WIN32_TRUE@        $(MKDIR_P) $(DESTDIR)$(libdir)
  29 -@OS_WIN32_TRUE@        $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
  30  @OS_WIN32_TRUE@        $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
  31
  32  @OS_WIN32_TRUE@uninstall-libtool-import-lib:
  33 --- fontconfig-2.11.1/src/Makefile.am.orig      2014-07-04 22:34:00.932627043 +0200
  34 +++ fontconfig-2.11.1/src/Makefile.am   2014-07-04 22:37:05.362334747 +0200
  35 @@ -33,7 +33,6 @@
  36
  37  install-libtool-import-lib: libfontconfig.la
  38         $(MKDIR_P) $(DESTDIR)$(libdir)
  39 -       $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
  40         $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
  41
  42  uninstall-libtool-import-lib: