[arch-commits] CVS update of extra/x11-libs/pixman (PKGBUILD pixman-compose-fix.patch)

[Alexander Baldeck]

    Date: Wednesday, October 10, 2007 @ 13:06:43
  Author: alexander
    Path: /home/cvs-extra/extra/x11-libs/pixman

   Added: pixman-compose-fix.patch (1.1)
Modified: PKGBUILD (1.1 -> 1.2)

* added patch to fix 64-bit arithmetic flaw described in X.org FS#12398
  * fixes FS#8252
  * should fix arch FS#8250 


--------------------------+
 PKGBUILD                 |   16 ++++++++++------
 pixman-compose-fix.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)


Index: extra/x11-libs/pixman/PKGBUILD
diff -u extra/x11-libs/pixman/PKGBUILD:1.1 extra/x11-libs/pixman/PKGBUILD:1.2
--- extra/x11-libs/pixman/PKGBUILD:1.1	Sat Sep 22 14:09:57 2007
+++ extra/x11-libs/pixman/PKGBUILD	Wed Oct 10 13:06:43 2007
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD,v 1.1 2007/09/22 18:09:57 alexander Exp $
+# $Id: PKGBUILD,v 1.2 2007/10/10 17:06:43 alexander Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=pixman
 pkgver=0.9.5
-pkgrel=2
+pkgrel=3
 pkgdesc=""
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org"
 license=()
 depends=('glibc')
 options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 \
+        pixman-compose-fix.patch)
 
 build() {
-  cd "$startdir/src/$pkgname-$pkgver"
+  cd "${startdir}/src/${pkgname}-${pkgver}"
   
+  patch -Np1 -i ${startdir}/src/pixman-compose-fix.patch || return 1
+
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR="$startdir/pkg" install
+  make DESTDIR="${startdir}/pkg" install
 }
 
-md5sums=('f9fea77e46ec7a3a16e925e137f146e7')
+md5sums=('f9fea77e46ec7a3a16e925e137f146e7'
+         '26ee31eea878759f66b874b6a6bd7c35')
Index: extra/x11-libs/pixman/pixman-compose-fix.patch
diff -u /dev/null extra/x11-libs/pixman/pixman-compose-fix.patch:1.1
--- /dev/null	Wed Oct 10 13:06:43 2007
+++ extra/x11-libs/pixman/pixman-compose-fix.patch	Wed Oct 10 13:06:43 2007
@@ -0,0 +1,22 @@
+diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
+index 1e91864..027394a 100644
+--- a/pixman/pixman-compose.c
++++ b/pixman/pixman-compose.c
+@@ -3880,7 +3880,7 @@ static void fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uin
+ 			    idistx = 256 - distx;
+ 			    idisty = 256 - disty;
+ 			    
+-			    b = bits + (y1)*stride;
++			    b = bits + (signed)((y1)*stride);
+ 			    x_off = x1;
+ 			    
+ 			    x1_out = (x1 < box.x1) | (x1 >= box.x2);
+@@ -3946,7 +3946,7 @@ static void fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uin
+ 			    idistx = 256 - distx;
+ 			    idisty = 256 - disty;
+ 			    
+-			    b = bits + (y1)*stride;
++			    b = bits + (signed)((y1)*stride);
+ 			    x_off = x1;
+ 			    
+ 			    tl = pixman_region_contains_point(pict->common.src_clip, x1, y1, &box)