# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1286687548 0
# Node ID 2d9d337dde69c4291ab52fe7e831d9857562457d
# Parent  31b78de2a5920875df59e47bd8b31c29533bb2f1
Up: cairo to 1.10.0.

diff -r 31b78de2a592 -r 2d9d337dde69 cairo-dev/receipt
--- a/cairo-dev/receipt	Sun Oct 10 04:43:15 2010 +0000
+++ b/cairo-dev/receipt	Sun Oct 10 05:12:28 2010 +0000
@@ -1,12 +1,12 @@
 # SliTaz package receipt.
 
 PACKAGE="cairo-dev"
-VERSION="1.8.10"
+VERSION="1.10.0"
 CATEGORY="development"
 SHORT_DESC="2D graphics library devel files."
 MAINTAINER="pankso@slitaz.org"
 WEB_SITE="http://www.cairographics.org/"
-DEPENDS="pixman-dev xorg-libXrender-dev glib-dev libxcb-dev xcb-util-dev"
+DEPENDS="pixman-dev xorg-libXrender-dev glib-dev libxcb-dev xcb-util-dev cairo"
 WANTED="cairo"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 31b78de2a592 -r 2d9d337dde69 cairo/receipt
--- a/cairo/receipt	Sun Oct 10 04:43:15 2010 +0000
+++ b/cairo/receipt	Sun Oct 10 05:12:28 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cairo"
-VERSION="1.8.10"
+VERSION="1.10.0"
 CATEGORY="x-window"
 SHORT_DESC="2D graphics library."
 MAINTAINER="pankso@slitaz.org"
@@ -17,13 +17,17 @@
 compile_rules()
 {
 	cd $src
+	patch -Np1 -i ../stuff/cairo-1.10.0-buggy_gradients.patch
+	# this patch is used to fix incorrect renders with QT
+	patch -Np1 -i ../stuff/cairo-respect-fontconfig.patch
 	./configure \
 		--prefix=/usr \
  		--mandir=/usr/share/man \
 		--with-html-dir=/usr/share/doc \
 		--enable-xcb \
+		--disable-static \
  		$CONFIGURE_ARGS &&
-	make &&
+	make -j 4 &&
 	make DESTDIR=$PWD/_pkg install
 }
 
diff -r 31b78de2a592 -r 2d9d337dde69 cairo/stuff/cairo-1.10.0-buggy_gradients.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cairo/stuff/cairo-1.10.0-buggy_gradients.patch	Sun Oct 10 05:12:28 2010 +0000
@@ -0,0 +1,13 @@
+--- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200
++++ b/src/cairo-xlib-display.c	2010-08-04 11:58:28.000000000 +0200
+@@ -353,11 +353,7 @@
+     /* 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 -r 31b78de2a592 -r 2d9d337dde69 cairo/stuff/cairo-respect-fontconfig.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cairo/stuff/cairo-respect-fontconfig.patch	Sun Oct 10 05:12:28 2010 +0000
@@ -0,0 +1,21 @@
+diff -Nur cairo-1.8.6.orig/src/cairo-ft-font.c cairo-1.8.6/src/cairo-ft-font.c
+--- cairo-1.8.6.orig/src/cairo-ft-font.c	2008-12-12 20:48:04.000000000 +0800
++++ cairo-1.8.6/src/cairo-ft-font.c	2009-02-20 14:56:57.000000000 +0800
+@@ -1448,8 +1448,15 @@
+     if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
+ 	options->base.hint_style = other->base.hint_style;
+ 
+-    if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
+-	options->base.hint_style = CAIRO_HINT_STYLE_NONE;
++    //if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
++	//options->base.hint_style = CAIRO_HINT_STYLE_NONE;
++
++	if (other->base.hint_style == CAIRO_HINT_STYLE_NONE ||
++		other->base.hint_style == CAIRO_HINT_STYLE_SLIGHT ||
++		other->base.hint_style == CAIRO_HINT_STYLE_MEDIUM ||
++		other->base.hint_style == CAIRO_HINT_STYLE_FULL) {
++	options->base.hint_style = other->base.hint_style;
++	}
+ 
+     if (options->base.antialias == CAIRO_ANTIALIAS_NONE) {
+ 	if (options->base.hint_style == CAIRO_HINT_STYLE_NONE)