Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ecryptfs-utils/PKGBUILD
	community/pylibacl/PKGBUILD
	extra/kwebkitpart/PKGBUILD
	extra/php/PKGBUILD
	extra/qhull/PKGBUILD
	kde-unstable/kdegames-kigo/PKGBUILD
	kde-unstable/kdeutils-print-manager/PKGBUILD

12 files changed, 131 insertions, 65 deletions

diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index eafa5a3c4..c09df7964 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 'mips64el')
@@ -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/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index 707d0991b..2545b0593 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 166348 2012-09-06 20:40:12Z andrea $
+# $Id: PKGBUILD 171905 2012-11-23 07:53:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A WebKit browser component for KDE"
-url="http://opendesktop.org/content/show.php?content=127960"
+url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('27f72c8044fc798add9f4cbf9c799154')
+md5sums=('aec1820fe59ea8f4fe62c81503560f8e')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +24,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index 7eec16063..379c38f1d 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 155974 2012-04-10 15:42:33Z tomegun $
+# $Id: PKGBUILD 171907 2012-11-23 08:19:21Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=libfprint
 pkgver=0.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for fingerprint readers"
 arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
@@ -13,13 +13,12 @@ license=(LGPL)
 depends=(libusb nss gdk-pixbuf2)
 groups=(fprint)
 options=(!libtool !emptydirs)
-_snap=$pkgname-dfff16f3e32519ad071bdb1233c75bfe3ffa5557
+_snap=$pkgname-b2a53a459cc4294dec049d8d7f1b92ebb704f983
 source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
 
 build() {
   cd "$srcdir/$_snap"
-  sed -i '\|^./configure|,+1d' autogen.sh
-  ./autogen.sh
+  NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
@@ -28,4 +27,4 @@ package() {
   cd "$srcdir/$_snap"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('aa2fb6b90cf8c53aebd1f0e656dd70c1')
+md5sums=('2695b689910146b753111d48d8a6cb1c')
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index 4380d6df4..dc71c6b8f 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' 'mips64el')
 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/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index e5c6ae1f1..5d307ee4b 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170798 2012-11-11 16:22:13Z giovanni $
+# $Id: PKGBUILD 171909 2012-11-23 09:55:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.11.08
+pkgver=2012.11.22
 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=('d4a873052b13e77e80a8d267176da661')
+md5sums=('ab793b94629c3d52193fa7b9c09902b3')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index bacb9b298..d39d54e68 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158725 2012-05-08 12:53:46Z tomegun $
+# $Id: PKGBUILD 171906 2012-11-23 08:19:20Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Bächler <thomas.archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=ntfs-3g_ntfsprogs
 pkgname=('ntfs-3g' 'ntfsprogs')
 pkgver=2012.1.15
-pkgrel=3
+pkgrel=4
 url="http://www.tuxera.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -18,9 +18,10 @@ sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
-  ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --with-fuse=external --disable-static \
-    --enable-posix-acls --mandir=/usr/share/man
+    --enable-posix-acls --disable-ldconfig \
+    --mandir=/usr/share/man
   make
 }
 
@@ -32,9 +33,8 @@ package_ntfs-3g() {
     make DESTDIR="$pkgdir" install
   done
 
-  mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
   mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/{lib,{s,}bin}
+  rm -rf "$pkgdir"/{s,}bin
 
   cd "$pkgdir"/usr/bin
   ln -s ntfs-3g mount.ntfs
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index ebbda8a51..8192a800f 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 168608 2012-10-13 11:48:28Z andyrtr $
+# $Id: PKGBUILD 171914 2012-11-23 13:37:21Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.6.3
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
 license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitesparse' 'arpack')
+makedepends=('gcc-fortran' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2"
-        buildfix.diff
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
         octave-gethelp.patch)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7'
-          'a7cdba1e05fbdd182facdd804aeec37729255551'
+sha1sums=('e8bd0c0b33ab9714ddb524f2258546c3536f0628'
+          'de009a9e6803de6b831cbd836cbc85c291de8a3c'
           'd39d54763ac86114029f8bc5d60763d2adce27bb')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log
-  patch -Np0 -i ${srcdir}/buildfix.diff
   # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
-  patch -Np0 -i ${srcdir}/octave-gethelp.patch
+  patch -Np0 -i "${srcdir}/octave-gethelp.patch"
 
   autoreconf -vfi
 
@@ -44,11 +41,11 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
   # add octave library path to ld.so.conf.d
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/${pkgname}/${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
 }
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index ba593efff..fc6f699f3 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' 'mips64el')
 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/qhull/PKGBUILD b/extra/qhull/PKGBUILD
index 5c4c333a1..a8da5462e 100644
--- a/extra/qhull/PKGBUILD
+++ b/extra/qhull/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150554 2012-02-18 13:03:41Z pierre $
+# $Id: PKGBUILD 171913 2012-11-23 13:37:18Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
@@ -6,32 +6,35 @@
 
 pkgname=qhull
 pkgver=2012.1
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A general dimension code for computing convex hulls and related structures"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qhull.org/"
 license=('custom')
 depends=('gcc-libs')
 makedepends=('cmake')
-source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz")
 options=('!libtool')
+source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz")
 md5sums=('d0f978c0d8dfb2e919caefa56ea2953c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  if [ "${CARCH}" != "i686" ]; then
+    EXTRAOPTS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
+  fi
+
   mkdir srcbuild
   cd srcbuild
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DDOC_INSTALL_DIR=/usr/share/doc \
-    -DMAN_INSTALL_DIR=/usr/share/man/man1 -DLIB_INSTALL_DIR=/usr/lib ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr $EXTRAOPTS ..
   make
 }
 
 package() { 
   cd "$srcdir/$pkgname-$pkgver/srcbuild"
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # Install license
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
 }
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index eb1633e8e..5dc487a69 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' 'mips64el')
 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 651e9f082..2e23ccce8 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 'mips64el')
 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
 }