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>

1 files changed, 0 insertions, 13 deletions

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: