4 files changed, 117 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;
+ }
diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
new file mode 100644
index 000000000000..55c561adc8a3
--- /dev/null
+++ b/fontconfig/makefile.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=fontconfig
+TARGET=fontconfig
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=fontconfig-2.8.0
+TARFILE_MD5=77e15a92006ddc2adbb06f840d591c0e
+
+PATCH_FILES=$(TARFILE_NAME).patch
+
+CONFIGURE_ACTION=./configure
+
+CONFIGURE_FLAGS=\
+    --disable-static \
+    --with-arch=arm \
+    --with-expat-includes=$(SOLARVER)/$(INPATH)/inc/external \
+    --with-expat-lib=$(SOLARVER)/$(INPATH)/lib \
+    --with-freetype-config=$(SOLARVER)/$(INPATH)/bin/freetype-config \
+    --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+
+BUILD_ACTION=$(GNUMAKE)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/fontconfig/prj/build.lst b/fontconfig/prj/build.lst
new file mode 100644
index 000000000000..635abf4aa11a
--- /dev/null
+++ b/fontconfig/prj/build.lst
@@ -0,0 +1,3 @@
+fc     libfontconfig      :       FREETYPE:freetype NULL
+fc     libfontconfig              usr1    -       u fc_mkout NULL
+fc     libfontconfig              nmake   -       u fc_libfontconfig NULL
diff --git a/fontconfig/prj/d.lst b/fontconfig/prj/d.lst
new file mode 100644
index 000000000000..1e2a4e17fdbb
--- /dev/null
+++ b/fontconfig/prj/d.lst
@@ -0,0 +1,4 @@
+..\%__SRC%\misc\build\fontconfig*\src\.libs\*.so %_DEST%\lib
+
+mkdir: %_DEST%\inc\external\fontconfig
+..\%__SRC%\misc\build\fontconfig*\fontconfig\*.h %_DEST%\inc\external\fontconfig