From 81de8711ea005bb0eb35eebe6ac8cc7a39d74e51 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 20 Mar 2012 10:37:36 +0100
Subject: [PATCH] cairo: update to 1.11.4.
---
common/shlibs | 1 +
srcpkgs/cairo/cairo-devel.rshlibs | 5 -----
srcpkgs/cairo/cairo-devel.template | 17 +++++++----------
srcpkgs/cairo/cairo.rshlibs | 2 +-
srcpkgs/cairo/template | 9 ++++-----
5 files changed, 13 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/cairo/cairo-devel.rshlibs
diff --git a/common/shlibs b/common/shlibs
index 2c0d22b425..e0ce862d24 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -90,6 +90,7 @@ libpangox-1.0.so.0 pango pango-devel
libpango-1.0.so.0 pango pango-devel
libcairo.so.2 cairo cairo-devel
libcairo-gobject.so.2 cairo cairo-devel
+libcairo-script-interpreter.so.2 cairo cairo-devel
libgdk-x11-2.0.so.0 gtk+ gtk+-devel
libgtk-x11-2.0.so.0 gtk+ gtk+-devel
libgdk_pixbuf-2.0.so.0 gdk-pixbuf gdk-pixbuf-devel
diff --git a/srcpkgs/cairo/cairo-devel.rshlibs b/srcpkgs/cairo/cairo-devel.rshlibs
deleted file mode 100644
index 43b3d86cfb..0000000000
--- a/srcpkgs/cairo/cairo-devel.rshlibs
+++ /dev/null
@@ -1,5 +0,0 @@
-libpthread.so.0
-libz.so.1
-libdl.so.2
-libm.so.6
-libc.so.6
diff --git a/srcpkgs/cairo/cairo-devel.template b/srcpkgs/cairo/cairo-devel.template
index 127c93f13f..300f8df1bf 100644
--- a/srcpkgs/cairo/cairo-devel.template
+++ b/srcpkgs/cairo/cairo-devel.template
@@ -5,9 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
-revision=7
-
-Add_dependency run cairo
Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
Add_dependency run glib-devel
@@ -17,12 +14,12 @@ Add_dependency run libX11-devel
Add_dependency run libXrender-devel
Add_dependency run pixman-devel
Add_dependency run MesaLib-devel
+Add_dependency run cairo ">=${version}"
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/{cairo,pkgconfig} ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+do_install() {
+ vmove usr/include usr
+ vmove usr/share usr
+ vmove "usr/lib/*.a" usr/lib
+ vmove "usr/lib/cairo/*.a" usr/lib/cairo
+ vmove usr/lib/pkgconfig usr/lib
}
diff --git a/srcpkgs/cairo/cairo.rshlibs b/srcpkgs/cairo/cairo.rshlibs
index 6aa9e3e0f3..e832444d2b 100644
--- a/srcpkgs/cairo/cairo.rshlibs
+++ b/srcpkgs/cairo/cairo.rshlibs
@@ -12,8 +12,8 @@ libX11.so.6
libz.so.1
libGL.so.1
libgobject-2.0.so.0
-libgthread-2.0.so.0
librt.so.1
libglib-2.0.so.0
libm.so.6
libc.so.6
+libdl.so.2
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 344c05a312..d643bca1c2 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,17 +1,16 @@
# Template build file for 'cairo'.
pkgname=cairo
-version=1.10.2
-revision=6
+version=1.11.4
homepage="http://cairographics.org"
-distfiles="${homepage}/releases/$pkgname-$version.tar.gz"
+distfiles="${homepage}/snapshots/$pkgname-$version.tar.gz"
build_style=gnu-configure
-configure_args="--enable-xlib --enable-xcb --enable-xlib-xcb=no
+configure_args="--enable-xlib --enable-xcb --disable-xlib-xcb
--enable-png --disable-directfb --enable-ft --enable-pdf --enable-tee
--enable-ps --enable-svg --disable-gcov --enable-gl --enable-xlib-xrender"
short_desc="Vector graphics library with cross-device output support"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1, MPL-1.1"
-checksum=32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
+checksum=aa78ac12294b34f31cf2462343564996ea9f90de8c9f9da4eb6f9b3d10317e68
long_desc="
Cairo is a vector graphics library with cross-device output support. Currently
supported output targets include the X Window System and in-memory image