Wed Jul 16 03:32:06 UTC 2014

9 files changed, 98 insertions, 48 deletions

diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index d049cc468..168485c51 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 113234 2014-06-16 11:42:44Z spupykin $
+# $Id: PKGBUILD 115735 2014-07-15 07:46:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=lxc
-pkgver=1.0.4
+pkgver=1.0.5
 epoch=1
 pkgrel=1
 pkgdesc="Linux Containers"
@@ -22,10 +22,11 @@ license=('LGPL')
 install=lxc.install
 options=('emptydirs')
 backup=('etc/lxc/default.conf')
-source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
+source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"{,.asc}
 	"lxc.tmpfiles.d"
 	"lxc.service")
-md5sums=('2689080af03a8ac1f1ce577728dd3619'
+md5sums=('9d9af9e9e69a831cd50b58d91c786013'
+         'SKIP'
          'df94c9fb8a753011c86ee664e9f521ff'
          '32db4ef06b27f36e15ff4b67c049dfeb')
 
diff --git a/community/python-scikit-learn/PKGBUILD b/community/python-scikit-learn/PKGBUILD
index cb29708a9..f28bff122 100644
--- a/community/python-scikit-learn/PKGBUILD
+++ b/community/python-scikit-learn/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 108494 2014-03-27 14:48:23Z fyan $
+# $Id: PKGBUILD 115746 2014-07-15 19:10:42Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgbase=python-scikit-learn
 pkgname=('python2-scikit-learn' 'python-scikit-learn')
-pkgver=0.14.1
-pkgrel=2
+pkgver=0.15.0
+pkgrel=1
 pkgdesc="A set of python modules for machine learning and data mining"
 arch=('i686' 'x86_64')
 url="http://scikit-learn.sourceforge.net/"
 license=('BSD')
-makedepends=('python2-scipy' 'python-scipy' 'python2-setuptools' 'python-setuptools' 'cython')
+makedepends=('python2-scipy' 'python-scipy' 'python2-setuptools' 'python-setuptools')
 options=(!emptydirs)
 
 source=("http://downloads.sourceforge.net/project/scikit-learn/scikit-learn-${pkgver}.tar.gz" 
         "LICENSE")
-md5sums=('790ad23547bb7f428060636628e13491'
+md5sums=('4e04f416f5d4dfb7a17e1b1d9acc2b0b'
          '327083d2576cc0aad1b8f10b2bcd2974')
 
 build() {
@@ -27,8 +27,6 @@ build() {
 
   msg "Building Python3"
   cd "$srcdir"/scikit-learn-$pkgver
-  # Regenerate _k_means.c using newer cython to fix python 3.4 compile error
-  cython sklearn/cluster/_k_means.pyx
   python setup.py build
 }
 
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index c100284f9..777983769 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197302 2013-10-25 01:44:22Z allan $
+# $Id: PKGBUILD 216903 2014-07-15 13:02:26Z juergen $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.6.2
+pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=('i686' 'x86_64')
 url="http://www.maxmind.com/app/c"
@@ -12,20 +12,17 @@ license=('GPL')
 depends=('zlib' 'geoip-database')
 backup=('etc/geoip/GeoIP.conf')
 options=('!emptydirs')
-source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz 
-        pkgconfig.patch)
-sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731'
-            '64a6a608beabdc553019237d7da808dc234f760c21040036b2f589eaebba5d10')
+source=(https://github.com/maxmind/${pkgname}-api-c/archive/v${pkgver}.tar.gz)
+sha256sums=('72562fc10792eea6cfa662d93ef40c6541b73619df8057a6e411144e671a9174')
 
 prepare() {
-  cd GeoIP-$pkgver
-  patch -Np1 -i ../pkgconfig.patch
+  cd geoip-api-c-$pkgver
+  autoreconf -vi
 }
 
 build() {
-  cd GeoIP-$pkgver
+  cd geoip-api-c-$pkgver
 
-  autoreconf -vi
   ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man \
@@ -34,17 +31,14 @@ build() {
 }
 
 check() {
-  cd GeoIP-$pkgver
+  cd geoip-api-c-$pkgver
+  ln -sf /usr/share/GeoIP data
   make check
 }
 
 package() {
-  cd GeoIP-$pkgver
-
+  cd geoip-api-c-$pkgver
   make DESTDIR="$pkgdir" install
-
-  # country database is provided by geoip-database
-  rm "$pkgdir/usr/share/GeoIP/GeoIP.dat"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/geoip/pkgconfig.patch b/extra/geoip/pkgconfig.patch
deleted file mode 100644
index ed3fee9e7..000000000
--- a/extra/geoip/pkgconfig.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- GeoIP-1.5.1/geoip.pc.in.orig	2013-03-23 02:26:09.000000000 +0000
-+++ GeoIP-1.5.1/geoip.pc.in	2013-09-23 12:04:07.441555775 +0000
-@@ -1,4 +1,5 @@
- prefix=@prefix@
-+exec_prefix=${prefix}
- libdir=@libdir@
- includedir=@includedir@
- datadir=@datarootdir@
diff --git a/extra/kdelibs4support/PKGBUILD b/extra/kdelibs4support/PKGBUILD
index f0de2f7ed..8dbb1b4f3 100644
--- a/extra/kdelibs4support/PKGBUILD
+++ b/extra/kdelibs4support/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 216790 2014-07-11 11:50:04Z andrea $
+# $Id: PKGBUILD 216914 2014-07-15 19:23:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdelibs4support
 pkgver=5.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='KDE 4 Support'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/kdelibs4support'
 license=('LGPL')
-depends=('kunitconversion' 'kdesignerplugin')
+depends=('kunitconversion' 'kdesignerplugin' 'kinit' 'kitemmodels' 'kemoticons')
 makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager'
 groups=('kf5-aids')
 replaces=('kde4support')
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 700639fe0..eace87d84 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 216551 2014-07-05 17:32:01Z andrea $
+# $Id: PKGBUILD 216899 2014-07-15 07:14:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -6,7 +6,7 @@ pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
 pkgver=2.8.3
-pkgrel=2
+pkgrel=3
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index b69d6ca31..684b71ef1 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 210293 2014-04-13 15:14:17Z dreisner $
+# $Id: PKGBUILD 216918 2014-07-15 19:44:25Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=varnish
-pkgver=4.0.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="High-performance HTTP accelerator"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ install=$pkgname.install
 source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
         varnish-vcl-reload
         varnish.service)
-md5sums=('05af2deae29f37b166392a0237756250'
+md5sums=('53e272f448b2109ab370e03d794a243f'
          '03196dee7fc68e75069393d52c370762'
          '699d118a069c2e63e49c81f275ce2658')
 
diff --git a/extra/xf86-video-intel/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch b/extra/xf86-video-intel/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
new file mode 100644
index 000000000..4447deb56
--- /dev/null
+++ b/extra/xf86-video-intel/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
@@ -0,0 +1,56 @@
+From e2bfa715a9e115921263d572b9f4c496b550a494 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue, 10 Jun 2014 21:28:32 +0100
+Subject: [PATCH] sna/dri2: Check that the window covers the whole CRTC before
+ xchg
+
+Fixes TearFre regression from
+
+commit 3932e97057fca16615adaefbc1eb25a0d51a1d8b [2.99.912]
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Mon Jun 9 08:58:15 2014 +0100
+
+    sna/dri2: Allow TearFree flipping to individual CRTC
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+ src/sna/sna_display.c |  1 +
+ src/sna/sna_dri2.c    | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index dcbe622..7169779 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -332,6 +332,7 @@ static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
+ 	assert(bo->refcnt);
+ 	assert(bo->proxy == NULL);
+ 	assert(!bo->snoop);
++	assert(8*bo->pitch >= width * scrn->bitsPerPixel);
+ 	assert(height * bo->pitch <= kgem_bo_size(bo)); /* XXX crtc offset */
+ 	if (bo->delta) {
+ 		DBG(("%s: reusing fb=%d for handle=%d\n",
+diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
+index 1baaf2b..e196464 100644
+--- a/src/sna/sna_dri2.c
++++ b/src/sna/sna_dri2.c
+@@ -1605,6 +1605,16 @@ can_xchg_one(struct sna *sna,
+ 		return false;
+ 	}
+ 
++	if (memcmp(&win->clipList.extents, &crtc->bounds, sizeof(crtc->bounds))) {
++		DBG(("%s: no, window [(%d, %d), (%d, %d)] does not cover CRTC [(%d, %d), (%d, %d)]\n",
++		     __FUNCTION__,
++		     win->clipList.extents.x1, win->clipList.extents.y1,
++		     win->clipList.extents.x2, win->clipList.extents.y2,
++		     crtc->bounds.x1, crtc->bounds.y1,
++		     crtc->bounds.x2, crtc->bounds.y2));
++		return false;
++	}
++
+ 	if (sna_crtc_is_transformed(crtc)) {
+ 		DBG(("%s: no, CRTC is rotated\n", __FUNCTION__));
+ 		return false;
+-- 
+2.0.1
+
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 7513ad375..f401476b6 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 215142 2014-06-14 17:44:53Z andyrtr $
+# $Id: PKGBUILD 216906 2014-07-15 13:26:36Z lcarlier $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
 pkgver=2.99.912
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -23,8 +23,17 @@ provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch)
+sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501'
+            '19fe39fa5cd175e14f77d67dbd731f992c8f51161d90b73c63f52604a9eed7ce')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # fix FS#40863, merged upstream
+  patch -Np1 -i ../0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch
+}
 
 build() {
   cd ${pkgname}-${pkgver}