external/fontconfig/fontconfig-2.8.0.patch

   1 --- misc/build/fontconfig-2.8.0/config.sub
   2 +++ misc/build/fontconfig-2.8.0/config.sub
   3 @@ -120,7 +120,7 @@
   4  # Here we must recognize all the valid KERNEL-OS combinations.
   5  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   6  case $maybe_os in
   7 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   8 +  nto-qnx* | linux-android* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   9    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  10    storm-chaos* | os2-emx* | rtmk-nova*)
  11      os=-$maybe_os
  12 @@ -1272,7 +1272,7 @@
  13               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  14               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  15               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  16 -             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  17 +             | -udi* | -android* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  18               | -chorusos* | -chorusrdb* \
  19               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  20               | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  21 --- misc/build/fontconfig-2.8.0/configure
  22 +++ misc/build/fontconfig-2.8.0/configure
  23 @@ -8718,7 +8718,7 @@
  24         *Sun\ F*)                       # Sun Fortran 8.3
  25           tmp_sharedflag='-G' ;;
  26         esac
  27 -       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  28 +       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
  29
  30          if test "x$supports_anon_versioning" = xyes; then
  31            archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  32 --- misc/build/fontconfig-2.8.0/fontconfig/fontconfig.h
  33 +++ misc/build/fontconfig-2.8.0/fontconfig/fontconfig.h
  34 @@ -113,9 +113,9 @@
  35  #define FC_DECORATIVE      "decorative"        /* Bool - true if style is a decorative variant */
  36  #define FC_LCD_FILTER      "lcdfilter"         /* Int */
  37
  38 -#define FC_CACHE_SUFFIX                    ".cache-"FC_CACHE_VERSION
  39 -#define FC_DIR_CACHE_FILE          "fonts.cache-"FC_CACHE_VERSION
  40 -#define FC_USER_CACHE_FILE         ".fonts.cache-"FC_CACHE_VERSION
  41 +#define FC_CACHE_SUFFIX                    ".cache-" FC_CACHE_VERSION
  42 +#define FC_DIR_CACHE_FILE          "fonts.cache-" FC_CACHE_VERSION
  43 +#define FC_USER_CACHE_FILE         ".fonts.cache-" FC_CACHE_VERSION
  44
  45  /* Adjust outline rasterizer */
  46  #define FC_CHAR_WIDTH      "charwidth" /* Int */
  47 --- misc/build/fontconfig-2.8.0/src/fcxml.c
  48 +++ misc/build/fontconfig-2.8.0/src/fcxml.c
  49 @@ -1123,6 +1123,7 @@
  50       * Have to swap the decimal point to match the current locale
  51       * if that locale doesn't use 0x2e
  52       */
  53 +#ifndef __ANDROID__
  54      if ((dot = strchr (s, 0x2e)) &&
  55         (locale_data = localeconv ()) &&
  56         (locale_data->decimal_point[0] != 0x2e ||
  57 @@ -1158,6 +1158,7 @@
  58         }
  59      }
  60      else
  61 +#endif
  62         v = strtod (s, end);
  63      return v;
  64  }