Thu Apr 12 00:01:12 UTC 2012

15 files changed, 178 insertions, 51 deletions

diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 1a955558f..77e51d5ba 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152198 2012-03-05 08:55:37Z ibiru $
+# $Id: PKGBUILD 155962 2012-04-10 08:20:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('54e0556d73c22c7b3393069071e0b717')
+md5sums=('c73bb835057a3ee07d37a4f7daaf7ecf')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index a3b1e81c6..b56951402 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 151264 2012-02-25 10:26:10Z giovanni $
+# $Id: PKGBUILD 155990 2012-04-10 22:28:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10765
+pkgver=10771
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('62d408a9e524452ebf51e807122320b0')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
+        'gcc4.7.patch')
+md5sums=('0439a71048c7dbdf912d19979dc0faad'
+         '0498a6795f4ac3a3e8bbcf51a5026820')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
+  # Fix gcc-4.7 build
+  patch -Np1 -i "${srcdir}/gcc4.7.patch"
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --enable-cas \
diff --git a/extra/amule/gcc4.7.patch b/extra/amule/gcc4.7.patch
new file mode 100644
index 000000000..2bfcbe057
--- /dev/null
+++ b/extra/amule/gcc4.7.patch
@@ -0,0 +1,19 @@
+--- a/src/ObservableQueue.h	2011-11-20 19:08:59.000000000 +0100
++++ b/src/ObservableQueue.h	2012-04-11 00:06:28.000000000 +0200
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index c1869b9de..8cebe45ec 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143721 2011-11-28 17:06:53Z giovanni $
+# $Id: PKGBUILD 155988 2012-04-10 20:46:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
 pkgname=crypto++
 pkgver=5.6.1
 _srcver=561
-pkgrel=3
+pkgrel=4
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('i686' 'x86_64')
 url="http://www.cryptopp.com/"
@@ -16,13 +16,18 @@ license=('custom')
 depends=('gcc-libs')
 makedepends=('unzip')
 source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
