From dd6fdf4bbb32fcb29b4553a16241768e29911633 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 10 Feb 2014 15:18:11 +0100
Subject: unbreak build

---
 package/cairo/Makefile                  |  6 ++++--
 package/cairo/patches/patch-Makefile_in | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 package/cairo/patches/patch-Makefile_in

(limited to 'package/cairo')

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 44573958b..82bffe11f 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
 PKG_VERSION:=		1.12.16
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		a1304edcdc99282f478b995ee5f8f854
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
@@ -34,7 +34,9 @@ CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-fc=yes \
 			--enable-tee=yes \
 			--enable-xlib=yes \
-			--enable-pdf=no
+			--enable-pdf=no \
+			--disable-test-surfaces \
+			--disable-full-testing
 
 cairo-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo
diff --git a/package/cairo/patches/patch-Makefile_in b/package/cairo/patches/patch-Makefile_in
new file mode 100644
index 000000000..266149788
--- /dev/null
+++ b/package/cairo/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- cairo-1.12.16.orig/Makefile.in	2013-08-26 19:00:44.000000000 +0200
++++ cairo-1.12.16/Makefile.in	2014-02-10 14:44:58.000000000 +0100
+@@ -80,7 +80,7 @@ EXTRA_PROGRAMS =
+ TESTS =
+ check_PROGRAMS =
+ # libpng is required for our test programs
+-@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf
++@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
+@@ -439,7 +439,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
+ #	$(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 boilerplate perf
+ SUBDIRS = src doc util $(am__append_1)
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \
-- 
cgit v1.2.3