diff options
Diffstat (limited to 'extra')
31 files changed, 744 insertions, 110 deletions
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index f88d2b1e3..d00a37027 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162785 2012-06-30 13:48:37Z bisson $ +# $Id: PKGBUILD 164181 2012-07-27 00:15:23Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.2.4 +pkgver=3.3 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('unzip-libre: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('24aa75e0a15d2327641c81c6ec7ea153a8df1ae0') +sha1sums=('3c006676f1dbc2376c098855b93606da0f58f7ea') provides=('audacious-player') replaces=('audacious-player') @@ -22,7 +22,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --with-buildstamp='Arch Linux' make } diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index b7b6d159c..868f8529b 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162157 2012-06-22 12:58:04Z dreisner $ +# $Id: PKGBUILD 164067 2012-07-26 15:21:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -6,9 +6,9 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P1 -_pkgver=9.9.1-P1 -pkgrel=2 +pkgver=9.9.1.P2 +_pkgver=9.9.1-P2 +pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' url='http://www.isc.org/software/bind/' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' +sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' '18f477f510df31e6c6f547ee2d5fc46e973479bf' '46232e9db243c6c05e170a1781d7a7f413be5d03' 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/cups/PKGBUILD b/extra/cups/PKGBUILD index acb8b9998..7b4633aef 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163972 2012-07-23 03:04:02Z allan $ +# $Id: PKGBUILD 164175 2012-07-26 17:37:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.5.3 -pkgrel=6 +pkgver=1.5.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -22,7 +22,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-systemd-socket.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('e1ad15257aa6f162414ea3beae0c5df8' +md5sums=('de3006e5cf1ee78a9c6145ce62c4e982' '12c8af5bcd3b8f84240280b3dfaf9e89' 'cdc1322c8014297ae349e2db78a03c5a' '1a5112f63958643f2888abc9418dbcac' diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16 index 01faba047..eb8e26473 100644 --- a/extra/cups/PKGBUILD.16 +++ b/extra/cups/PKGBUILD.16 @@ -3,23 +3,23 @@ pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6b1 +pkgver=1.6.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" -makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' - 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') +makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' + 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('468a40755a872d84be89111ce97a69d1' +md5sums=('07157b243dd11e90e3f654c4d62e7c8a' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' - '90c30380d4c8cd48a908cfdadae1ea24' + 'c9159ba1233902ba6ddbbe6885a46b72' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') @@ -40,6 +40,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-logdir=/var/log/cups \ --with-docdir=/usr/share/cups/doc \ --with-cups-user=daemon \ diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index 5b9f23a37..e585b022a 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' 'mips64el') 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/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD index c535d1998..332c26613 100644 --- a/extra/libwacom/PKGBUILD +++ b/extra/libwacom/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 156922 2012-04-23 09:09:07Z ibiru $ +# $Id: PKGBUILD 164253 2012-07-28 20:26:26Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libwacom -pkgver=0.4 +pkgver=0.6 pkgrel=1 pkgdesc="Library to identify Wacom tablets and their features" arch=('x86_64' 'i686' 'mips64el') -depends=('glib2' 'udev') -license=('LGPL') +url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom" +license=('MIT') +depends=('glib2' 'systemd-tools') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -url="http://www.gnome.org" -sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367') +source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2) +sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d') build() { cd $pkgname-$pkgver @@ -19,7 +19,13 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index e4b9e80c0..ba7a8357d 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' 'mips64el') @@ -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 660f9bb1c..9b914ab5d 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' 'mips64el') @@ -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 f981fe205..d6c41b055 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' 'mips64el') @@ -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/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index 08fec228f..cfb2eb890 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -4,23 +4,23 @@ # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=('python-urwid' 'python2-urwid') -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Urwid is a curses-based user interface library." -license=('GPL') +license=('LGPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('python2-distribute' 'python-distribute') url="http://excess.org/urwid/" source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('828f7144b94920205e755c249d2e297f') +md5sums=('00542bbd15fae7ea60b02a7570edee2b') build() { cp -r urwid-$pkgver python2-urwid-$pkgver - cd $srcdir/urwid-$pkgver + cd "$srcdir/urwid-$pkgver" python setup.py build - cd $srcdir/python2-urwid-$pkgver + cd "$srcdir/python2-urwid-$pkgver" sed -i 's#bin/python#bin/python2#' urwid/*.py python2 setup.py build @@ -29,14 +29,14 @@ build() { package_python-urwid() { depends=('python') - cd $srcdir/urwid-$pkgver - python setup.py install --prefix=/usr --root=$pkgdir --optimize=1 + cd "$srcdir/urwid-$pkgver" + python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 } package_python2-urwid() { depends=('python2') - cd $srcdir/python2-urwid-$pkgver - python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1 + cd "$srcdir/python2-urwid-$pkgver" + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 } diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index dfcd8d912..9b2dc021f 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' 'mips64el') @@ -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 0b0c98177..7fcd47904 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' 'mips64el') @@ -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 31a84d65a..47b2a3cb2 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' 'mips64el') @@ -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 a06c1d5a9..b241ad374 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' 'mips64el') @@ -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 6d8b20248..4d3afb092 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' 'mips64el') @@ -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 418a56092..d19c04914 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' 'mips64el') @@ -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 77ec4af2f..2f207c97d 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' 'mips64el') @@ -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 357964a1a..c91123612 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' 'mips64el') @@ -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 01fad98b2..304b50994 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' 'mips64el') @@ -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 c75398e04..b7e4eeb6e 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' 'mips64el') @@ -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 65cfd11d2..5bf965bc6 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' 'mips64el') @@ -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 2cb5721f3..7ee67f097 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' 'mips64el') @@ -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 a378f5b4d..f88943991 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' 'mips64el') @@ -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/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index bf8d65e97..ad9b7dc46 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163013 2012-07-05 13:49:57Z allan $ +# $Id: PKGBUILD 164063 2012-07-26 04:17:07Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind pkgver=3.7.0 -pkgrel=3 +pkgrel=4 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') @@ -13,14 +13,17 @@ depends=('glibc>=2.16' 'glibc<2.17' 'perl') makedepends=('gdb') options=('!emptydirs') source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 - valgrind-3.7.0-glibc-2.16.patch) + valgrind-3.7.0-glibc-2.16.patch + valgrind-3.7.0-supp.patch) md5sums=('a855fda56edf05614f099dca316d1775' - '8362c9c10b8d7d08d1be628a717cfba7') + '8362c9c10b8d7d08d1be628a717cfba7' + '6cf8d3ace0cdc4c7fd69d61ca0692577') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch + patch -Np1 -i ${srcdir}/valgrind-3.7.0-supp.patch if [ "${CARCH}" = "x86_64" ]; then ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit diff --git a/extra/valgrind/valgrind-3.7.0-supp.patch b/extra/valgrind/valgrind-3.7.0-supp.patch new file mode 100644 index 000000000..63a71de0e --- /dev/null +++ b/extra/valgrind/valgrind-3.7.0-supp.patch @@ -0,0 +1,253 @@ +--- valgrind-orig/exp-sgcheck.supp 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/exp-sgcheck.supp 2012-07-12 21:49:58.290123661 +1000 +@@ -1,8 +1,8 @@ + { + ld-2.X possibly applying relocations + exp-sgcheck:SorG +- obj:/*lib*/ld-2.*so* +- obj:/*lib*/ld-2.*so* ++ obj:*/*lib*/ld-2.*so* ++ obj:*/*lib*/ld-2.*so* + } + + # I'm pretty sure this is a false positive caused by the sg_ stuff +--- valgrind-orig/glibc-2.34567-NPTL-helgrind.supp 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/glibc-2.34567-NPTL-helgrind.supp 2012-07-12 21:50:03.663270525 +1000 +@@ -27,7 +27,7 @@ + #{ + # helgrind-glibc2X-001 + # Helgrind:Race +-# obj:/lib*/ld-2.*so* ++# obj:*/lib*/ld-2.*so* + #} + + # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001 +@@ -37,13 +37,13 @@ + { + helgrind-glibc2X-004 + Helgrind:Race +- obj:/lib*/libc-2.*so* ++ obj:*/lib*/libc-2.*so* + } + + { + helgrind-glibc2X-005 + Helgrind:Race +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + } + + # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005 +@@ -78,14 +78,14 @@ + { + helgrind-glibc2X-101 + Helgrind:Race +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + fun:pthread_* + } + { + helgrind-glibc2X-102 + Helgrind:Race + fun:mythread_wrapper +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + } + { + helgrind-glibc2X-103 +@@ -110,7 +110,7 @@ + { + helgrind-glibc2X-107 + Helgrind:Race +- obj:/lib*/libpthread-2.*so* ++ obj:*/lib*/libpthread-2.*so* + fun:sem_* + } + { +@@ -126,7 +126,7 @@ + { + helgrind-glibc2X-110 + Helgrind:Race +- obj:/lib*/libc-2.*so* ++ obj:*/lib*/libc-2.*so* + fun:pthread_* + } + { +--- valgrind-orig/glibc-2.X.supp.in 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/glibc-2.X.supp.in 2012-07-12 21:49:57.323490407 +1000 +@@ -39,74 +39,74 @@ + { + dl-hack3-cond-1 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* + } + { + dl-hack3-cond-2 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* + } + { + dl-hack3-cond-3 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* + } + { + dl-hack3-cond-4 + Memcheck:Cond +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* + } + + { + dl-hack4-64bit-addr-1 + Memcheck:Addr8 +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* + } + { + dl-hack4-64bit-addr-2 + Memcheck:Addr8 +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libc-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libc-@GLIBC_VERSION@*.so* + } + { + dl-hack4-64bit-addr-3 + Memcheck:Addr8 +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so* +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so* ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* + } + + { + dl-hack5-32bit-addr-1 + Memcheck:Addr4 +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so + } + { + dl-hack5-32bit-addr-3 + Memcheck:Addr4 +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* + } + { + dl-hack5-32bit-addr-4 + Memcheck:Addr4 +- obj:/lib*/ld-@GLIBC_VERSION@*.so +- obj:/lib*/libdl-@GLIBC_VERSION@*.so* +- obj:/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so ++ obj:*/lib*/libdl-@GLIBC_VERSION@*.so* ++ obj:*/lib*/ld-@GLIBC_VERSION@*.so + } + + +@@ -149,9 +149,9 @@ + { + glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86) + Memcheck:Addr4 +- obj:/lib/ld-@GLIBC_VERSION@*.so +- obj:/lib/ld-@GLIBC_VERSION@*.so +- obj:/lib/ld-@GLIBC_VERSION@*.so ++ obj:*/lib/ld-@GLIBC_VERSION@*.so ++ obj:*/lib/ld-@GLIBC_VERSION@*.so ++ obj:*/lib/ld-@GLIBC_VERSION@*.so + } + + { +@@ -225,7 +225,7 @@ + MVL-401-linuxthreads-pthread_create + Memcheck:Param + write(buf) +- obj:/lib/libpthread-0.10.so ++ obj:*/lib/libpthread-0.10.so + fun:pthread_create + } + +--- valgrind-orig/glibc-2.X-drd.supp 2011-10-27 07:24:45.000000000 +1000 ++++ valgrind-new/glibc-2.X-drd.supp 2012-07-12 21:49:57.323490407 +1000 +@@ -6,7 +6,7 @@ + { + drd-ld + drd:ConflictingAccess +- obj:/lib*/ld-*.so ++ obj:*/lib*/ld-*.so + } + + # +@@ -22,13 +22,19 @@ + { + drd-libc-stdio + drd:ConflictingAccess +- obj:/lib*/libc-* ++ obj:*/lib*/libc-* + } + { + drd-libc-thread-cancellation-test + drd:ConflictingAccess + fun:write + } ++{ ++ drd-libc-random ++ drd:ConflictingAccess ++ fun:random_r ++ fun:random ++} + + # + # Suppression patterns for libstdc++, the implementation of the standard C++ +@@ -128,7 +134,7 @@ + { + drd-libpthread-? + drd:ConflictingAccess +- obj:/lib/libgcc_s.so.1 ++ obj:*/lib/libgcc_s.so.1 + } + { + drd-libpthread-nanosleep +@@ -171,6 +177,7 @@ + { + drd-libxcb-xcb_wait_for_reply + drd:CondErr ++ ... + fun:pthread_cond_destroy* + fun:xcb_wait_for_reply + } diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index 3f5b56b2c..3cb20ae21 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158810 2012-05-10 18:37:11Z dreisner $ +# $Id: PKGBUILD 164259 2012-07-29 01:13:10Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgname=vpnc _vpncver=0.5.3 _git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6 pkgver=$_vpncver.svn516 -pkgrel=2 +pkgrel=3 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" license=('GPL') @@ -44,7 +44,7 @@ build() { sed -i 's|^#OPENSSL|OPENSSL|g' Makefile # fix resolvconf location for community/openresolv - sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-script + sed -i 's|/sbin/resolvconf|/usr&|g' "$srcdir/vpnc-script" make } 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 |