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 @@ -14073,7 +14073,7 @@
  33                 no)
  34                         ;;
  35                 *)
  36 -                       EXPAT_LIBS="-L$expat_lib -lexpat"
  37 +                       EXPAT_LIBS="-L$expat_lib -lascii_expat_xmlparse -lexpat_xmltok"
  38                         ;;
  39                 esac
  40
  41 --- misc/build/fontconfig-2.8.0/src/fcxml.c
  42 +++ misc/build/fontconfig-2.8.0/src/fcxml.c
  43 @@ -1123,6 +1123,7 @@
  44       * Have to swap the decimal point to match the current locale
  45       * if that locale doesn't use 0x2e
  46       */
  47 +#ifndef __ANDROID__
  48      if ((dot = strchr (s, 0x2e)) &&
  49         (locale_data = localeconv ()) &&
  50         (locale_data->decimal_point[0] != 0x2e ||
  51 @@ -1158,6 +1158,7 @@
  52         }
  53      }
  54      else
  55 +#endif
  56         v = strtod (s, end);
  57      return v;
  58  }