[Libreoffice-commits] core.git: external/cairo

[Michael Stahl]

 external/cairo/ExternalProject_cairo.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a95ef3313387b8d30c5b60c397bb839afd7d60dc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Aug 25 11:49:45 2016 +0200

    cairo: try if --disable-xcb fixes android build
    
    Change-Id: I2a49f4e2b60fb51e4ec03dd82b7e54d1f39d887a

diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 4a3a944..b983ad1 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		$(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 ANDROID IOS,$(OS)),--disable-shared,--disable-static) \
-		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
+		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb) \
 		$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
 		--disable-valgrind \
 		$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \