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

[Jan de Groot]

    Date: Monday, February 4, 2008 @ 16:48:50
  Author: jgc
    Path: /home/cvs-extra/extra/lib/cairo

Modified: PKGBUILD (1.25 -> 1.26)
 Removed: cairo-1.4.12-buggy-repeat.patch (1.1)

upgpkg: cairo 1.4.14-1


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


Index: extra/lib/cairo/PKGBUILD
diff -u extra/lib/cairo/PKGBUILD:1.25 extra/lib/cairo/PKGBUILD:1.26
--- extra/lib/cairo/PKGBUILD:1.25	Sun Dec 30 17:34:03 2007
+++ extra/lib/cairo/PKGBUILD	Mon Feb  4 16:48:50 2008
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.25 2007/12/30 22:34:03 jgc Exp $
+# $Id: PKGBUILD,v 1.26 2008/02/04 21:48:50 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Brice Carpentier <brice at daknet.org>
 
 pkgname=cairo
-pkgver=1.4.12
-pkgrel=2
+pkgver=1.4.14
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -12,14 +12,12 @@
 depends=('libpng' 'libxrender' 'fontconfig')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
-	cairo-1.4.12-buggy-repeat.patch)
-md5sums=('8e50c2c0d56388e4ee94196c0c7a7904' '18f60a5ea7e0ce250c62a33427b463db')
+source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e8c442ff821c0719a69508fecba9038f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/cairo-1.4.12-buggy-repeat.patch || return 1
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 }
Index: extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch
diff -u extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch:1.1 extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch:removed
--- extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch:1.1	Sat Dec 29 17:59:56 2007
+++ extra/lib/cairo/cairo-1.4.12-buggy-repeat.patch	Mon Feb  4 16:48:50 2008
@@ -1,11 +0,0 @@
---- 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)