From 483f7de4ab6a706517279a24d2efc969f4a1996d Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 28 May 2012 17:43:57 +0000
Subject: Mon May 28 17:43:57 UTC 2012

---
 testing/xorg-server/PKGBUILD | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'testing/xorg-server')

diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD
index 8fb50f2c1..4975aadaa 100644
--- a/testing/xorg-server/PKGBUILD
+++ b/testing/xorg-server/PKGBUILD
@@ -1,34 +1,32 @@
-# $Id: PKGBUILD 159193 2012-05-17 14:38:12Z andyrtr $
+# $Id: PKGBUILD 159996 2012-05-27 13:11:29Z dreisner $
 # 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.1.901
-pkgrel=3
+pkgver=1.12.1.902
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
 makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
              'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
              'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt')
+             'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
-        EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
-        git-fixes.patch
+        #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+        #git-fixes.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('bb9985bae271aa896de7fa12e49a0dbd8e244d2c'
-          '63836e5cfb4ae7353fb2e31239a544409c7ead32'
-          '175de5630b43dbc97778adfba5563b7fdd77f11f'
-          '4acb39587f73bcbb9a331377d6ef99cb73eb95a8'
-          '526cbffbc742dc3449065e3501d290a607d80aa3'
-          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
-          '6838fc00ef4618c924a77e0fb03c05346080908a'
-          '993798f3d22ad672d769dae5f48d1fa068d5578f')
+sha256sums=('052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509'
+            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
+            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -45,7 +43,7 @@ build() {
 #  patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
 
   # Add post-release patches from 1.12 branch
-  patch -Np1 -i ${srcdir}/git-fixes.patch
+#  patch -Np1 -i ${srcdir}/git-fixes.patch
 
   autoreconf -fi
   ./configure --prefix=/usr \
-- 
cgit v1.2.3-54-g00ecf