From f1435bba960e673741cb39eb9307f3523505d666 Mon Sep 17 00:00:00 2001 From: Michael Hanson <hansonorders@verizon.net> Date: Fri, 12 Nov 2010 21:59:11 +0000 Subject: cairo: update to latest --- abs/core/cairo/PKGBUILD | 25 ++++++++++++++--------- abs/core/cairo/__changelog | 2 ++ abs/core/cairo/cairo-1.10.0-buggy_gradients.patch | 13 ++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 abs/core/cairo/__changelog create mode 100644 abs/core/cairo/cairo-1.10.0-buggy_gradients.patch diff --git a/abs/core/cairo/PKGBUILD b/abs/core/cairo/PKGBUILD index 2ea6c60..efdd5f8 100644 --- a/abs/core/cairo/PKGBUILD +++ b/abs/core/cairo/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 71210 2010-03-05 15:30:02Z jgc $ +# $Id: PKGBUILD 90247 2010-09-09 21:56:54Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.8.10 -pkgrel=1 +pkgver=1.10.0 +pkgrel=3 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') url="http://cairographics.org/" -depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.16.6' 'xcb-util>=0.3.6') -makedepends=('pkgconfig' 'gtk-doc') +depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.18.4' 'glib2>=2.24.0') +makedepends=('pkgconfig') options=('!libtool') -source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz) -sha1sums=('fd5e8ca82ff0e8542ea4c51612cad387f2a49df3') +source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz + cairo-1.10.0-buggy_gradients.patch) +sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702' + '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/libpng13/libpng14/g' configure || return 1 +# patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-xcb --disable-static || return 1 + --localstatedir=/var --disable-static make || return 1 - make DESTDIR="${pkgdir}" install || return 1 +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/cairo/__changelog b/abs/core/cairo/__changelog new file mode 100644 index 0000000..1434988 --- /dev/null +++ b/abs/core/cairo/__changelog @@ -0,0 +1,2 @@ +reduced pixman dep to 0.18.2 +removed patch for cairo-1.10.0-buggy_gradients.patch -- file patched does not seem to exist diff --git a/abs/core/cairo/cairo-1.10.0-buggy_gradients.patch b/abs/core/cairo/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 0000000..368e356 --- /dev/null +++ b/abs/core/cairo/cairo-1.10.0-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; -- cgit v0.12