libcairo: merge with x11-packages/libcairo-x

packages/libcairo/build.sh

@@ -2,16 +2,24 @@ TERMUX_PKG_HOMEPAGE=https://cairographics.org
 TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.16.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/cairo-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_DEPENDS="libandroid-support, libpixman, fontconfig, freetype, libpng"
+TERMUX_PKG_SHA256=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
+TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, liblzo, libpixman, libpng, libx11, libxcb, libxext, libxrender, zlib"
 TERMUX_PKG_BREAKS="libcairo-dev"
 TERMUX_PKG_REPLACES="libcairo-dev"
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-ac_cv_lib_lzo2_lzo2a_decompress=no
 --disable-gtk-doc-html
---enable-xlib=no
+--disable-gl
---enable-xcb=no
+--enable-gobject
+--enable-pdf
+--enable-svg
+--enable-ps
 "
+
 TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc/html"
+
+termux_step_pre_configure() {
+	autoreconf -fi
+}

packages/libcairo/fdr.c.patch

@@ -0,0 +1,12 @@
+diff -uNr cairo-1.14.12/util/cairo-fdr/fdr.c cairo-1.14.12.mod/util/cairo-fdr/fdr.c
+--- cairo-1.14.12/util/cairo-fdr/fdr.c	2017-12-05 00:24:46.000000000 +0200
++++ cairo-1.14.12.mod/util/cairo-fdr/fdr.c	2017-12-17 13:40:14.062948088 +0200
+@@ -67,7 +67,7 @@
+     cairo_device_t *ctx;
+     int n;
+ 
+-    ctx = DLCALL (cairo_script_create, "/tmp/fdr.trace");
++    ctx = DLCALL (cairo_script_create, "@TERMUX_PREFIX@/tmp/fdr.trace");
+ 
+     for (n = fdr_position; n < RINGBUFFER_SIZE; n++)
+ 	fdr_replay_to_script (fdr_ringbuffer[n], ctx);