cairo 1.12.2-2 correction port

6 files changed, 40 insertions, 9 deletions

diff --git a/cairo/.footprint.i686 b/cairo/.footprint.i686
index 4985882a4..12463d40a 100644
--- a/cairo/.footprint.i686
+++ b/cairo/.footprint.i686
@@ -5,6 +5,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/cairo/
 -rw-r--r--	root/root	usr/include/cairo/cairo-deprecated.h
+-rw-r--r--	root/root	usr/include/cairo/cairo-directfb.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-features.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-ft.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-gl.h
@@ -16,9 +17,11 @@ drwxr-xr-x	root/root	usr/include/cairo/
 -rw-r--r--	root/root	usr/include/cairo/cairo-svg.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-tee.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-version.h
+-rw-r--r--	root/root	usr/include/cairo/cairo-vg.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-xcb.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-xlib-xrender.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-xlib.h
+-rw-r--r--	root/root	usr/include/cairo/cairo-xml.h
 -rw-r--r--	root/root	usr/include/cairo/cairo.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cairo/
@@ -53,6 +56,7 @@ lrwxrwxrwx	root/root	usr/lib/libcairo.so -> libcairo.so.2.11200.2
 lrwxrwxrwx	root/root	usr/lib/libcairo.so.2 -> libcairo.so.2.11200.2
 -rwxr-xr-x	root/root	usr/lib/libcairo.so.2.11200.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/cairo-directfb.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-egl.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-fc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-ft.pc
@@ -65,8 +69,10 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-script.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-svg.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-tee.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/cairo-vg.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xcb-shm.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xcb.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xlib-xrender.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xlib.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xml.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo.pc
diff --git a/cairo/.footprint.x86_64 b/cairo/.footprint.x86_64
index 4985882a4..12463d40a 100644
--- a/cairo/.footprint.x86_64
+++ b/cairo/.footprint.x86_64
@@ -5,6 +5,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/cairo/
 -rw-r--r--	root/root	usr/include/cairo/cairo-deprecated.h
+-rw-r--r--	root/root	usr/include/cairo/cairo-directfb.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-features.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-ft.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-gl.h
@@ -16,9 +17,11 @@ drwxr-xr-x	root/root	usr/include/cairo/
 -rw-r--r--	root/root	usr/include/cairo/cairo-svg.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-tee.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-version.h
+-rw-r--r--	root/root	usr/include/cairo/cairo-vg.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-xcb.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-xlib-xrender.h
 -rw-r--r--	root/root	usr/include/cairo/cairo-xlib.h
+-rw-r--r--	root/root	usr/include/cairo/cairo-xml.h
 -rw-r--r--	root/root	usr/include/cairo/cairo.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cairo/
@@ -53,6 +56,7 @@ lrwxrwxrwx	root/root	usr/lib/libcairo.so -> libcairo.so.2.11200.2
 lrwxrwxrwx	root/root	usr/lib/libcairo.so.2 -> libcairo.so.2.11200.2
 -rwxr-xr-x	root/root	usr/lib/libcairo.so.2.11200.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/cairo-directfb.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-egl.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-fc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-ft.pc
@@ -65,8 +69,10 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-script.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-svg.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-tee.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/cairo-vg.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xcb-shm.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xcb.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xlib-xrender.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xlib.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/cairo-xml.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/cairo.pc
diff --git a/cairo/.md5sum.i686 b/cairo/.md5sum.i686
index 8cff5993b..bb5ab4f83 100644
--- a/cairo/.md5sum.i686
+++ b/cairo/.md5sum.i686
@@ -1,2 +1,2 @@
-57567182e5620537e6f872676d390572  cairo-1.12.0.patch
+9b323790dab003e228c6955633cb888e  buggy_gradients.patch
 87649eb75789739d517c743e94879e51  cairo-1.12.2.tar.xz
diff --git a/cairo/.md5sum.x86_64 b/cairo/.md5sum.x86_64
index 8cff5993b..bb5ab4f83 100644
--- a/cairo/.md5sum.x86_64
+++ b/cairo/.md5sum.x86_64
@@ -1,2 +1,2 @@
-57567182e5620537e6f872676d390572  cairo-1.12.0.patch
+9b323790dab003e228c6955633cb888e  buggy_gradients.patch
 87649eb75789739d517c743e94879e51  cairo-1.12.2.tar.xz
diff --git a/cairo/Pkgfile b/cairo/Pkgfile
index 1a1353701..0d51271b0 100755
--- a/cairo/Pkgfile
+++ b/cairo/Pkgfile
@@ -2,30 +2,36 @@
 # URL: http://www.cairographics.org/ 
 # Packager: thierryn1 at hispeed dot ch
 # Maintainer: NuTyX core team
-# Depends on: mesa3d,fontconfig,xorg-libxrender,xorg-libpixman
-# Run on: mesa3d,fontconfig,xorg-libpixman
+# Depends on: mesa3d, fontconfig, xorg-libxrender, xorg-libpixman, directfb
+# Run on: mesa3d,fontconfig,xorg-libpixman,directfb
 
 name=cairo
 version=1.12.2
-release=1
+release=2
 source=(http://cairographics.org/releases/$name-$version.tar.xz
-	cairo-1.12.0.patch)
+	buggy_gradients.patch)
 
 build() {
 	cd $name-$version
-	patch -Np1 < ../cairo-1.12.0.patch
+	patch -Np1 < ../buggy_gradients.patch
 	./configure --prefix=/usr \
 		--enable-ps \
 		--enable-pdf \
-		--enable-glitz \
 		--enable-xcb \
 		--enable-gl \
 		--enable-egl=yes \
 		--enable-glx=yes \
 		--enable-tee \
+		--enable-xml \
+		--disable-skia \
+		--disable-glesv2 \
+		--enable-vg \
+		--enable-directfb \
+		--disable-cogl \
+		--disable-xlib-xcb \
+		--disable-drm \
 		--disable-gtk-doc
 	make
 	make DESTDIR=$PKG install
 	rm -rf $PKG/usr/share
 }
-  
diff --git a/cairo/buggy_gradients.patch b/cairo/buggy_gradients.patch
new file mode 100644
index 000000000..368e356d3
--- /dev/null
+++ b/cairo/buggy_gradients.patch
@@ -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;