[arch-commits] Commit in xorg-server/trunk (PKGBUILD xserver-1.7.1-libcrypto.patch)

[andyrtr at archlinux.org]

    Date: Thursday, March 18, 2010 @ 13:58:09
  Author: andyrtr
Revision: 72596

upgpkg: xorg-server 1.7.6-1
1.7.6

Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/xserver-1.7.1-libcrypto.patch

-------------------------------+
 PKGBUILD                      |   12 ++++++------
 xserver-1.7.1-libcrypto.patch |    9 ---------
 2 files changed, 6 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-18 17:55:48 UTC (rev 72595)
+++ PKGBUILD	2010-03-18 17:58:09 UTC (rev 72596)
@@ -2,14 +2,14 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.7.5.902
-pkgrel=2
+pkgver=1.7.6
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.14' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.6' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0')
-makedepends=('libx11>=1.3' 'mesa>=7.7-3' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'libgl>=7.7' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2' 'recordproto')
+depends=('hal>=0.5.14' 'libgl>=7.7.0.901' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.6' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0')
+makedepends=('libx11>=1.3' 'mesa>=7.7.0.901' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'libgl>=7.7' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2' 'recordproto')
 conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 'xf86-input-elo2300'
 	'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-legacy' 'nvidia-96xx-utils<96.43.14' 'nvidia-173xx-utils<173.14.21')
 options=('!libtool')
@@ -22,9 +22,9 @@
         xserver-1.7.1-gamma-kdm-fix.patch
         xvfb-run
         xvfb-run.1)
-md5sums=('47adb90279d3383cca2740cb31cb6510'
+md5sums=('178225f499ec10fa9d312d1c339e6a39'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
-         'd03e03250bde69129d8b72382714b434'
+         '4168867c4666a039d6367ee09e3208cb'
          '8eae23916552e609c36ecae1827c2e9d'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b')

Modified: xserver-1.7.1-libcrypto.patch
===================================================================
--- xserver-1.7.1-libcrypto.patch	2010-03-18 17:55:48 UTC (rev 72595)
+++ xserver-1.7.1-libcrypto.patch	2010-03-18 17:58:09 UTC (rev 72596)
@@ -30,12 +30,3 @@
  fi
  
  PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
-@@ -1326,7 +1326,7 @@
- #
- XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
- XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
--XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
-+XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"
- AC_SUBST([XSERVER_LIBS])
- AC_SUBST([XSERVER_SYS_LIBS])
-