8 files changed, 90 insertions, 29 deletions
diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD
new file mode 100644
index 000000000..3f3f3e8ae
--- /dev/null
+++ b/testing/cairo/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 154931 2012-03-31 09:15:49Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Brice Carpentier <brice@daknet.org>
+
+pkgname=cairo
+pkgver=1.12.0
+pkgrel=1
+pkgdesc="Cairo vector graphics library"
+arch=(i686 x86_64)
+license=('LGPL' 'MPL')
+url="http://cairographics.org/"
+depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
+makedepends=('librsvg' 'poppler-glib' 'libspectre') # 'libdrm')
+optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
+options=('!libtool')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
+        cairo-1.10.0-buggy_gradients.patch)
+md5sums=('e6c85575ba7094f88b637bdfd835a751'
+         '9b323790dab003e228c6955633cb888e')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--disable-static \
+	--enable-tee \
+	--enable-xlib-xcb \
+	# --enable-test-surfaces \ takes ages
+	#--enable-drm # breaks build
+  make
+}
+
+#check() {
+#  cd "$srcdir/$pkgname-$pkgver"
+#  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped
+#}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/testing/cairo/cairo-1.10.0-buggy_gradients.patch b/testing/cairo/cairo-1.10.0-buggy_gradients.patch
new file mode 100644
index 000000000..368e356d3
--- /dev/null
+++ b/testing/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;
diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD
index a96408632..5257a03b6 100644
--- a/testing/e2fsprogs/PKGBUILD
+++ b/testing/e2fsprogs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151655 2012-02-29 19:29:13Z ronald $
+# $Id: PKGBUILD 154926 2012-03-31 08:27:07Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org> 
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=e2fsprogs
-pkgver=1.42.1
+pkgver=1.42.2
 pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk
         'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
 install=${pkgname}.install
-sha1sums=('c25c73de98737b5f6fb9debec36bfb6416b0ac07'
+sha1sums=('bfba3716b78310cf2a288909f13214a718d91e25'
           'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
 
 build() {
diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD
index 54dc69ec4..d4878172e 100644
--- a/testing/iptables/PKGBUILD
+++ b/testing/iptables/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154240 2012-03-24 13:43:51Z ronald $
+# $Id: PKGBUILD 154924 2012-03-31 08:15:52Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
-pkgver=1.4.12.2
-pkgrel=3
+pkgver=1.4.13
+pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -24,7 +24,7 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta
         empty-raw.rules
         empty-security.rules)
 backup=(etc/conf.d/iptables)
-sha1sums=('4dc8cdf1b711b23ed88eaaaa0e0e157d2bf2d81c'
+sha1sums=('bf1f1896e052d1813a7c96fa70f88be8dab3ff86'
           '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
           '2db68906b603e5268736f48c8e251f3a49da1d75'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
@@ -51,7 +51,8 @@ build() {
      --with-xtlibdir=/usr/lib/iptables \
      --enable-devel --enable-libipq \
      --enable-shared --enable-static 
-# build fails when not enabling static, see if we can remove it on next build
+# build fails when not enabling static, see if we can remove it on next build 
+# 1.4.13 still fails
 
   make
 }
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
index 8ceaba4b4..090d798f0 100644
--- a/testing/ruby/PKGBUILD
+++ b/testing/ruby/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=ruby
 pkgver=1.9.3_p125
-pkgrel=1
+pkgrel=3
 pkgdesc='An object-oriented language for quick and easy programming'
 arch=('i686' 'x86_64')
 url='http://www.ruby-lang.org/en/'
@@ -21,7 +21,7 @@ options=('!emptydirs' '!makeflags')
 install='ruby.install'
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('341b8fc42aa18bd668314199f219db14'
+md5sums=('702529a7f8417ed79f628b77d8061aa5'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD
index 5764faa47..ec72f28f7 100644
--- a/testing/xorg-server/PKGBUILD
+++ b/testing/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152190 2012-03-05 06:05:59Z andyrtr $
+# $Id: PKGBUILD 154933 2012-03-31 09:51:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.0
+pkgver=1.12.0.901
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -20,9 +20,9 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('5f48db767f71e9f58ded6ff356f3b8340820e524'
-          'f19658773d3fa4dc468bb28f9f01866acce71540'
-          '962fecc159c128728f14e8ba231c5b00391ff4ac'
+sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7'
+          '63836e5cfb4ae7353fb2e31239a544409c7ead32'
+          '175de5630b43dbc97778adfba5563b7fdd77f11f'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
           '993798f3d22ad672d769dae5f48d1fa068d5578f')
diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch
index 9ed9b7aee..6d5220ac7 100644
--- a/testing/xorg-server/autoconfig-nvidia.patch
+++ b/testing/xorg-server/autoconfig-nvidia.patch
@@ -1,11 +1,11 @@
 diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
 --- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
 +++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1111,7 +1111,23 @@
- 	{
- 	    int idx = 0;
+@@ -1144,7 +1144,23 @@
+         int idx = 0;
+ 
  #ifdef __linux__
--	    driverList[idx++] = "nouveau";
+-        driverList[idx++] = "nouveau";
 +	    switch (dev->device_id)
 +		{
 +		/* NV1 */
@@ -24,5 +24,5 @@ diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-serve
 +		    break;
 +		}
  #endif
- 	    driverList[idx++] = "nv";
- 	    break;
+         driverList[idx++] = "nv";
+         break;
diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch
index d936efaaa..0b50049db 100644
--- a/testing/xorg-server/autoconfig-sis.patch
+++ b/testing/xorg-server/autoconfig-sis.patch
@@ -1,10 +1,12 @@
 --- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
 +++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1140,7 +1140,15 @@
- 		    driverList[0] = "savage"; break;
- 	    }
- 	    break;
--	case 0x1039:		    driverList[0] = "sis";	break;
+@@ -1200,9 +1200,15 @@
+             break;
+         }
+         break;
+-    case 0x1039:
+-        driverList[0] = "sis";
+-        break;
 +	case 0x1039:
 +	    switch (dev->device_id)
 +	    {
@@ -14,6 +16,6 @@
 +		    driverList[0] = "sis"; break;
 +	    }
 +	    break;
- 	case 0x126f:		    driverList[0] = "siliconmotion"; break;
- 	case 0x121a:
- 	    if (dev->device_id < 0x0003)
+     case 0x126f:
+         driverList[0] = "siliconmotion";
+         break;