From 18612e5ffb4710338a804127a9e2cc77d855c503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Fri, 25 Aug 2017 16:04:47 +0200
Subject: vars/build.vars: adds pixman v0.34.0 and cairo v1.15.6.
 patches/cairo-1.15.6.local.patch: disable tests.

---
 patches/cairo-1.15.6.local.patch | 36 ++++++++++++++++++++++++++++++++++++
 vars/build.vars                  |  9 ++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 patches/cairo-1.15.6.local.patch

diff --git a/patches/cairo-1.15.6.local.patch b/patches/cairo-1.15.6.local.patch
new file mode 100644
index 00000000..d94e92df
--- /dev/null
+++ b/patches/cairo-1.15.6.local.patch
@@ -0,0 +1,36 @@
+--- cairo-1.15.6/Makefile.in.orig	2017-06-13 23:57:59.000000000 +0200
++++ cairo-1.15.6/Makefile.in	2017-08-25 16:02:40.473494458 +0200
+@@ -106,8 +106,6 @@
+ EXTRA_PROGRAMS =
+ TESTS =
+ check_PROGRAMS =
+-# libpng is required for our test programs
+-@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
+@@ -712,7 +710,7 @@
+ #	$(srcdir)/build/Makefile.win32.features-h \
+ #	$(NULL)
+ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+-DIST_SUBDIRS = src doc util boilerplate test perf
++DIST_SUBDIRS = src doc util
+ SUBDIRS = src doc util $(am__append_1)
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \
+@@ -1493,14 +1491,7 @@
+ 
+ doc:
+ 	cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
+-test retest recheck: all
+-	cd test && $(MAKE) $(AM_MAKEFLAGS) $@
+-perf: all
+-	cd perf && $(MAKE) $(AM_MAKEFLAGS) $@
+-check-valgrind: all
+-	cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
+-	cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
+-.PHONY: doc test retest recheck perf check-valgrind
++.PHONY: doc
+ 
+ changelogs:
+ 	@$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
diff --git a/vars/build.vars b/vars/build.vars
index 492a2de5..4fbf2979 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -253,7 +253,7 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe
 LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
-expat libxml2 apr apr_util bzip2 curl libz libpng libffi gdbm geoip pcre glib gzip libarchive
+expat libxml2 apr apr_util bzip2 curl libz libpng libffi gdbm geoip pcre glib pixman cairo gzip libarchive
 libatomic_ops libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt
 libksba lua ncurses ncursestw ncursesw npth sqlite3 xz";
 LIB_PACKAGES_PACKAGES_X11="
@@ -319,6 +319,13 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_NATIVE}/lib/libffi-3.2.1/include:LIBFFI_LIBS=-L${PREFIX_NATIVE}/lib -lffi};
 : ${PKG_GLIB_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_PIXMAN_VERSION:=0.34.0};
+: ${PKG_PIXMAN_URL:=https://www.cairographics.org/releases/pixman-${PKG_PIXMAN_VERSION}.tar.gz};
+: ${PKG_PIXMAN_SHA256SUM:=21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e};
+: ${PKG_CAIRO_VERSION:=1.15.6};
+: ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
+: ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
+: ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
 : ${PKG_GZIP_SHA256SUM:=1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e};
 : ${PKG_GZIP_VERSION:=1.8};
 : ${PKG_GZIP_URL:=https://ftp.gnu.org/gnu/gzip/gzip-${PKG_GZIP_VERSION}.tar.gz};
-- 
cgit v1.2.3