diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-11 00:08:39 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-11 00:14:47 +0200 |
| commit | 75aacd87bbbddb860efb57f046c84e4f107a8839 (patch) | |
| tree | 673eb3300eecd81148cef2461ff5a853b75869ab /fontconfig/fontconfig-2.8.0.patch | |
| parent | 6a43a6c1fe56e5b63e5f330f87feada6479f8119 (diff) | |
Download and build FreeType and fontconfig for Android
It will probably be simplest to just use FreeType on Android,
too. (Android uses it itself, but doesn't provide its API publicly.)
Probably fontconfig, too, although there shouldn't be much
configuration per se that a LibreOffice-baed app would have to do at
run-time; it will have to bundle all fonts it is going to use anyway,
I think, so all font information is known a priori. But maybe in the
future there will be user-installable system fonts on Android, or
something.
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; + } |