From 4aef0a374e20e36cf2bf6e779d93789d9a5791ae Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 10 Dec 2012 02:17:21 -0800
Subject: Mon Dec 10 02:14:35 PST 2012

---
 extra/xorg-server/PKGBUILD | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'extra/xorg-server')

diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 675f07577..136f087ba 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170786 2012-11-11 10:23:23Z andyrtr $
+# $Id: PKGBUILD 173032 2012-12-09 08:33:51Z 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.13.0
-pkgrel=4
+pkgver=1.13.0.902
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -19,25 +19,24 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf
-        git-fixes.patch
+        #git-fixes.patch
         use-pixman-glyph-cache.patch)
-sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
+sha256sums=('7164157ef3b4ef96499526aa6fea85abf7e1416adc2a4a86614dce09fe36fe8f'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            'd49e534b77ead809eb873a1a86cd47c791a8ddd10557bfa635197bba6bc00b71'
             '7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Apply upstream fixes from server-1.13 branch
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
+#  patch -Np1 -i "${srcdir}/git-fixes.patch"
 
   # Use pixman 0.28.0 glyph cache - backported from git master
-  patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch"
+#  patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch"
 
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
-- 
cgit v1.2.3-54-g00ecf