cairo: upgrade pixman to release 0.34.0, cairo to release 1.14.6

* from pixman-0.24.4.patch drop:
- Android support config.sub: obsoleted by new upstream autoconf
- configure Mac OS X 10.4 (unsupported) linker warning
- configure getisax Solaris check: it's unclear why this would
give a wrong result on Linux, it certainly does't on Fedora 24...
- __inline__ workaround looks fixed upstream
* drop pixman-0.24.4.android.patch:
obsoleted by new upstream autoconf

* from cairo-1.10.2.patch drop:
- Makefile.win32.common: drop this for now, we don't build
cairo on windows and paths in this patch are still dmake INPATH...
- Android support config.sub: obsoleted by new upstream autoconf
- configure "libpng15" should be obsolete since it's overridden
by png_CFLAGS/png_LIBS anyway
- configure Mac OS X 10.4 (unsupported) linker warning
- cairo-output-stream.c: fixed upstream
- cairo-ft-font.c: presumed obsolete, FcResultOutOfMemory added in 2004
* drop cairo.dlsym.lcdfilter.patch:
FT_Library_SetLcdFilter since 2.3.0 so exists in RHEL 6 baseline (2.3.11)
* drop cairo-1.10.2-oldfontconfig.patch:
RHEL 6 baseline has fontconfig 2.8.0 so 2.2.95 isn't "too new"
* drop cairo-1.10.2.wntmsc.patch:
we don't build cairo on windows currently, and this doesn't apply
* drop no-flto-clang.patch:
fixed upstream
* remove definition of COMPRESS var that appears to be completely unused

Change-Id: I5d782b9267c348c266ef369db2f8ac2c3c70b90d
Reviewed-on: https://gerrit.libreoffice.org/28365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

13 files changed, 31 insertions, 389 deletions

diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk
index 720927670c39..b1686973537a 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
 
 ifneq ($(OS),ANDROID)
 
-$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
+$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11400.6))
 
 endif
 
diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk
index c08a775012d6..f101f6a58e1e 100644
--- a/external/cairo/ExternalPackage_pixman.mk
+++ b/external/cairo/ExternalPackage_pixman.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
 
 ifneq ($(OS),ANDROID)
 
-$(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
+$(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.34.0))
 
 endif
 
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index e6a30ec4299a..4a3a94454f8e 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -42,14 +42,12 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
 		pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
 		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
-		COMPRESS=$(if $(SYSTEM_ZLIB),compress,z_compress) \
 		ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
 		png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
 		png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
 		$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
 		$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
-		$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
-		$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static) \
+		$(if $(filter ANDROID IOS,$(OS)),--disable-shared,--disable-static) \
 		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
 		$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
 		--disable-valgrind \
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk
index 2114982f020a..503e762cb4f5 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -13,17 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL),,cairo))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
 	external/cairo/cairo/cairo-1.10.2.patch \
-	external/cairo/cairo/cairo.dlsym.lcdfilter.patch \
-	external/cairo/cairo/cairo-1.10.2-oldfontconfig.patch \
 ))
 
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
-	external/cairo/cairo/cairo-1.10.2.wntmsc.patch \
-))
-endif
-
-# FIXME add cairo/cairo/cairo-1.10.2.no-atsui.patch for MACOSX >= 1070
 ifeq ($(OS),IOS)
 $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
 	external/cairo/cairo/cairo-1.10.2.no-atsui.patch \
@@ -42,8 +33,4 @@ ifneq (,$(filter ANDROID IOS,$(OS)))
 $(eval $(call gb_UnpackedTarball_add_file,cairo,.,external/cairo/cairo/dummy_pkg_config))
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
-	external/cairo/cairo/no-flto-clang.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk
index 1e12550f2895..d5a8907cd95e 100644
--- a/external/cairo/UnpackedTarball_pixman.mk
+++ b/external/cairo/UnpackedTarball_pixman.mk
@@ -15,12 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,pixman,\
 	external/cairo/pixman/pixman-0.24.4.patch \
 ))
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,pixman,\
-	external/cairo/pixman/pixman-0.24.4.android.patch \
-))
-endif
-
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_UnpackedTarball_add_file,pixman,pixman,external/cairo/pixman/Makefile.win32.common))
 endif
diff --git a/external/cairo/cairo/cairo-1.10.2-oldfontconfig.patch b/external/cairo/cairo/cairo-1.10.2-oldfontconfig.patch
deleted file mode 100644
index d19258aef753..000000000000
--- a/external/cairo/cairo/cairo-1.10.2-oldfontconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/cairo-1.10.2/configure	2012-02-20 23:25:52.000000000 -0800
-+++ misc/build/cairo-1.10.2/configure	2012-02-20 11:53:05.000000000 -0800
-@@ -29672,7 +29672,7 @@
- fi
- 
- 
--FONTCONFIG_MIN_VERSION=2.2.95
-+FONTCONFIG_MIN_VERSION=2.2.3
- 																	# Check whether --enable-fc was given.
- if test "${enable_fc+set}" = set; then :
-   enableval=$enable_fc; enable_fc=$enableval
diff --git a/external/cairo/cairo/cairo-1.10.2.patch b/external/cairo/cairo/cairo-1.10.2.patch
index c3f7aa745149..d564d53ab9e0 100644
--- a/external/cairo/cairo/cairo-1.10.2.patch
+++ b/external/cairo/cairo/cairo-1.10.2.patch
@@ -9,77 +9,15 @@
  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 += -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 @@