-        'libcrypto++.pc')
+        'libcrypto++.pc'
+        'gcc4.7.patch')
 md5sums=('96cbeba0907562b077e26bcffb483828'
-         '2337c6edbc552d9142cae8e0854715e7')
+         '2337c6edbc552d9142cae8e0854715e7'
+         'cf26a783d9432e7f9ab7f14d3db3f196')
 
 build() {
   cd ${srcdir}
 
+  # Fix gcc 4.7 build
+  patch -Np1 -i "${srcdir}/gcc4.7.patch"
+
   sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
   export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
   make -f GNUmakefile  
diff --git a/extra/crypto++/gcc4.7.patch b/extra/crypto++/gcc4.7.patch
new file mode 100644
index 000000000..55d5a0a0a
--- /dev/null
+++ b/extra/crypto++/gcc4.7.patch
@@ -0,0 +1,97 @@
+--- a/algebra.cpp	2010-08-06 18:44:32.000000000 +0200
++++ b/algebra.cpp	2012-04-10 13:16:53.000000000 +0200
+@@ -58,7 +58,7 @@
+ 	Element g[3]={b, a};
+ 	unsigned int i0=0, i1=1, i2=2;
+ 
+-	while (!Equal(g[i1], this->Identity()))
++	while (!this->Equal(g[i1], this->Identity()))
+ 	{
+ 		g[i2] = Mod(g[i0], g[i1]);
+ 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
+--- a/eccrypto.cpp	2010-08-06 18:44:28.000000000 +0200
++++ b/eccrypto.cpp	2012-04-10 13:19:36.000000000 +0200
+@@ -435,7 +435,7 @@
+ 	StringSource ssG(param.g, true, new HexDecoder);
+ 	Element G;
+ 	bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable());
+-	SetSubgroupGenerator(G);
++	this->SetSubgroupGenerator(G);
+ 	assert(result);
+ 
+ 	StringSource ssN(param.n, true, new HexDecoder);
+@@ -591,7 +591,7 @@
+ 	if (level >= 2 && pass)
+ 	{
+ 		const Integer &q = GetSubgroupOrder();
+-		Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q);
++		Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q);
+ 		pass = pass && IsIdentity(gq);
+ 	}
+ 	return pass;
+@@ -629,7 +629,7 @@
+ 	typename EC::Point P;
+ 	if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
+ 		BERDecodeError();
+-	SetPublicElement(P);
++	this->SetPublicElement(P);
+ }
+ 
+ template <class EC>
+--- a/eccrypto.h	2010-08-06 18:46:24.000000000 +0200
++++ b/eccrypto.h	2012-04-10 13:23:09.000000000 +0200
+@@ -43,7 +43,7 @@
+ 	void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
+ 	{
+ 		this->m_groupPrecomputation.SetCurve(ec);
+-		SetSubgroupGenerator(G);
++		this->SetSubgroupGenerator(G);
+ 		m_n = n;
+ 		m_k = k;
+ 	}
+@@ -145,9 +145,9 @@
+ 	typedef typename EC::Point Element;
+ 
+ 	void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q)
+-		{this->AccessGroupParameters() = params; SetPublicElement(Q);}
++		{this->AccessGroupParameters() = params; this->SetPublicElement(Q);}
+ 	void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q)
+-		{this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);}
++		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);}
+ 
+ 	// X509PublicKey
+ 	void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
+@@ -166,9 +166,9 @@
+ 	void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x)
+ 		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);}
+ 	void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params)
+-		{GenerateRandom(rng, params);}
++		{this->GenerateRandom(rng, params);}
+ 	void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n)
+-		{GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
++		{this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
+ 
+ 	// PKCS8PrivateKey
+ 	void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
+--- a/secblock.h	2012-04-10 13:25:40.000000000 +0200
++++ b/secblock.h	2012-04-10 13:25:52.000000000 +0200
+@@ -88,7 +88,7 @@
+ 
+ 	pointer allocate(size_type n, const void * = NULL)
+ 	{
+-		CheckSize(n);
++		this->CheckSize(n);
+ 		if (n == 0)
+ 			return NULL;
+ 
+--- a/panama.cpp	2010-08-09 14:22:42.000000000 +0200
++++ b/panama.cpp	2012-04-10 13:50:12.000000000 +0200
+@@ -422,7 +422,7 @@
+ {
+ 	this->ThrowIfInvalidTruncatedSize(size);
+ 
+-	PadLastBlock(this->BLOCKSIZE, 0x01);
++	this->PadLastBlock(this->BLOCKSIZE, 0x01);
+ 	
+ 	HashEndianCorrectedBlock(this->m_data);
+ 
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 9d0e5dc2e..0c973910a 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155741 2012-04-06 00:05:51Z tomegun $
+# $Id: PKGBUILD 155968 2012-04-10 10:51:55Z tomegun $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=gpsd
 pkgver=3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://catb.org/gpsd/"
@@ -54,6 +54,8 @@ package() {
 
   install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
 
+  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
+
   install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
 
   sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 88f03a9ae..2adb5bcc2 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0
+pkgver=0.9.0.1
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha1sums=('6863905534c2c58534992fad197dd794105b8e19')
+sha1sums=('75e16397d00de06947fa183f09632caed11d8857')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index b5b2ab225..a1e059763 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 142730 2011-11-14 08:43:18Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# $Id: PKGBUILD 155974 2012-04-10 15:42:33Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=libfprint
 pkgver=0.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for fingerprint readers"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
@@ -12,9 +13,8 @@ license=(LGPL)
 depends=(libusb nss gdk-pixbuf2)
 groups=(fprint)
 options=(!libtool !emptydirs)
-_snap=$pkgname-48ec64f68330452b011d14be67653f1d48fb1405
+_snap=$pkgname-dfff16f3e32519ad071bdb1233c75bfe3ffa5557
 source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
-md5sums=('858a0f0d7abd21ac494f9bec904dc156')
 
 build() {
   cd "$srcdir/$_snap"
@@ -27,7 +27,5 @@ build() {
 package() {
   cd "$srcdir/$_snap"
   make DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir/lib/udev/rules.d"
-  mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
 }
+md5sums=('aa2fb6b90cf8c53aebd1f0e656dd70c1')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index e7d7fb122..020cd70c2 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 155745 2012-04-06 00:05:58Z tomegun $
+# $Id: PKGBUILD 155970 2012-04-10 11:26:59Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="Library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64")
 url="http://libmtp.sourceforge.net"
 license=('LGPL')
-depends=('libusb')
+depends=('libusb' 'libgcrypt')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6dc708757e3fd3ccce7445b4f2171263')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,3 +24,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('11529eedaf0e1fc00cdd6119eec525f0')
diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD
index 3d396d2bb..4b5bc2e8e 100644
--- a/extra/libpciaccess/PKGBUILD
+++ b/extra/libpciaccess/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libpciaccess
-pkgver=0.13
+pkgver=0.13.1
 pkgrel=1
 pkgdesc="X11 PCI access library"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('pkgconfig' 'xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353')
+sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD
index 4bf09a5c1..05b239f0c 100644
--- a/extra/libupnp/PKGBUILD
+++ b/extra/libupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154277 2012-03-25 09:49:04Z giovanni $
+# $Id: PKGBUILD 155992 2012-04-10 22:40:27Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org> 
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=libupnp
-pkgver=1.6.16
+pkgver=1.6.17
 pkgrel=1
 pkgdesc="Portable Open Source UPnP Development Kit"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1212df3f9ed370a0a94b641578465585')
+md5sums=('efbf0d470ce7157bc0e6ca836e246de5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index ebe106e00..c5f6e4b38 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154124 2012-03-23 16:56:11Z bisson $
+# $Id: PKGBUILD 155966 2012-04-10 09:35:44Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,19 +6,19 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.16.7
-pkgrel=3
+pkgver=0.16.8
+pkgrel=2
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
+         'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
          'libpulse')
 makedepends=('doxygen')
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
         'rc.d') 
-sha1sums=('878f3ce82d4f00f6cbad63a625b2c0274c4a704a'
+sha1sums=('977c80db8dc64e65c2bc523f69a9a7a71adca2b1'
           '3777bdb4fff4b7911be3b1242aabae9d2912ef18')
 
 install=install
@@ -37,7 +37,7 @@ build() {
 		--disable-cue \
 		--disable-sidplay \
 		--disable-documentation \
-		--with-systemdsystemunitdir=/lib/systemd/system
+		--with-systemdsystemunitdir=/usr/lib/systemd/system
 
 	make
 }
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index a5de34c50..35d31c11d 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 154122 2012-03-23 16:53:40Z bisson $
+# $Id: PKGBUILD 155960 2012-04-10 05:23:46Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
 pkgver=2.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
 arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
+depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite' 'libldap' 'db')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index ea6041eac..83693d62f 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153857 2012-03-20 05:18:53Z eric $
+# $Id: PKGBUILD 155972 2012-04-10 13:26:02Z tdziedzic $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=475
-__hgrev=74686ae0b181 	
+_patchlevel=495
+__hgrev=a104dae7f903
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -18,8 +18,8 @@ makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
 source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig}
         pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
         vimrc archlinux.vim gvim.desktop)
-sha1sums=('56529692b35df97e8a0f8610122957ba93033545'
-          'b52b3d290d5a005ace8a8aefa9e1eb0f4cc563e3'
+sha1sums=('4181e211d0150cda9b3dbd815ec4aa14a6d28196'
+          '039f92d62556a7ccc48ef4ded3c5e02578470b05'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index e834caea0..ae765c1c7 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154986 2012-04-01 08:22:31Z andyrtr $
+# $Id: PKGBUILD 155978 2012-04-10 15:57:30Z 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.901
+pkgver=1.12.0.902
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -20,7 +20,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7'
+sha1sums=('75c1ee8d10a2ce6f678deeff23c971e31a212dab'
           '63836e5cfb4ae7353fb2e31239a544409c7ead32'
           '175de5630b43dbc97778adfba5563b7fdd77f11f'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'