[arch-commits] CVS update of extra/lib/cairo (PKGBUILD cairo-1.4.12-buggy-repeat.patch)

[Jan de Groot]

    Date: Saturday, December 29, 2007 @ 17:59:56
  Author: jgc
    Path: /home/cvs-extra/extra/lib/cairo

   Added: cairo-1.4.12-buggy-repeat.patch (1.1)
Modified: PKGBUILD (1.23 -> 1.24)

Add fix for buggy_repeat detection from git


---------------------------------+
 PKGBUILD                        |    8 +++++---
 cairo-1.4.12-buggy-repeat.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)


Index: extra/lib/cairo/PKGBUILD
diff -u extra/lib/cairo/PKGBUILD:1.23 extra/lib/cairo/PKGBUILD:1.24
--- extra/lib/cairo/PKGBUILD:1.23	Sun Dec  2 08:40:05 2007
+++ extra/lib/cairo/PKGBUILD	Sat Dec 29 17:59:55 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.23 2007/12/02 13:40:05 jgc Exp $
+# $Id: PKGBUILD,v 1.24 2007/12/29 22:59:55 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Brice Carpentier <brice at daknet.org>
 
 pkgname=cairo
 pkgver=1.4.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -12,11 +12,13 @@
 depends=('libpng' 'libxrender' 'fontconfig')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
+source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
+	cairo-1.4.12-buggy-repeat.patch)
 md5sums=('8e50c2c0d56388e4ee94196c0c7a7904')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/cairo-1.4.12-buggy-repeat.patch || return 1
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=${startdir}/pkg install
Index: extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch
diff -u /dev/null extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch:1.1
--- /dev/null	Sat Dec 29 17:59:56 2007
+++ extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch	Sat Dec 29 17:59:56 2007
@@ -0,0 +1,11 @@
+--- src/cairo-xlib-surface.c
++++ src/cairo-xlib-surface.c
+@@ -2023,7 +2023,7 @@ _cairo_xlib_surface_create_internal (Dis
+ 
+     surface->buggy_repeat = FALSE;
+     if (strstr (ServerVendor (dpy), "X.Org") != NULL) {
+-	if (VendorRelease (dpy) <= 60802000)
++	if (VendorRelease (dpy) >= 60700000 && VendorRelease (dpy) <= 60802000)
+ 	    surface->buggy_repeat = TRUE;
+     } else if (strstr (ServerVendor (dpy), "XFree86") != NULL) {
+ 	if (VendorRelease (dpy) <= 40500000)