[arch-commits] Commit in xorg-server/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, November 29, 2009 @ 14:28:52
  Author: jgc
Revision: 59980

Merged revisions 59978 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk

........
  r59978 | jgc | 2009-11-29 20:22:25 +0100 (Sun, 29 Nov 2009) | 3 lines
  
  upgpkg: xorg-server 1.7.2-1
      Update to 1.7.2 final
  Remove the 2 nvidia patches, the commit causing the need for these patches has been reverted in this release
........

Modified:
  xorg-server/repos/extra-x86_64/	(properties)
  xorg-server/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)


Property changes on: xorg-server/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-59245
   + /xorg-server/trunk:1-59979

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-29 19:22:43 UTC (rev 59979)
+++ extra-x86_64/PKGBUILD	2009-11-29 19:28:52 UTC (rev 59980)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.7.1.902
+pkgver=1.7.2
 pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -18,17 +18,13 @@
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
         xorg-redhat-die-ugly-pattern-die-die-die.patch
-        xserver-1.7.1-window-pictures.patch
-        xserver-1.7.1-nvidia-performance.patch
         xserver-1.7.1-libcrypto.patch
         xserver-1.7.1-sigaction.patch
         xserver-1.7.1-gamma-kdm-fix.patch
         xvfb-run
         xvfb-run.1)
-md5sums=('024dcbbcd617f76ee091fa383eea3202'
+md5sums=('5c087e0f555203065fd90d02ef5f736e'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '01507da1a18737a3a9202fbd00213f4c'
-         'd5c6e2de2e15bcff98d69f4772ee09ac'
          '957d429cad03ac87281b7e40d963497c'
          '9de9025a8c93b57188fce137b3262d1e'
          '8eae23916552e609c36ecae1827c2e9d'
@@ -40,12 +36,6 @@
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return  1
 
-  # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-window-pictures.patch?view=log
-  patch -Np1 -i "${srcdir}/xserver-1.7.1-window-pictures.patch" || return 1
-
-  # http://lists.x.org/archives/xorg-devel/2009-November/003569.html
-  patch -Np1 -i "${srcdir}/xserver-1.7.1-nvidia-performance.patch" || return 1
-
   # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1