Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions

Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk

15 files changed, 682 insertions, 438 deletions

diff --git a/cairo/cairo-1.10.2.android.patch b/cairo/cairo-1.10.2.android.patch
new file mode 100644
index 000000000000..e894063f0d92
--- /dev/null
+++ b/cairo/cairo-1.10.2.android.patch
@@ -0,0 +1,13 @@
+--- misc/cairo-1.10.2/build/ltmain.sh
++++ misc/build/cairo-1.10.2/build/ltmain.sh
+@@ -3228,6 +3228,10 @@
+ 	  func_warning "\`-release' is ignored for convenience libraries"
+       else
+ 
++	# Force no versioning suffix for Android
++
++	version_type=none
++
+ 	# Parse the version information argument.
+ 	save_ifs="$IFS"; IFS=':'
+ 	set dummy $vinfo 0 0 0
diff --git a/cairo/cairo-1.10.2.configure_ac.patch b/cairo/cairo-1.10.2.configure_ac.patch
new file mode 100644
index 000000000000..1305206a6f5b
--- /dev/null
+++ b/cairo/cairo-1.10.2.configure_ac.patch
@@ -0,0 +1,70 @@
+--- misc/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
++++ misc/build/cairo-1.10.2/configure.ac	2010-12-13 17:30:14.000000000 +0100
+@@ -33,13 +33,8 @@
+ 
+ dnl ===========================================================================
+ 
+-AC_CHECK_LIB(z, compress,
+-	 [AC_CHECK_HEADER(zlib.h, [
+ 	  have_libz=yes
+ 	  AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
+-	 ],
+-	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])],
+-	 [have_libz="no (requires zlib http://www.gzip.org/zlib/)"])
+
+ AC_CHECK_LIB(dl, dlsym,
+ 	     [have_dlsym=yes; have_dl=yes],
+@@ -279,7 +271,7 @@
+   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng libpng14 libpng12 libpng13 libpng10; do
++    for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes
+@@ -455,7 +455,7 @@
+ 	AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION],
+ 			   [AC_MSG_RESULT($FREETYPE_VERSION - OK)
+ 			   ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`],
++			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'`],
+ 			   [AC_MSG_RESULT($FREETYPE_VERSION - Too old)
+ 			   use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"])
+       fi
+@@ -462,7 +462,7 @@
+     fi
+ 
+   ft_CFLAGS="$FREETYPE_CFLAGS"
+-  ft_LIBS="$FREETYPE_LIBS"
++  ft_LIBS=`echo "$FREETYPE_LIBS" | $SED -e 's/-lz//g'`
+ ])
+ 
+ FONTCONFIG_MIN_VERSION=2.2.95
+@@ -505,7 +505,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [
+     # The ps backend requires zlib.
+     use_ps=$have_libz
+-    ps_NONPKGCONFIG_LIBS=-lz
++    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+ 
+ dnl ===========================================================================
+@@ -542,7 +542,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [
+     # The pdf backend requires zlib.
+     use_pdf=$have_libz
+-    pdf_NONPKGCONFIG_LIBS=-lz
++    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+ 
+ dnl ===========================================================================
+@@ -623,7 +623,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no)
+ CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [
+     use_xml=$have_libz
+-    xml_NONPKGCONFIG_LIBS=-lz
++    xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+ 
+ dnl ===========================================================================
diff --git a/cairo/cairo-1.10.2.ios.patch b/cairo/cairo-1.10.2.ios.patch
new file mode 100644
index 000000000000..c61faf333f0c
--- /dev/null
+++ b/cairo/cairo-1.10.2.ios.patch
@@ -0,0 +1,27 @@
+--- misc/cairo-1.10.2/configure	2011-12-16 10:02:39.626077757 +0100
++++ misc/build/cairo-1.10.2/configure	2011-12-16 10:02:23.518237109 +0100
+@@ -22766,11 +22766,13 @@
+ 
+ 
+     ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default"
++if false; then
+ if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = x""yes; then :
+ 
+ else
+   use_quartz="no (requires ApplicationServices framework)"
+ fi
++fi
+ 
+ 
+   if test "x$use_quartz" != "xyes" ; then
+--- misc/cairo-1.10.2/src/cairo-quartz.h	2011-12-16 10:02:39.639079241 +0100
++++ misc/build/cairo-1.10.2/src/cairo-quartz.h	2011-12-16 10:01:18.404789245 +0100
+@@ -40,7 +40,7 @@
+ 
+ #if CAIRO_HAS_QUARTZ_SURFACE
+ 
+-#include <ApplicationServices/ApplicationServices.h>
++#include <CoreGraphics/CoreGraphics.h>
+ 
+ CAIRO_BEGIN_DECLS
+ 
diff --git a/cairo/cairo-1.10.2.no-atsui.patch b/cairo/cairo-1.10.2.no-atsui.patch
new file mode 100644
index 000000000000..51b98afa59b9
--- /dev/null
+++ b/cairo/cairo-1.10.2.no-atsui.patch
@@ -0,0 +1,22 @@
+--- misc/cairo-1.10.2/src/cairo-quartz-font.c	2010-12-25 15:21:34.000000000 +0100
++++ misc/build/cairo-1.10.2/src/cairo-quartz-font.c	2011-12-16 09:54:18.672445207 +0100
+@@ -777,7 +777,7 @@
+     return ffont->cgFont;
+ }
+ 
+-#ifndef __LP64__
++#if 0
+ /*
+  * compat with old ATSUI backend
+  */
+--- misc/cairo-1.10.2/src/cairo-quartz.h	2010-06-18 13:47:13.000000000 +0200
++++ misc/build/cairo-1.10.2/src/cairo-quartz.h	2011-12-16 09:52:53.081501547 +0100
+@@ -66,7 +66,7 @@
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+ 
+-#ifndef __LP64__
++#if 0
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
+ #endif
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
new file mode 100644
index 000000000000..d13c1e4e135e
--- /dev/null
+++ b/cairo/cairo-1.10.2.patch
@@ -0,0 +1,269 @@
+--- misc/cairo-1.10.2/build/Makefile.win32.features	2010-08-18 09:47:30.000000000 +0200
++++ misc/build/cairo-1.10.2/build/Makefile.win32.features	2011-12-20 09:57:06.428170146 +0100
+@@ -30,7 +30,7 @@
+ CAIRO_HAS_FC_FONT=0
+ CAIRO_HAS_PS_SURFACE=1
+ CAIRO_HAS_PDF_SURFACE=1
+-CAIRO_HAS_SVG_SURFACE=1
++CAIRO_HAS_SVG_SURFACE=0
+ CAIRO_HAS_TEST_SURFACES=0
+ CAIRO_HAS_TEE_SURFACE=0
+ CAIRO_HAS_XML_SURFACE=0
+--- misc/cairo-1.10.2/build/Makefile.win32.common	2009-06-14 23:53:24.000000000 +0200
++++ misc/build/cairo-1.10.2/build/Makefile.win32.common	2009-06-14 23:53:24.000000000 +0200
+@@ -22,24 +22,26 @@
+ OPT := -MD -O2
+ endif
+ 
+-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
+-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
++PIXMAN_CFLAGS :=  -I../../../../inc
++PIXMAN_LIBS := ../../../../lib/pixman-1.lib
+ 
+ CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
+ ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
+ LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/
+-CAIRO_LIBS +=  $(top_builddir)/../libpng/libpng.lib
++CAIRO_LIBS += libpng.lib
+ endif
+ ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
+ else
+ ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/
+-CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib
++CAIRO_LIBS += $(ZLIB3RDLIB)
+ endif
+ 
+ DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT)
+ DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+ DEFAULT_CFLAGS += -I. -I$(top_srcdir)
+ DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
++DEFAULT_CFLAGS += $(SOLARINC)
++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX -DDISABLE_SOME_FLOATING_POINT=1
+ 
+ CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
+ 
+@@ -61,7 +63,7 @@
+ 
+ $(CFG)/%.obj: %.c
+ 	@mkdir -p $(CFG)
+-	@$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
++	$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
+ 
+ $(CFG)/%-static.obj: %.c
+ 	@mkdir -p $(CFG)
+--- misc/cairo-1.10.2/build/config.sub	2009-08-14 23:33:32.000000000 +0200
++++ misc/build/cairo-1.10.2/build/config.sub	2009-08-14 23:33:32.000000000 +0200
+@@ -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-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -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* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/cairo-1.10.2/configure	2010-12-25 15:22:57.000000000 +0100
++++ misc/build/cairo-1.10.2/configure	2010-12-25 15:22:57.000000000 +0100
+@@ -19259,61 +19259,11 @@
+ rm -f confcache
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
+-$as_echo_n "checking for compress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lz  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char compress ();
+-int
+-main ()
+-{
+-return compress ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_z_compress=yes
+-else
+-  ac_cv_lib_z_compress=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
+-$as_echo "$ac_cv_lib_z_compress" >&6; }
+-if test "x$ac_cv_lib_z_compress" = x""yes; then :
+-  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+-
+ 	  have_libz=yes
+ 
+ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
+ 
+ 
+-else
+-  have_libz="no (requires zlib http://www.gzip.org/zlib/)"
+-fi
+-
+-
+-else
+-  have_libz="no (requires zlib http://www.gzip.org/zlib/)"
+-fi
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
+ $as_echo_n "checking for dlsym in -ldl... " >&6; }
+ if test "${ac_cv_lib_dl_dlsym+set}" = set; then :
+@@ -26427,7 +26367,7 @@
+ 
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng libpng14 libpng12 libpng13 libpng10; do
++    for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes
+@@ -29424,7 +29424,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - OK" >&5
+ $as_echo "$FREETYPE_VERSION - OK" >&6; }
+ 			   ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`
++			   ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'`
+     else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - Too old" >&5
+ $as_echo "$FREETYPE_VERSION - Too old" >&6; }
+ 			   use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"
+@@ -29434,7 +29434,7 @@
+     fi
+ 
+   ft_CFLAGS="$FREETYPE_CFLAGS"
+-  ft_LIBS="$FREETYPE_LIBS"
++  ft_LIBS=`echo "$FREETYPE_LIBS" | $SED -e 's/-lz//g'`
+ 
+ 			cairo_cv_ft_use=$use_ft
+ 			cairo_cv_ft_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
+@@ -30121,7 +30121,7 @@
+ 
+     # The ps backend requires zlib.
+     use_ps=$have_libz
+-    ps_NONPKGCONFIG_LIBS=-lz
++    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			cairo_cv_ps_use=$use_ps
+ 			cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
+@@ -30549,7 +30549,7 @@
+ 
+     # The pdf backend requires zlib.
+     use_pdf=$have_libz
+-    pdf_NONPKGCONFIG_LIBS=-lz
++    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			cairo_cv_pdf_use=$use_pdf
+ 			cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
+@@ -32296,7 +32296,7 @@
+ 
+ 
+     use_xml=$have_libz
+-    xml_NONPKGCONFIG_LIBS=-lz
++    xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			cairo_cv_xml_use=$use_xml
+ 			cairo_cv_xml_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
+--- misc/cairo-1.10.2/src/cairo-deflate-stream.c	2010-06-18 13:47:12.000000000 +0200
++++ misc/build/cairo-1.10.2/src/cairo-deflate-stream.c	2010-06-18 13:47:12.000000000 +0200
+@@ -37,7 +37,11 @@
+ #include "cairoint.h"
+ #include "cairo-error-private.h"
+ #include "cairo-output-stream-private.h"
++#ifdef ZLIB_FIX
++#include <zlib/zlib.h>
++#else
+ #include <zlib.h>
++#endif
+ 
+ #define BUFFER_SIZE 16384
+ 
+--- misc/cairo-1.10.2/src/cairo-output-stream.c	2010-07-12 10:57:03.000000000 +0200
++++ misc/build/cairo-1.10.2/src/cairo-output-stream.c	2010-07-12 10:57:03.000000000 +0200
+@@ -313,7 +313,11 @@
+ 	d = 0.0;
+ 
+     locale_data = localeconv ();
++#ifdef __ANDROID__
++    decimal_point = ".";
++#else
+     decimal_point = locale_data->decimal_point;
++#endif
+     decimal_point_len = strlen (decimal_point);
+ 
+     assert (decimal_point_len != 0);
+--- misc/cairo-1.10.2/src/cairo-pdf-surface.c	2010-12-25 15:21:34.000000000 +0100
++++ misc/build/cairo-1.10.2/src/cairo-pdf-surface.c	2010-12-25 15:21:34.000000000 +0100
+@@ -57,7 +57,11 @@
+ #include "cairo-type3-glyph-surface-private.h"
+ 
+ #include <time.h>
++#ifdef ZLIB_FIX
++#include <zlib/zlib.h>
++#else
+ #include <zlib.h>
++#endif
+ 
+ /* Issues:
+  *
+--- misc/cairo-1.10.2/src/cairo-ps-surface.c	2010-12-25 15:21:34.000000000 +0100
++++ misc/build/cairo-1.10.2/src/cairo-ps-surface.c	2010-12-25 15:21:34.000000000 +0100
+@@ -72,7 +72,11 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <time.h>
++#ifdef ZLIB_FIX
++#include <zlib/zlib.h>
++#else
+ #include <zlib.h>
++#endif
+ #include <errno.h>
+ 
+ #define DEBUG_PS 0
+--- misc/cairo-1.10.2/src/cairo-ft-font.c	2010-12-25 15:21:34.000000000 +0100
++++ misc/build/cairo-1.10.2/src/cairo-ft-font.c	2010-12-25 15:21:34.000000000 +0100
+@@ -534,16 +534,16 @@
+     ret = FcPatternGetFTFace (pattern, FC_FT_FACE, 0, &font_face);
+     if (ret == FcResultMatch)
+ 	goto DONE;
+-    if (ret == FcResultOutOfMemory)
++    if (ret == 4 /*FcResultOutOfMemory*/)
+ 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ 
+     ret = FcPatternGetString (pattern, FC_FILE, 0, (FcChar8 **) &filename);
+-    if (ret == FcResultOutOfMemory)
++    if (ret == 4 /*FcResultOutOfMemory*/)
+ 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+     if (ret == FcResultMatch) {
+ 	/* If FC_INDEX is not set, we just use 0 */
+ 	ret = FcPatternGetInteger (pattern, FC_INDEX, 0, &id);
+-	if (ret == FcResultOutOfMemory)
++	if (ret == 4 /*FcResultOutOfMemory*/)
+ 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ 
+ 	goto DONE;
diff --git a/cairo/cairo-1.10.2.wntmsc.patch b/cairo/cairo-1.10.2.wntmsc.patch
new file mode 100644
index 000000000000..1aa882a03163
--- /dev/null
+++ b/cairo/cairo-1.10.2.wntmsc.patch
@@ -0,0 +1,56 @@
+--- misc/cairo-1.10.2/src/Makefile.sources	2010-12-25 07:21:34.000000000 -0700
++++ misc/build/cairo-1.10.2/src/Makefile.sources	2011-12-16 08:44:19.209301900 -0700
+@@ -214,7 +214,7 @@
+ cairo_pdf_headers = cairo-pdf.h
+ cairo_pdf_private = cairo-pdf-surface-private.h
+ cairo_pdf_sources = cairo-pdf-surface.c
+-if CAIRO_HAS_PDF_SURFACE
++ifeq ($(CAIRO_HAS_PDF_SURFACE),1)
+ req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
+ endif
+ 
+@@ -248,7 +248,7 @@
+ 	cairo-xlib-surface-private.h \
+ 	cairo-xlib-xrender-private.h \
+ 	$(NULL)
+-if BUILD_XLIB_XCB
++ifeq ($(BUILD_XLIB_XCB),1)
+ cairo_xlib_sources = cairo-xlib-xcb-surface.c
+ else
+ cairo_xlib_sources = \
+@@ -273,7 +273,7 @@
+ 		    cairo-xcb-surface-core.c \
+ 		    cairo-xcb-surface-render.c \
+ 		    $(NULL)
+-if BUILD_XCB_SHM
++ifeq ($(BUILD_XCB_SHM),1)
+ cairo_xcb_sources += \
+ 		    cairo-xcb-shm.c \
+ 		    cairo-xcb-connection-shm.c \
+@@ -322,7 +322,7 @@
+ 		   cairo-gl-gradient.c \
+ 		   cairo-gl-shaders.c \
+ 		   cairo-gl-surface.c
+-if BUILD_PRIVATE_GLEW
++ifeq ($(BUILD_PRIVATE_GLEW),1)
+ cairo_gl_sources += glew/glew.c
+ endif
+ 
+@@ -373,7 +373,7 @@
+ 
+ cairo_script_headers = cairo-script.h
+ cairo_script_sources = cairo-script-surface.c
+-if CAIRO_HAS_SCRIPT_SURFACE
++ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1)
+ req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
+ endif
+ 
+@@ -383,7 +383,7 @@
+ 
+ cairo_xml_headers = cairo-xml.h
+ cairo_xml_sources = cairo-xml-surface.c
+-if CAIRO_HAS_XML_SURFACE
++ifeq ($(CAIRO_HAS_XML_SURFACE),1)
+ req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources)
+ endif
+ 
diff --git a/cairo/cairo-1.8.0.ios.patch b/cairo/cairo-1.8.0.ios.patch
deleted file mode 100644
index 3a679c540dd1..000000000000
--- a/cairo/cairo-1.8.0.ios.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
-+++ misc/build/cairo-1.8.0/src/cairo-quartz.h
-@@ -40,7 +40,7 @@
- 
- #if CAIRO_HAS_QUARTZ_SURFACE
- 
--#include <ApplicationServices/ApplicationServices.h>
-+#include <CoreGraphics/CoreGraphics.h>
- 
- CAIRO_BEGIN_DECLS
- 
---- misc/build/cairo-1.8.0.org/src/cairo-quartz-surface.c
-+++ misc/build/cairo-1.8.0/src/cairo-quartz-surface.c
-@@ -152,10 +152,6 @@
-     CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
-     CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
- 
--    if (Gestalt(gestaltSystemVersion, &_cairo_quartz_osx_version) != noErr) {
--	// assume 10.4
--	_cairo_quartz_osx_version = 0x1040;
--    }
- 
-     _cairo_quartz_symbol_lookup_done = TRUE;
- }
-@@ -2093,7 +2093,10 @@
- 	yprev = yf;
-     }
- 
--    if (_cairo_quartz_osx_version >= 0x1050 && isClipping) {
-+    if (0) {
-+	/* Assume the bug mentioned below is not present in iOS,
-+	 * until proven otherwise.
-+	 */
- 	/* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a
- 	 * bug (apple bug ID #5834794) where the glyph
- 	 * advances/positions are not transformed by the text matrix
---- misc/build/cairo-1.8.0.org/configure
-+++ misc/build/cairo-1.8.0/configure
-@@ -29309,6 +29309,7 @@
- quartz_NONPKGCONFIG_LIBS="$ac_env_quartz_NONPKGCONFIG_LIBS_value"
- 
- 
-+if false; then
-     if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5
- echo $ECHO_N "checking for ApplicationServices/ApplicationServices.h... $ECHO_C" >&6; }
-@@ -29444,6 +29444,7 @@
- else
-   use_quartz="no (requires ApplicationServices framework)"
- fi
-+fi
- 
-   if test "x$use_quartz" != "xyes" ; then
-         if test "${ac_cv_header_CoreGraphics_CoreGraphics_h+set}" = set; then
diff --git a/cairo/cairo-1.8.0.no-atsui.patch b/cairo/cairo-1.8.0.no-atsui.patch
deleted file mode 100644
index c4fd9614df8f..000000000000
--- a/cairo/cairo-1.8.0.no-atsui.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
-+++ misc/build/cairo-1.8.0/src/cairo-quartz.h
-@@ -66,8 +66,12 @@
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
- 
-+#if 0
-+
- cairo_public cairo_font_face_t *
- cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
-+
-+#endif /* 0 */
- 
- #endif /* CAIRO_HAS_QUARTZ_FONT */
- 
---- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
-+++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c
-@@ -766,6 +766,8 @@
- }
- 
- 
-+#if 0
-+
- /*
-  * compat with old ATSUI backend
-  */
-@@ -808,3 +808,5 @@
- {
-     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
- }
-+
-+#endif /* 0 */
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
deleted file mode 100644
index 0ada5a469ce5..000000000000
--- a/cairo/cairo-1.8.0.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo-1.8.0/build/Makefile.win32.common
---- misc/build/cairo-1.8.0.org/build/Makefile.win32.common	2008-09-25 14:36:35.000000000 +0300
-+++ misc/build/cairo-1.8.0/build/Makefile.win32.common	2008-11-14 22:20:08.000000000 +0200
-@@ -18,8 +18,8 @@
- OPT := -O2
- endif
- 
--PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
--PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
-+PIXMAN_CFLAGS :=  -I../../../../inc
-+PIXMAN_LIBS := ../../../../lib/pixman-1.lib
- 
- CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
- ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
-@@ -27,13 +27,15 @@
- endif
- ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
- else
--CAIRO_LIBS += zdll.lib
-+CAIRO_LIBS += zlib.lib
- endif
- 
- DEFAULT_CFLAGS = -MD -nologo $(OPT)
- DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
- DEFAULT_CFLAGS += -I. -I$(top_srcdir)
- DEFAULT_CFLAGS += $(PIXMAN_CFLAGS)
-+DEFAULT_CFLAGS += $(SOLARINC)
-+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX
- 
- CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
- 
-@@ -55,7 +57,7 @@
- 
- $(CFG)/%.obj: %.c
- 	@mkdir -p $(CFG)
--	@$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
-+	$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
- 
- $(CFG)/%-static.obj: %.c
- 	@mkdir -p $(CFG)
-diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cairo-1.8.0/build/Makefile.win32.features
---- misc/build/cairo-1.8.0.org/build/Makefile.win32.features	2008-09-25 02:15:49.000000000 +0300
-+++ misc/build/cairo-1.8.0/build/Makefile.win32.features	2008-11-04 22:19:52.000000000 +0200
-@@ -10,11 +10,11 @@
- CAIRO_HAS_WIN32_FONT=1
- CAIRO_HAS_OS2_SURFACE=0
- CAIRO_HAS_BEOS_SURFACE=0
--CAIRO_HAS_PNG_FUNCTIONS=1
-+CAIRO_HAS_PNG_FUNCTIONS=1
- CAIRO_HAS_GLITZ_SURFACE=0
- CAIRO_HAS_DIRECTFB_SURFACE=0
- CAIRO_HAS_FT_FONT=0
- CAIRO_HAS_PS_SURFACE=1
- CAIRO_HAS_PDF_SURFACE=1
--CAIRO_HAS_SVG_SURFACE=1
-+CAIRO_HAS_SVG_SURFACE=0
- CAIRO_HAS_TEST_SURFACES=0
---- misc/build/cairo-1.8.0.org/build/config.sub
-+++ misc/build/cairo-1.8.0/build/config.sub
-@@ -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* \
-diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
---- misc/build/cairo-1.8.0.org/configure	2008-09-26 01:57:30.000000000 +0300
-+++ misc/build/cairo-1.8.0/configure	2008-11-04 22:21:26.000000000 +0200
-@@ -4397,7 +4397,7 @@
- 
- cygwin*)
-   # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
-@@ -4406,7 +4406,7 @@
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
-   if ( file / ) >/dev/null 2>&1; then
--    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
-     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-@@ -25304,19 +25304,39 @@
- rm -f confcache
- 
- 
--{ echo "$as_me:$LINENO: checking for compress in -lz" >&5
--echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; }
--if test "${ac_cv_lib_z_compress+set}" = set; then
-+save_libs="$LIBS"
-+LIBS="$LIBS $ZLIB3RDLIB"
-+
-+for ac_func in $COMPRESS
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lz  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
-+  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -25324,11 +25344,18 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char compress ();
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
- int
- main ()
- {
--return compress ();
-+return $ac_func ();
-   ;
-   return 0;
- }
-@@ -25351,22 +25378,25 @@
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--  ac_cv_lib_z_compress=yes
-+  eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_z_compress=no
-+	eval "$as_ac_var=no"
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
--echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; }
--if test $ac_cv_lib_z_compress = yes; then
--  if test "${ac_cv_header_zlib_h+set}" = set; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ if test "${ac_cv_header_zlib_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for zlib.h" >&5
- echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
-@@ -25506,7 +25536,9 @@
- else
-   have_libz="no (requires zlib http://www.gzip.org/zlib/)"
- fi
-+done
- 
-+LIBS="$save_libs"
- 
- 
- { echo "$as_me:$LINENO: checking for X" >&5
-@@ -31723,7 +31723,7 @@
- 
-   if test "x$png_REQUIRES" = x; then
-     # libpng13 is GnuWin32's libpng-1.2.8 :-(
--    for l in libpng12 libpng13 libpng10 ; do
-+    for l in libpng12 libpng13 libpng14 libpng15 libpng10 ; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes
-@@ -34097,7 +34129,7 @@
- 
-     # The ps backend requires zlib.
-     use_ps=$have_libz
--    ps_NONPKGCONFIG_LIBS=-lz
-+    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- 
- 			cairo_cv_ps_use=$use_ps
- 			cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
-@@ -34444,7 +34476,7 @@
- 
-     # The pdf backend requires zlib.
-     use_pdf=$have_libz
--    pdf_NONPKGCONFIG_LIBS=-lz
-+    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- 
- 			cairo_cv_pdf_use=$use_pdf
- 			cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
-diff -ur misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c misc/build/cairo-1.8.0/src/cairo-deflate-stream.c
---- misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c	2008-09-25 13:03:43.000000000 +0300
-+++ misc/build/cairo-1.8.0/src/cairo-deflate-stream.c	2008-11-14 22:21:00.000000000 +0200
-@@ -36,7 +36,11 @@
- 
- #include "cairoint.h"
- #include "cairo-output-stream-private.h"
-+#ifdef ZLIB_FIX
-+#include <zlib/zlib.h>
-+#else
- #include <zlib.h>
-+#endif
- 
- #define BUFFER_SIZE 16384
- 
-diff -ur misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c misc/build/cairo-1.8.0/src/cairo-pdf-surface.c
---- misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c	2008-09-25 14:36:35.000000000 +0300
-+++ misc/build/cairo-1.8.0/src/cairo-pdf-surface.c	2008-11-14 22:20:41.000000000 +0200
-@@ -51,7 +51,11 @@
- #include "cairo-type3-glyph-surface-private.h"
- 
- #include <time.h>
-+#ifdef ZLIB_FIX
-+#include <zlib/zlib.h>
-+#else
- #include <zlib.h>
-+#endif
- 
- /* Issues:
-  *
-diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.0/src/cairo-ps-surface.c
---- misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c	2008-09-25 14:36:35.000000000 +0300
-+++ misc/build/cairo-1.8.0/src/cairo-ps-surface.c	2008-11-14 22:21:33.000000000 +0200
-@@ -67,7 +67,11 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <time.h>
-+#ifdef ZLIB_FIX
-+#include <zlib/zlib.h>
-+#else
- #include <zlib.h>
-+#endif
- #include <errno.h>
- 
- #define DEBUG_PS 0
---- misc/build/cairo-1.8.0.org/src/cairo-output-stream.c
-+++ misc/build/cairo-1.8.0/src/cairo-output-stream.c
-@@ -281,7 +281,11 @@
- 	d = 0.0;
- 
-     locale_data = localeconv ();
-+#ifdef __ANDROID__
-+    decimal_point = ".";
-+#else
-     decimal_point = locale_data->decimal_point;
-+#endif
-     decimal_point_len = strlen (decimal_point);
- 
-     assert (decimal_point_len != 0);
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 1eccae55898b..7f84e3dedda2 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -35,27 +35,35 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF "$(SYSTEM_CAIRO)" == "YES" || "$(GUIBASE)" == "android"
+.IF "$(SYSTEM_CAIRO)" == "YES"
 all:
     @echo "Not building cairo."
 .ENDIF
 
 # --- Files --------------------------------------------------------
 
-CAIROVERSION=1.8.0
+CAIROVERSION=1.10.2
 
 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
-TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47
+TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
 
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
+.IF "$(OS)$(COM)" == "WNTMSC"
+PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
+.ENDIF
+
 .IF "$(OS)" == "IOS"
 PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
 PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch
 .ENDIF
 
+.IF "$(OS)" == "ANDROID"
+PATCH_FILES+=..$/$(TARFILE_NAME).android.patch
+.ENDIF
+
 cairo_CFLAGS=$(SOLARINC)
-cairo_LDFLAGS=$(SOLARLIB)
+cairo_LDFLAGS=-L$(SOLARVER)$/$(INPATH)$/lib
 
 cairo_CPPFLAGS=
 
@@ -83,16 +91,16 @@ cairo_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
-CONFIGURE_FLAGS=--disable-xlib --disable-ft --disable-pthread --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CC="$(cairo_CC)" LIBS="$(cairo_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--disable-valgrind --disable-xlib --disable-ft --disable-pthread --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CC="$(cairo_CC)" LIBS="$(cairo_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 .IF "$(GUI)$(COM)"=="WNTGCC"
 .EXPORT : PWD
 .ENDIF
 
 .ELSE   # WNT, not GCC
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=$(ZLIB3RDLIB)
 BUILD_DIR=
 .ENDIF
 
@@ -111,7 +119,7 @@ CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/con
 .IF $(MAC_OS_X_VERSION_MIN_REQUIRED) >= 1070
 PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
 .ENDIF
-CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+CONFIGURE_FLAGS=--enable-static=no --disable-valgrind --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
@@ -119,7 +127,7 @@ cairo_CPPFLAGS+=$(EXTRA_CDEFS)
 cairo_LDFLAGS+=$(EXTRA_LINKFLAGS)
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 
 OUT2INC+=src$/cairo-quartz.h
 
@@ -159,17 +167,33 @@ CONFIGURE_ACTION=.$/configure
 .ENDIF
 
 .IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared --disable-xlib --enable-quartz --enable-quartz-font
+CONFIGURE_FLAGS=--disable-shared
 .ELSE
-CONFIGURE_FLAGS=--disable-static --enable-xlib
+CONFIGURE_FLAGS=--disable-static
 .ENDIF
 
 .IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-CONFIGURE_FLAGS+=--disable-ft PKG_CONFIG=./dummy_pkg_config
+CONFIGURE_FLAGS+=--disable-xlib
+.ELSE
+CONFIGURE_FLAGS+=--enable-xlib
+.ENDIF
+
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS+=--enable-quartz --enable-quartz-font
+.ENDIF
+
+CONFIGURE_FLAGS+=--disable-valgrind
+
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS+=--disable-ft
 .ELSE
 CONFIGURE_FLAGS+=--enable-ft
 .ENDIF
 
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+CONFIGURE_FLAGS+=PKG_CONFIG=./dummy_pkg_config
+.ENDIF
+
 CONFIGURE_FLAGS+=--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
 
 .IF "$(CROSS_COMPILING)"=="YES"
@@ -178,7 +202,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=$(CONFIGURE_DIR)$/src
 
 .IF "$(OS)" == "IOS"
 OUT2INC+=src$/cairo-quartz.h
@@ -233,7 +257,7 @@ OUT2BIN+=src$/.libs$/*.dll
 OUT2LIB+=src$/release$/*.lib
 OUT2BIN+=src$/release$/*.dll
 .ENDIF
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+.ELIF "$(OS)"=="IOS"
 OUT2LIB+=src$/.libs$/libcairo*.a
 .ELSE
 OUT2LIB+=src$/.libs$/libcairo.so*
diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch
deleted file mode 100644
index 8694a8778ec1..000000000000
--- a/cairo/pixman-0.12.0.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- misc/build/pixman-0.12.0/config.sub
-+++ misc/build/pixman-0.12.0/config.sub
-@@ -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/pixman-0.12.0/configure.orig	2008-09-17 20:14:40.000000000 +0300
-+++ misc/build/pixman-0.12.0/configure	2008-11-08 21:17:00.000000000 +0200
-@@ -19740,6 +19740,13 @@
- 
- 
- 
-+# getisax is falsely detected when using OOo build script on Linux/FBSD...
-+case "$build_os" in
-+     linux-gnu*)
-+	;;
-+     freebsd*)
-+	;;
-+     *)
- 
- for ac_func in getisax
- do
-@@ -19834,6 +19841,8 @@
- fi
- done
- 
-+	;;
-+esac
- { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
---- misc/pixman-0.12.0/Makefile.in	2008-09-17 19:14:38.000000000 +0200
-+++ misc/build/pixman-0.12.0/Makefile.in	2010-09-28 14:27:47.000000000 +0200
-@@ -203,7 +203,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- GPGKEY = 6FF7C1A8
diff --git a/cairo/pixman-0.24.0.android.patch b/cairo/pixman-0.24.0.android.patch
new file mode 100644
index 000000000000..f9a52f02c4d1
--- /dev/null
+++ b/cairo/pixman-0.24.0.android.patch
@@ -0,0 +1,13 @@
+--- misc/pixman-0.24.0/ltmain.sh
++++ misc/build/pixman-0.24.0/ltmain.sh
+@@ -3228,6 +3228,10 @@
+ 	fi
+       else
+ 
++	# Force no versioning suffix for Android
++
++	version_type=none
++
+ 	# Parse the version information argument.
+ 	save_ifs="$IFS"; IFS=':'
+ 	set dummy $vinfo 0 0 0
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
new file mode 100644
index 000000000000..39122cde00eb
--- /dev/null
+++ b/cairo/pixman-0.24.0.patch
@@ -0,0 +1,145 @@
+--- misc/pixman-0.24.0/Makefile.win32.common	2011-12-16 15:30:44.653987145 +0100
++++ misc/build/pixman-0.24.0/Makefile.win32.common	2011-12-16 15:30:37.288130250 +0100
+@@ -1 +1,54 @@
+-dummy
++LIBRARY = pixman-1
++
++CC = cl
++LD = link
++AR = lib
++PERL = perl
++
++ifeq ($(top_builddir),)
++top_builddir = $(top_srcdir)
++endif
++
++CFG_VAR = $(CFG)
++ifeq ($(CFG_VAR),)
++CFG_VAR = release
++endif
++
++ifeq ($(CFG_VAR),debug)
++CFG_CFLAGS  = -MD -Od -Zi
++CFG_LDFLAGS = -DEBUG
++else
++CFG_CFLAGS  = -MD -O2
++CFG_LDFLAGS =
++endif
++
++# Package definitions, to be used instead of those provided in config.h
++PKG_CFLAGS  = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
++
++BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
++
++PIXMAN_CFLAGS  = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
++PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
++PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
++
++
++inform:
++ifneq ($(CFG),release)
++ifneq ($(CFG),debug)
++ifneq ($(CFG),)
++	@echo "Invalid specified configuration option: "$(CFG)"."
++	@echo
++	@echo "Possible choices for configuration are 'release' and 'debug'"
++	@exit 1
++endif
++	@echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
++endif
++endif
++
++
++$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
++	@mkdir -p $(CFG_VAR)
++	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
++
++clean: inform
++	@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
+--- misc/pixman-0.24.0/Makefile.in	2011-11-06 22:11:25.000000000 +0100
++++ misc/build/pixman-0.24.0/Makefile.in	2011-12-16 09:06:45.317211035 +0100
+@@ -272,7 +272,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pixman demos test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ GPGKEY = 6FF7C1A8
+--- misc/pixman-0.24.0/config.sub	2008-08-30 00:27:25.000000000 +0200
++++ misc/build/pixman-0.24.0/config.sub	2011-12-16 09:05:14.595773609 +0100
+@@ -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-gnu* | linux-android* | 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
+@@ -1247,7 +1247,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* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/pixman-0.24.0/configure	2011-11-06 22:11:27.000000000 +0100
++++ misc/build/pixman-0.24.0/configure	2011-12-16 09:06:16.482898083 +0100
+@@ -20202,6 +20202,13 @@
+ 
+ 
+ 
++# getisax is falsely detected when using OOo build script on Linux/FBSD...
++case "$build_os" in
++     linux-gnu*)
++	;;
++     freebsd*)
++	;;
++     *)
+ 
+ for ac_func in getisax
+ do
+@@ -20304,6 +20311,8 @@
+ done
+ 
+ 
++	;;
++esac
+  { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+--- misc/pixman-0.24.0/pixman/pixman-utils.c
++++ misc/build/pixman-0.24.0/pixman/pixman-utils.c
+@@ -27,6 +27,7 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ 
+ #include "pixman-private.h"
+ 
+--- misc/pixman-0.24.0/pixman/pixman-mmx.c	2011-11-06 13:47:42.000000000 -0700
++++ misc/build/pixman-0.24.0/pixman/pixman-mmx.c	2011-12-19 00:41:42.280402800 -0700
+@@ -309,7 +309,7 @@
+ 
+ /* Elemental unaligned loads */
+ 
+-static __inline__ __m64 ldq_u(uint64_t *p)
++static inline __m64 ldq_u(uint64_t *p)
+ {
+ #ifdef USE_X86_MMX
+     /* x86's alignment restrictions are very relaxed. */
+@@ -328,7 +328,7 @@
+ #endif
+ }
+ 
+-static __inline__ uint32_t ldl_u(uint32_t *p)
++static inline uint32_t ldl_u(uint32_t *p)
+ {
+ #ifdef USE_X86_MMX
+     /* x86's alignment restrictions are very relaxed. */
+
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 58fcda2803bd..44ea09bdc137 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -35,7 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF "$(SYSTEM_CAIRO)" == "YES" || "$(GUIBASE)" == "android"
+.IF "$(SYSTEM_CAIRO)" == "YES"
 all:
     @echo "Not building pixman."
 
@@ -43,13 +43,19 @@ all:
 
 # --- Files --------------------------------------------------------
 
-PIXMANVERSION=0.12.0
+PIXMANVERSION=0.24.0
 
 TARFILE_NAME=pixman-$(PIXMANVERSION)
-TARFILE_MD5=09357cc74975b01714e00c5899ea1881
+TARFILE_MD5=db5ffcd50064421176e8afb7b85fd1a7
+
+ADDITIONAL_FILES=Makefile.win32.common
 
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
+.IF "$(OS)"=="ANDROID"
+PATCH_FILES+=..$/$(TARFILE_NAME).android.patch
+.ENDIF
+
 # Note: we are building static pixman library to avoid linking problems.
 # However, for Unix dynamic library must be used (especially due to 64bit issues)
 
@@ -68,7 +74,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 
 .ELSE   # WNT, not GCC
 BUILD_DIR=pixman
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release
 .ENDIF
 
 .ELIF "$(GUIBASE)"=="aqua"
@@ -119,15 +125,32 @@ pixman_CFLAGS+=-fPIC
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
+
 .IF "$(OS)"=="IOS"
 CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static
 .ENDIF
+
 CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
+
+.IF "$(OS)"=="ANDROID"
+
+# The pixman-cpu.c code wants to read /proc/<pid>/auxv, but 
+# the Android headers don't define Elf32_auxv_t.
+
+# Maybe we should instead just patch the arm_has_* booleans in
+# pixman-cpu.c to be hardcoded as TRUE and patch out the run-time
+# check?
+
+CONFIGURE_FLAGS+=--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt
+
+.ENDIF
+
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
+
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -148,7 +171,7 @@ OUT2LIB+=pixman$/.libs$/*.a
 .ELSE
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+.ELIF "$(OS)"=="IOS"
 OUT2LIB+=pixman$/.libs$/libpixman-1.a
 .ELSE
 OUT2LIB+=pixman$/.libs$/libpixman-1.so*
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index a4d0da413fae..5827e76d25f5 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo	cairo	: ZLIB:zlib libpng soltools stlport NULL
+lcairo	cairo	: ZLIB:zlib libpng soltools NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
 lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
 lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL