From 91d7700abc9bd2247e9cd8425c0fffd7132d2b97 Mon Sep 17 00:00:00 2001
From: eric <eric@openbsd.org>
Date: Sun, 17 Oct 2010 12:50:53 +0000
Subject: [PATCH] - disable xcb-xlib which is not ready yet and causes garbled
 output - disable HW gradient rendering as X drivers are broken

from brad and landry
---
 graphics/cairo/Makefile                           |  9 ++++-----
 .../cairo/patches/patch-src_cairo-xlib-display_c  | 15 +++++++++++++++
 graphics/cairo/pkg/PLIST                          |  3 +--
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 graphics/cairo/patches/patch-src_cairo-xlib-display_c

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index d64d1936de2..210edd7748a 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2010/10/11 08:09:44 eric Exp $
+# $OpenBSD: Makefile,v 1.29 2010/10/17 12:50:53 eric Exp $
 
 COMMENT=		vector graphics library
 
 DISTNAME=		cairo-1.10.0
-SHARED_LIBS=		cairo 10.0
+REVISION=		0
+SHARED_LIBS=		cairo 11.0
 SHARED_LIBS+=		cairo-trace 0.0
 SHARED_LIBS+=		cairo-gobject 0.0
 SHARED_LIBS+=		cairo-script-interpreter 0.0
@@ -13,7 +14,7 @@ HOMEPAGE=		http://cairographics.org/introduction
 
 MAINTAINER=		Eric Faurot <eric@openbsd.org>
 
-WANTLIB=		GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xrender \
+WANTLIB=		GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender \
 			Xxf86vm drm expat fontconfig freetype glib-2.0 \
 			gobject-2.0 gthread-2.0 m pcre pixman-1 png \
 			pthread-stubs xcb xcb-render xcb-shm z
@@ -40,10 +41,8 @@ CONFIGURE_ENV=		PTHREAD_LIBS="-pthread"
 CONFIGURE_ARGS=		--enable-gl \
 			--enable-xml \
 			--enable-xcb \
-			--enable-xlib-xcb \
 			--disable-silent-rules
 
-
 REGRESS_DEPENDS=	:ghostscript-*:print/ghostscript/gnu
 
 .include <bsd.port.mk>
diff --git a/graphics/cairo/patches/patch-src_cairo-xlib-display_c b/graphics/cairo/patches/patch-src_cairo-xlib-display_c
new file mode 100644
index 00000000000..53a07ec0422
--- /dev/null
+++ b/graphics/cairo/patches/patch-src_cairo-xlib-display_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_cairo-xlib-display_c,v 1.1 2010/10/17 12:50:53 eric Exp $
+--- src/cairo-xlib-display.c.orig	Sat Oct 16 13:08:38 2010
++++ src/cairo-xlib-display.c	Sat Oct 16 13:08:56 2010
+@@ -353,11 +353,7 @@ _cairo_xlib_device_create (Display *dpy)
+     /* Prior to Render 0.10, there is no protocol support for gradients and
+      * we call function stubs instead, which would silently consume the drawing.
+      */
+-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
+     display->buggy_gradients = TRUE;
+-#else
+-    display->buggy_gradients = FALSE;
+-#endif
+     display->buggy_pad_reflect = FALSE;
+     display->buggy_repeat = FALSE;
+ 
diff --git a/graphics/cairo/pkg/PLIST b/graphics/cairo/pkg/PLIST
index de6a2353df7..5efd2906d97 100644
--- a/graphics/cairo/pkg/PLIST
+++ b/graphics/cairo/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2010/10/11 08:09:44 eric Exp $
+@comment $OpenBSD: PLIST,v 1.9 2010/10/17 12:50:53 eric Exp $
 %%SHARED%%
 bin/cairo-trace
 include/cairo/
@@ -38,7 +38,6 @@ lib/pkgconfig/cairo-ps.pc
 lib/pkgconfig/cairo-svg.pc
 lib/pkgconfig/cairo-xcb-shm.pc
 lib/pkgconfig/cairo-xcb.pc
-lib/pkgconfig/cairo-xlib-xcb.pc
 lib/pkgconfig/cairo-xlib-xrender.pc
 lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo-xml.pc