Fri Nov 23 02:31:09 PST 2012

6 files changed, 89 insertions, 21 deletions

diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 557b59218..25244de8e 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 171616 2012-11-20 14:31:04Z heftig $
+# $Id: PKGBUILD 171876 2012-11-22 07:10:34Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.28
+pkgver=0.6.29
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch)
-md5sums=('311458f6ea444d64f298a2048bb4d8cf'
+md5sums=('396c16f39711e24bb7cc685a170befa3'
          '1d5cf127e5aac407fe7c37b2f4fd503c')
 
 build() {
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index c7a51e800..1dcd39f3f 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=libsecret
 pkgver=0.12
-pkgrel=1
+pkgrel=2
 pkgdesc='library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="https://live.gnome.org/Libsecret"
 depends=('glib2' 'libgcrypt')
-makedepends=('intltool' 'docbook-xsl')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
 sha256sums=('323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01')
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index cdf86575e..2b9d5f14c 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171518 2012-11-18 10:28:03Z andyrtr $
+# $Id: PKGBUILD 171900 2012-11-22 18:08:46Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,8 +21,8 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.8
-pkgrel=2
+pkgver=5.4.9
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('bb8c816a9299be8995255ef70c63b800'
+md5sums=('076a9f84d861d3f664a2878d5773ba78'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '3cfde0cc4ed09b55f1ce531437a4eb88'
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index 61ca3a799..a9c5b6d47 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 145864 2012-01-03 12:44:42Z andrea $
+# $Id: PKGBUILD 171883 2012-11-22 10:46:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qjson
-pkgver=0.7.1
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://qjson.sourceforge.net"
 depends=('qt')
 makedepends=('cmake')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5a833ad606c164ed8aa69f0873366ace')
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz")
+md5sums=('e9537e6f596f21f0552978bf064a0415')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xf86-video-sis/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch b/extra/xf86-video-sis/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
new file mode 100644
index 000000000..90e93b403
--- /dev/null
+++ b/extra/xf86-video-sis/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
@@ -0,0 +1,66 @@
+From c0ff117d3e19e14829a21d89673e03f9d6389043 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc@archlinux.org>
+Date: Thu, 22 Nov 2012 15:04:42 +0100
+Subject: [PATCH] Disable UploadToScreen and DownloadFromScreen. These
+ functions use invalid pointers, causing crashes. As the
+ driver is technically unmaintained, it's better to rely on
+ software fallback than trying to fix the driver
+ implementation.
+
+---
+ src/sis300_accel.c | 2 ++
+ src/sis310_accel.c | 2 ++
+ src/sis_accel.c    | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/sis300_accel.c b/src/sis300_accel.c
+index af0527d..2162d76 100644
+--- a/src/sis300_accel.c
++++ b/src/sis300_accel.c
+@@ -1273,9 +1273,11 @@ SiS300AccelInit(ScreenPtr pScreen)
+ 
+ 		 /* Composite not supported */
+ 
++#if 0
+ 		 /* Upload, download to/from Screen */
+ 		 pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen;
+ 		 pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen;
++#endif
+ 
+ 	      } else {
+ 
+diff --git a/src/sis310_accel.c b/src/sis310_accel.c
+index 1a6f639..20106ce 100644
+--- a/src/sis310_accel.c
++++ b/src/sis310_accel.c
+@@ -2303,9 +2303,11 @@ SiS315AccelInit(ScreenPtr pScreen)
+ 	      }
+ #endif
+ 
++#if 0
+ 	      /* Upload, download to/from Screen */
+ 	      pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen;
+ 	      pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen;
++#endif
+ 
+ 	   }
+ #endif
+diff --git a/src/sis_accel.c b/src/sis_accel.c
+index c2c24c7..bb08296 100644
+--- a/src/sis_accel.c
++++ b/src/sis_accel.c
+@@ -801,9 +801,11 @@ SiSAccelInit(ScreenPtr pScreen)
+ 
+ 	  /* Composite not supported */
+ 
++#if 0
+ 	  /* Upload, download to/from Screen */
+ 	  pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen;
+ 	  pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen;
++#endif
+ 
+        }
+ #endif /* EXA */
+-- 
+1.8.0
+
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index a44bde11c..fb0840cb0 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168588 2012-10-13 11:45:51Z andyrtr $
+# $Id: PKGBUILD 171889 2012-11-22 14:24:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sis
 pkgver=0.10.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,11 +14,14 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
 optdepends=('sis-dri: DRI1 support from community repo')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch)
+sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0'
+            '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch"
   ./configure --prefix=/usr
   make
 }