diff options
Diffstat (limited to 'fontconfig/fontconfig-2.8.0.patch')
-rw-r--r-- | fontconfig/fontconfig-2.8.0.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch new file mode 100644 index 000000000000..5b5cdcef5b68 --- /dev/null +++ b/fontconfig/fontconfig-2.8.0.patch @@ -0,0 +1,49 @@ +--- misc/build/fontconfig-2.8.0/config.sub ++++ misc/build/fontconfig-2.8.0/config.sub +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-androideabi* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +--- misc/build/fontconfig-2.8.0/configure ++++ misc/build/fontconfig-2.8.0/configure +@@ -14073,7 +14073,7 @@ + no) + ;; + *) +- EXPAT_LIBS="-L$expat_lib -lexpat" ++ EXPAT_LIBS="-L$expat_lib -lexpat_xmlparse -lexpat_xmltok" + ;; + esac + +--- misc/build/fontconfig-2.8.0/src/fcxml.c ++++ misc/build/fontconfig-2.8.0/src/fcxml.c +@@ -1123,6 +1123,7 @@ + * Have to swap the decimal point to match the current locale + * if that locale doesn't use 0x2e + */ ++#ifndef __ANDROID__ + if ((dot = strchr (s, 0x2e)) && + (locale_data = localeconv ()) && + (locale_data->decimal_point[0] != 0x2e || +@@ -1158,6 +1158,7 @@ + } + } + else ++#endif + v = strtod (s, end); + return v; + } |