+@@ -19259,59 +19259,10 @@
  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 :
+-if ${ac_cv_lib_z_compress+:} false; then :
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -113,15 +51,15 @@
 -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 :
+-if test "x$ac_cv_lib_z_compress" = xyes; 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 :
--
+-if test "x$ac_cv_header_zlib_h" = xyes; then :
+ 
  	  have_libz=yes
  
  $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
- 
- 
+-
+-
 -else
 -  have_libz="no (requires zlib http://www.gzip.org/zlib/)"
 -fi
@@ -130,20 +68,9 @@
 -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
+ 
+ 
+ save_LIBS="$LIBS"
 @@ -29424,7 +29424,7 @@
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - OK" >&5
  $as_echo "$FREETYPE_VERSION - OK" >&6; }
@@ -160,8 +87,8 @@
 -  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"
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's FreeType font backend feature could be enabled" >&5
 @@ -30121,7 +30121,7 @@
  
      # The ps backend requires zlib.
@@ -169,8 +96,8 @@
 -    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"
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PostScript surface backend feature could be enabled" >&5
 @@ -30549,7 +30549,7 @@
  
      # The pdf backend requires zlib.
@@ -178,8 +105,8 @@
 -    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"
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PDF surface backend feature could be enabled" >&5
 @@ -32296,7 +32296,7 @@
  
  
@@ -187,50 +114,6 @@
 -    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"
-@@ -32864,7 +32864,7 @@
- $_compile_program
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  cairo_cc_stderr=`test -f conftest.err && cat conftest.err`
-+  cairo_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file compiled with -mlong-branch which is no longer needed.' conftest.err`
- 		 cairo_cc_flag=yes
- else
-   cairo_cc_stderr=`test -f conftest.err && cat conftest.err`
---- 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-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;
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's xml surface backend feature could be enabled" >&5
+$as_echo_n "checking whether cairo's xml surface backend feature could be enabled... " >&6; }
diff --git a/external/cairo/cairo/cairo-1.10.2.wntmsc.patch b/external/cairo/cairo/cairo-1.10.2.wntmsc.patch
deleted file mode 100644
index 1aa882a03163..000000000000
--- a/external/cairo/cairo/cairo-1.10.2.wntmsc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch
index d2afefdddd55..15850d244166 100644
--- a/external/cairo/cairo/cairo.GL_RGBA.patch
+++ b/external/cairo/cairo/cairo.GL_RGBA.patch
@@ -1,21 +1,23 @@
 --- misc/cairo-1.10.2/src/cairo-image-surface.c
 +++ misc/cairo-1.10.2/src/cairo-image-surface.c
-@@ -99,9 +99,9 @@
+@@ -99,11 +99,11 @@
  _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
  {
      switch (pixman_format) {
 -    case PIXMAN_a8r8g8b8:
 +    case PIXMAN_a8b8g8r8: //tweaked
  	return CAIRO_FORMAT_ARGB32;
+     case PIXMAN_x2r10g10b10:
+ 	return CAIRO_FORMAT_RGB30;
 -    case PIXMAN_x8r8g8b8:
 +    case PIXMAN_x8b8g8r8: //tweaked
  	return CAIRO_FORMAT_RGB24;
      case PIXMAN_a8:
  	return CAIRO_FORMAT_A8;
 @@ -109,7 +109,7 @@
- 	return CAIRO_FORMAT_A1;
-     case PIXMAN_r5g6b5:
- 	return CAIRO_FORMAT_RGB16_565;
+ #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2)
+     case PIXMAN_a8r8g8b8_sRGB:
+ #endif
 -    case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: case PIXMAN_r8g8b8:
 +    case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: case PIXMAN_r8g8b8: //tweaked
      case PIXMAN_b8g8r8:   case PIXMAN_b5g6r5:
@@ -28,8 +30,8 @@
 -	ret = PIXMAN_x8r8g8b8;
 +	ret = PIXMAN_x8b8g8r8; //tweaked
  	break;
-     case CAIRO_FORMAT_RGB16_565:
- 	ret = PIXMAN_r5g6b5;
+     case CAIRO_FORMAT_RGB30:
+ 	ret = PIXMAN_x2r10g10b10;
 @@ -305,7 +305,7 @@
      case CAIRO_FORMAT_ARGB32:
      case CAIRO_FORMAT_INVALID:
diff --git a/external/cairo/cairo/cairo.dlsym.lcdfilter.patch b/external/cairo/cairo/cairo.dlsym.lcdfilter.patch
deleted file mode 100644
index 46f7ac74fd7a..000000000000
--- a/external/cairo/cairo/cairo.dlsym.lcdfilter.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- misc/cairo-1.10.2/src/cairo-ft-font.c	2012-01-06 09:09:21.500373823 +0000
-+++ misc/build/cairo-1.10.2/src/cairo-ft-font.c	2012-01-06 09:31:01.645238786 +0000
-@@ -59,6 +59,8 @@
- 
- #if HAVE_FT_LIBRARY_SETLCDFILTER
- #include FT_LCD_FILTER_H
-+#elif HAVE_DLFCN_H
-+#include <dlfcn.h>
- #endif
- 
- /* Fontconfig version older than 2.6 didn't have these options */
-@@ -1217,6 +1219,26 @@
-     return CAIRO_STATUS_SUCCESS;
- }
- 
-+static void try_FT_Library_SetLcdFilter( FT_Library library,
-+    int lcd_filter )
-+{
-+#if HAVE_FT_LIBRARY_SETLCDFILTER
-+    FT_Library_SetLcdFilter (library, lcd_filter);
-+#elif HAVE_DLFCN_H
-+    static void (*pFT_Library_SetLcdFilter) (FT_Library, int);
-+    static int dlsymed = 0;
-+
-+    if (!dlsymed)
-+    {
-+        pFT_Library_SetLcdFilter = dlsym(RTLD_DEFAULT, "FT_Library_SetLcdFilter");
-+        dlsymed = 1;
-+    }
-+
-+    if (pFT_Library_SetLcdFilter)
-+    	(*pFT_Library_SetLcdFilter) (library, lcd_filter); 
-+#endif
-+}
-+
- /* Converts an outline FT_GlyphSlot into an image
-  *
-  * This could go through _render_glyph_bitmap as well, letting
-@@ -1350,15 +1372,11 @@
- 	    break;
- 	    }
- 
--#if HAVE_FT_LIBRARY_SETLCDFILTER
--	FT_Library_SetLcdFilter (library, lcd_filter);
--#endif
-+	try_FT_Library_SetLcdFilter(library, lcd_filter);
- 
- 	fterror = FT_Render_Glyph (face->glyph, render_mode);
- 
--#if HAVE_FT_LIBRARY_SETLCDFILTER
--	FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE);
--#endif
-+	try_FT_Library_SetLcdFilter(library, FT_LCD_FILTER_NONE);
- 
- 	if (fterror != 0)
- 		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/external/cairo/cairo/no-flto-clang.patch b/external/cairo/cairo/no-flto-clang.patch
deleted file mode 100644
index 725f4843eda9..000000000000
--- a/external/cairo/cairo/no-flto-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/cairo-1.10.2/configure.sav	2013-06-26 15:00:42.000000000 +0200
-+++ misc/cairo-1.10.2/configure	2013-06-26 15:03:36.995117032 +0200
-@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \
- MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
- 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
- 
--MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
-+MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
- 
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
- 
diff --git a/external/cairo/pixman/pixman-0.24.4.android.patch b/external/cairo/pixman/pixman-0.24.4.android.patch
deleted file mode 100644
index ae0626eaa02b..000000000000
--- a/external/cairo/pixman/pixman-0.24.4.android.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/pixman-0.24.4/ltmain.sh
-+++ misc/build/pixman-0.24.4/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/external/cairo/pixman/pixman-0.24.4.patch b/external/cairo/pixman/pixman-0.24.4.patch
index 72fd03a0f177..520f2ba572d4 100644
--- a/external/cairo/pixman/pixman-0.24.4.patch
+++ b/external/cairo/pixman/pixman-0.24.4.patch
@@ -8,61 +8,7 @@
 +SUBDIRS = pixman
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = pixman-1.pc
- GPGKEY = 6FF7C1A8
---- misc/pixman-0.24.4/config.sub	2008-08-30 00:27:25.000000000 +0200
-+++ misc/build/pixman-0.24.4/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.4/configure	2011-11-06 22:11:27.000000000 +0100
-+++ misc/build/pixman-0.24.4/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
-@@ -24552,7 +24552,7 @@
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
--  pixman_cc_stderr=`test -f conftest.err && cat conftest.err`
-+  pixman_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file compiled with -mlong-branch which is no longer needed.' conftest.err`
- 		 pixman_cc_flag=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
+ GPGKEY = 3892336E
 --- misc/pixman-0.24.4/pixman/pixman-utils.c
 +++ misc/build/pixman-0.24.4/pixman/pixman-utils.c
 @@ -27,6 +27,7 @@
@@ -73,24 +19,3 @@
  
  #include "pixman-private.h"
  
---- misc/pixman-0.24.4/pixman/pixman-mmx.c	2011-11-06 13:47:42.000000000 -0700
-+++ misc/build/pixman-0.24.4/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. */
-