Sun Jul 29 00:03:59 UTC 2012

22 files changed, 440 insertions, 69 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 81d2bf0ed..4572d53c6 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162542 2012-06-27 12:21:57Z andrea $
+# $Id: PKGBUILD 164230 2012-07-28 01:31:18Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -31,7 +31,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
              'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
              'kdegraphics-okular' 'gsl' 'kdeedu-marble'
              'libwpd' 'libwpg' 'pstoedit' 'glew'
-             'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
+             'fftw' 'opengtl' 'lcms2' 'libkdcraw')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('469d639f17e3d6a186baabd899147e39')
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index 1f288045d..62fe72ae8 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 161992 2012-06-18 07:10:44Z ronald $
+# $Id: PKGBUILD 164220 2012-07-27 18:35:04Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libktorrent
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A BitTorrent protocol implementation"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org/"
 license=('GPL2')
 depends=('kdelibs')
 makedepends=('automoc4' 'cmake' 'boost' 'doxygen')
-source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2")
-sha1sums=('857e4227c4bba685755d66581d881f893f6311ae')
+source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2"
+	"magnet.patch")
+sha1sums=('857e4227c4bba685755d66581d881f893f6311ae'
+          'f0156489364e5590b0b539cfe2abc929c1922ef8')
 
 build() {
   cd "${srcdir}"
+
+  pushd ${pkgname}-${pkgver}-2
+  patch -Np1 -i ${srcdir}/magnet.patch
+  popd
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver}-2 \
diff --git a/extra/libktorrent/magnet.patch b/extra/libktorrent/magnet.patch
new file mode 100644
index 000000000..5db76c101
--- /dev/null
+++ b/extra/libktorrent/magnet.patch
@@ -0,0 +1,226 @@
+commit 5107e4b7a050d7533f44801f5f5f5694203fd3b5
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date:   Wed Jul 11 20:16:43 2012 +0200
+
+    Make sure all trackers are used of a magnet link
+    
+    BUG: 302997
+    BUG: 303269
+
+diff --git a/src/magnet/magnetlink.cpp b/src/magnet/magnetlink.cpp
+index 525bfa5..43168dc 100644
+--- a/src/magnet/magnetlink.cpp
++++ b/src/magnet/magnetlink.cpp
+@@ -19,13 +19,14 @@
+  ***************************************************************************/
+ 
+ #include "magnetlink.h"
++#include <QUrl>
+ #include <QStringList>
+ #include <util/log.h>
+ #include <util/error.h>
+ 
+ namespace bt
+ {
+-	
++
+ 	MagnetLink::MagnetLink()
+ 	{
+ 	}
+@@ -44,7 +45,7 @@ namespace bt
+ 	{
+ 		parse(mlink);
+ 	}
+-	
++
+ 	MagnetLink::~MagnetLink()
+ 	{
+ 	}
+@@ -64,83 +65,114 @@ namespace bt
+ 	{
+ 		return info_hash == mlink.infoHash();
+ 	}
+-	
++
++	static KUrl::List GetTrackers(const KUrl & url)
++	{
++		KUrl::List result;
++		const QString encoded_query = QString::fromLatin1(url.encodedQuery());
++		const QString item = QLatin1String("tr=");
++		if(encoded_query.length() <= 1)
++			return result;
++
++		const QStringList items = encoded_query.split(QString(QLatin1Char('&')), QString::SkipEmptyParts);
++		const int len = item.length();
++		for(QStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
++		{
++			if((*it).startsWith(item))
++			{
++				if((*it).length() > len)
++				{
++					QString str = (*it).mid(len);
++					str.replace(QLatin1Char('+'), QLatin1Char(' '));   // + in queries means space.
++					result.push_back(QUrl::fromPercentEncoding(str.toLatin1()));
++				}
++			}
++		}
++
++		return result;
++	}
++
+ 	void MagnetLink::parse(const QString& mlink)
+ 	{
+ 		KUrl url(mlink);
+-		if (url.protocol() != "magnet")
++		if(url.protocol() != "magnet")
+ 		{
+-			Out(SYS_GEN|LOG_NOTICE) << "Invalid protocol of magnet link "
+-				<< mlink << endl;
++			Out(SYS_GEN | LOG_NOTICE) << "Invalid protocol of magnet link "
++			                          << mlink << endl;
+ 			return;
+ 		}
+-		
++
+ 		torrent_url = url.queryItem("to");
+ 		//magnet://description-of-content.btih.HASH(-HASH)*.dht/path/file?x.pt=&x.to=
+ 
+ 		// TODO automatically select these files and prefetches from here
+ 		path = url.queryItem("pt");
+-		if ( path.isEmpty() && url.hasPath() && url.path() != "/" ) {
++		if(path.isEmpty() && url.hasPath() && url.path() != "/")
++		{
+ 			// TODO find out why RemoveTrailingSlash does not work
+ 			path = url.path(KUrl::RemoveTrailingSlash).remove(QRegExp("^/"));
+ 		}
+ 
+ 		QString xt = url.queryItem("xt");
+-		if ( xt.isEmpty()
+-		     || !xt.startsWith("urn:btih:") ) {
++		if(xt.isEmpty()
++		        || !xt.startsWith("urn:btih:"))
++		{
+ 			QRegExp btihHash("([^\\.]+).btih");
+-			if ( btihHash.indexIn(url.host()) != -1 ) {
++			if(btihHash.indexIn(url.host()) != -1)
++			{
+ 				QString primaryHash = btihHash.cap(1).split("-")[0];
+-				xt = "urn:btih:"+primaryHash;
+-			} else {
+-				Out(SYS_GEN|LOG_NOTICE) << "No hash found in magnet link "
+-					<< mlink << endl;
++				xt = "urn:btih:" + primaryHash;
++			}
++			else
++			{
++				Out(SYS_GEN | LOG_NOTICE) << "No hash found in magnet link "
++				                          << mlink << endl;
+ 				return;
+ 			}
+ 		}
+-		
++
+ 		QString ih = xt.mid(9);
+-		if (ih.length() != 40 && ih.length() != 32)
++		if(ih.length() != 40 && ih.length() != 32)
+ 		{
+-			Out(SYS_GEN|LOG_NOTICE) << "Hash has not valid length in magnet link "
+-				<< mlink << endl;
++			Out(SYS_GEN | LOG_NOTICE) << "Hash has not valid length in magnet link "
++			                          << mlink << endl;
+ 			return;
+ 		}
+-		
++
+ 		try
+ 		{
+-			if (ih.length() == 32)
++			if(ih.length() == 32)
+ 				ih = base32ToHexString(ih);
+ 
+ 			Uint8 hash[20];
+-			memset(hash,0,20);
+-			for (int i = 0;i < 20;i++)
++			memset(hash, 0, 20);
++			for(int i = 0; i < 20; i++)
+ 			{
+-				Uint8 low = charToHex(ih[2*i + 1]);
+-				Uint8 high = charToHex(ih[2*i]);
++				Uint8 low = charToHex(ih[2 * i + 1]);
++				Uint8 high = charToHex(ih[2 * i]);
+ 				hash[i] = (high << 4) | low;
+ 			}
+-			
++
+ 			info_hash = SHA1Hash(hash);
+-			tracker_urls = url.queryItem("tr").split(",");
++			tracker_urls = GetTrackers(url);
+ 			name = url.queryItem("dn");
+ 			magnet_string = mlink;
+ 		}
+-		catch (...)
++		catch(...)
+ 		{
+-			Out(SYS_GEN|LOG_NOTICE) << "Invalid magnet link " << mlink << endl;
++			Out(SYS_GEN | LOG_NOTICE) << "Invalid magnet link " << mlink << endl;
+ 		}
+ 	}
+-	
++
+ 	Uint8 MagnetLink::charToHex(const QChar& ch)
+ 	{
+-		if (ch.isDigit())
++		if(ch.isDigit())
+ 			return ch.digitValue();
+-		
+-		if (!ch.isLetter())
++
++		if(!ch.isLetter())
+ 			throw bt::Error("Invalid char");
+-		
+-		if (ch.isLower())
++
++		if(ch.isLower())
+ 			return 10 + ch.toAscii() - 'a';
+ 		else
+ 			return 10 + ch.toAscii() - 'A';
+@@ -155,28 +187,28 @@ namespace bt
+ 		QString str = s.toUpper();
+ 		// 32 base32 chars -> 40 hex chars
+ 		// 4 base32 chars -> 5 hex chars
+-		for (int i = 0; i < 8; i++)
++		for(int i = 0; i < 8; i++)
+ 		{
+ 			part = 0;
+-			for (int j = 0; j < 4; j++)
++			for(int j = 0; j < 4; j++)
+ 			{
+-				ch = str[i*4 + j];
+-				if (ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7))
++				ch = str[i * 4 + j];
++				if(ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7))
+ 					throw bt::Error("Invalid char");
+ 
+-				if (ch.isDigit())
+-					 tmp = ch.digitValue() + 24;
++				if(ch.isDigit())
++					tmp = ch.digitValue() + 24;
+ 				else
+ 					tmp = ch.toAscii() - 'A';
+-				part = part + (tmp << 5*(3-j));
++				part = part + (tmp << 5 * (3 - j));
+ 			}
+ 
+ 			// part is a Uint32 with 20 bits (5 hex)
+-			for (int j = 0; j < 5; j++)
++			for(int j = 0; j < 5; j++)
+ 			{
+-				tmp = (part >> 4*(4-j)) & 0xf;
+-				if (tmp >= 10)
+-					ret.append(QChar((tmp-10) + 'a'));
++				tmp = (part >> 4 * (4 - j)) & 0xf;
++				if(tmp >= 10)
++					ret.append(QChar((tmp - 10) + 'a'));
+ 				else
+ 					ret.append(QChar(tmp + '0'));
+ 			}
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 8098226b9..d1b6423c1 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163810 2012-07-20 10:44:25Z giovanni $
+# $Id: PKGBUILD 164191 2012-07-27 09:30:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.07.18
+pkgver=2012.07.26
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('71e6624ed5114b8f9199500c01bef569')
+md5sums=('18374e9f6681f62ab7c987ca0029d494')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index bda0215b7..6cdba928d 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163205 2012-07-09 20:33:57Z eric $
+# $Id: PKGBUILD 164185 2012-07-27 04:44:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.14.3
+pkgver=1.14.4
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
 provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('c3cd800121bccf15d8fc31a30575a5dce8aaa5d5'
-          '32f4a507aed62c038b1620c938c8001b3a9b04b5')
+sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe'
+          '28ab232dd9bcec8bbb00026cc60960b719d14fed')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 81c6953e0..824ab623b 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 138131 2011-09-17 03:10:10Z allan $
+# $Id: PKGBUILD 164237 2012-07-28 03:14:33Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('custom')
 url="http://numpy.scipy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
 source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('2bce18c08fc4fce461656f0f4dd9103e')
+md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index 1b46c03c9..1db6ebb39 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161459 2012-06-11 18:14:33Z andrea $
+# $Id: PKGBUILD 164200 2012-07-27 14:43:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fa48134361f955704700d211fdd3489ca58dc9c5')
+sha1sums=('e549047634dfd6366def2be143b06e01bee8c159')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index e1bf6312b..1ec4095bd 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161460 2012-06-11 18:15:04Z andrea $
+# $Id: PKGBUILD 164201 2012-07-27 14:44:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d672826fac18817ec115aa0c52831e2c7761cade')
+sha1sums=('04563bda017dacfb8a1e2c8f0e39adb47269fd47')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index 25c8398ef..ca61be34c 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161461 2012-06-11 18:15:34Z andrea $
+# $Id: PKGBUILD 164202 2012-07-27 14:45:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a0158322f96a1f0356fdb9f1713af19ac4e45b8e')
+sha1sums=('534ac05deacac0e9fb8a281813d6316b08ce8933')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-call-ui/PKGBUILD b/extra/telepathy-kde-call-ui/PKGBUILD
index de3bd0d50..c65e1dd7c 100644
--- a/extra/telepathy-kde-call-ui/PKGBUILD
+++ b/extra/telepathy-kde-call-ui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161457 2012-06-11 18:11:28Z andrea $
+# $Id: PKGBUILD 164203 2012-07-27 14:45:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-call-ui
 _pkgname=ktp-call-ui
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Voice/Video Call UI for Telepathy"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qt-gstreamer')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('be6bcaecde4091cad41520f203c559b614416bc6')
+sha1sums=('e6cadf3bb6820ff015e49801a3b0196827dd9ab3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index cd4ca8b2b..80aa72d4c 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161462 2012-06-11 18:16:00Z andrea $
+# $Id: PKGBUILD 164213 2012-07-27 14:57:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('db3bdbd93a27c77a1e593e84252cf2950ca773e6')
+sha1sums=('9acb65efa371ba4f23063bc83ea7a488ac73e4b7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD
index 2dce5c0ca..fce1f193c 100644
--- a/extra/telepathy-kde-contact-applet/PKGBUILD
+++ b/extra/telepathy-kde-contact-applet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161463 2012-06-11 18:16:32Z andrea $
+# $Id: PKGBUILD 164204 2012-07-27 14:46:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-applet
 _pkgname=ktp-contact-applet
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="The KDE-Telepathy contact plasmoid"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bffa7ed930519c574d25a59917219fa1735b6a2e')
+sha1sums=('7cb95c4a9dd3a8b5ebe8775f3d846d4d4a31af60')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 3e3e17a99..e7c38626f 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161464 2012-06-11 18:17:00Z andrea $
+# $Id: PKGBUILD 164205 2012-07-27 14:46:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a9f059f434adec33f57e2a77444d704ae8563bc2')
+sha1sums=('d9d062316f9eaff49f2fcad1ba2bbdf59dc8cc07')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index 7de5e78f6..44dba3e72 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161458 2012-06-11 18:12:10Z andrea $
+# $Id: PKGBUILD 164206 2012-07-27 14:47:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fe7f7d37740b732f8618b1e6129d4e7f30998b43')
+sha1sums=('388ebb2933114b7e0844bf6a8e71e5b7fdab3680')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 0cc1daa41..b5a7dc692 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161465 2012-06-11 18:17:36Z andrea $
+# $Id: PKGBUILD 164207 2012-07-27 14:49:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f318849c4e8a171bff97defc19b7a94f2ee13512')
+sha1sums=('bb618e3fc36b321bfe5aaa7a0f8531b4c7fe25c2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index 38ca70d3b..62e802bef 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161466 2012-06-11 18:18:05Z andrea $
+# $Id: PKGBUILD 164208 2012-07-27 14:50:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('552d02b237ac167aef4707fd599dfb69cd944a72')
+sha1sums=('a4bfe983db21ea7d56436d0426138215eb77b279')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD
index e0b15aa96..966169d17 100644
--- a/extra/telepathy-kde-presence-applet/PKGBUILD
+++ b/extra/telepathy-kde-presence-applet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161467 2012-06-11 18:18:34Z andrea $
+# $Id: PKGBUILD 164209 2012-07-27 14:52:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-presence-applet
 _pkgname=ktp-presence-applet
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Plasma applet for managing your Telepathy account presence"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('beb12d534492da288cdda1826b43ba5bcd549fee')
+sha1sums=('392758b5ced3eea0f315c9dabacc1f3e421a8171')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 839ae7c71..cd5bdb322 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161468 2012-06-11 18:19:00Z andrea $
+# $Id: PKGBUILD 164216 2012-07-27 15:10:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c72f5a9e26ba24b6558a8dab6d0ec2694aa55afc')
+sha1sums=('23aa731d15dff440da587dec359e7298ec0a0895')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index b921c2fb2..397bb8cfd 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161470 2012-06-11 18:19:34Z andrea $
+# $Id: PKGBUILD 164212 2012-07-27 14:57:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4ddf762b928d7e5f1139cdcced27a866c5369312')
+sha1sums=('8e32e8708d7283714ad6e999caf07388472bba38')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index 4fd8b64d8..ecac89959 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153613 2012-03-16 17:12:24Z andyrtr $
+# $Id: PKGBUILD 164195 2012-07-27 14:22:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
-pkgver=1.7.2
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae')
+sha256sums=('075fdc392e69b7aefae9f032785bb28e74fa45e865d2cfd67cdd6482580e3fdf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 342454cfc..caade620d 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164055 2012-07-25 15:11:19Z andyrtr $
+# $Id: PKGBUILD 164223 2012-07-27 19:15:17Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.1
-pkgrel=3
+pkgver=2.20.2
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -18,17 +18,13 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        gmux_backlight.diff
-        sna_backlight_fixes.diff)
-sha256sums=('de340a527dfa26bba6f79b423c2fe2b1d70657e46fa3fb468613c047443ff424'
-            '87383122dae69512f86039e9d72110bd6bf4cf717756a31b34862c200277b31b'
-            'a4a6bc1c4a6b79c80c56764eed8ab318a587ed554d5d9a381cc7238ab884ec04')
+        fix_gen4.diff)
+sha256sums=('4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9'
+            '0c5b98e4980c8108aee12b1e46a78c23029034439dcd277f8ae1264ca3fff8a4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # https://bugs.freedesktop.org/show_bug.cgi?id=52423
-  patch -Np1 -i ${srcdir}/gmux_backlight.diff
-  patch -Np1 -i ${srcdir}/sna_backlight_fixes.diff
+  patch -Np1 -i ${srcdir}/fix_gen4.diff
   ./configure --prefix=/usr \
     --enable-dri
   make
diff --git a/extra/xf86-video-intel/fix_gen4.diff b/extra/xf86-video-intel/fix_gen4.diff
new file mode 100644
index 000000000..87a2fa8db
--- /dev/null
+++ b/extra/xf86-video-intel/fix_gen4.diff
@@ -0,0 +1,142 @@
+From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 27 Jul 2012 11:43:00 +0000
+Subject: sna/gen4: Further refinement to the GT allocation
+
+Still hunting for why gen4 fails utterly.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
+index 25229e1..1a860bd 100644
+--- a/src/sna/gen4_render.c
++++ b/src/sna/gen4_render.c
+@@ -79,8 +79,8 @@
+ #define URB_CS_ENTRY_SIZE     1
+ #define URB_CS_ENTRIES	      0
+ 
+-#define URB_VS_ENTRY_SIZE     1	// each 512-bit row
+-#define URB_VS_ENTRIES	      32	// we needs at least 8 entries
++#define URB_VS_ENTRY_SIZE     1
++#define URB_VS_ENTRIES	      32
+ 
+ #define URB_GS_ENTRY_SIZE     0
+ #define URB_GS_ENTRIES	      0
+@@ -89,25 +89,24 @@
+ #define URB_CLIP_ENTRIES      0
+ 
+ #define URB_SF_ENTRY_SIZE     2
+-#define URB_SF_ENTRIES	      8
++#define URB_SF_ENTRIES	      64
+ 
+ /*
+  * this program computes dA/dx and dA/dy for the texture coordinates along
+  * with the base texture coordinate. It was extracted from the Mesa driver
+  */
+ 
+-#define SF_KERNEL_NUM_GRF  16
+-
+-#define PS_KERNEL_NUM_GRF   32
++#define SF_KERNEL_NUM_GRF 16
++#define PS_KERNEL_NUM_GRF 32
+ 
+ static const struct gt_info {
+ 	uint32_t max_sf_threads;
+ 	uint32_t max_wm_threads;
+ 	uint32_t urb_size;
+ } gen4_gt_info = {
+-	16, 32, 256,
++	24, 32, 256,
+ }, g4x_gt_info = {
+-	32, 50, 384,
++	24, 50, 384,
+ };
+ 
+ static const uint32_t sf_kernel[][4] = {
+@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna,
+ 		const struct sna_composite_op *op,
+ 		uint16_t wm_binding_table)
+ {
++	gen4_emit_drawing_rectangle(sna, op);
+ 	gen4_emit_binding_table(sna, wm_binding_table);
+ 	gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
+ 	gen4_emit_vertex_elements(sna, op);
+-	gen4_emit_drawing_rectangle(sna, op);
+ 
+ 	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
+ 		DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
+--
+cgit v0.9.0.2-2-gbebe
+From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 27 Jul 2012 12:24:04 +0000
+Subject: sna/gen4: Move the common vertex_offset==0 check into the flush()
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
+index 1a860bd..58d4422 100644
+--- a/src/sna/gen4_render.c
++++ b/src/sna/gen4_render.c
+@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna,
+ 
+ static void gen4_vertex_flush(struct sna *sna)
+ {
+-	assert(sna->render_state.gen4.vertex_offset);
++	if (sna->render_state.gen4.vertex_offset == 0)
++		return;
+ 
+ 	DBG(("%s[%x] = %d\n", __FUNCTION__,
+ 	     4*sna->render_state.gen4.vertex_offset,
+@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna)
+ 
+ 	bo = sna->render.vbo;
+ 	if (bo) {
+-		if (sna->render_state.gen4.vertex_offset)
+-			gen4_vertex_flush(sna);
++		gen4_vertex_flush(sna);
+ 
+ 		for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
+ 			if (sna->render.vertex_reloc[i]) {
+@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna,
+ 	}
+ 	priv->clear = false;
+ 
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ 	return true;
+ }
+ 
+@@ -2693,8 +2692,7 @@ fastcall static void
+ gen4_render_composite_spans_done(struct sna *sna,
+ 				 const struct sna_composite_spans_op *op)
+ {
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ 
+ 	DBG(("%s()\n", __FUNCTION__));
+ 
+@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna,
+ static void
+ gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
+ {
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ }
+ 
+ static bool
+@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna,
+ static void
+ gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op)
+ {
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ 	kgem_bo_destroy(&sna->kgem, op->base.src.bo);
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe