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

Conflicts:
	community-testing/openscenegraph/PKGBUILD
	community-testing/speed-dreams/PKGBUILD
	community-testing/speed-dreams/speed-dreams.desktop
	community-testing/xemacs/PKGBUILD
	community/ibus/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/virtuoso/PKGBUILD
	multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
	multilib-testing/lib32-pango/PKGBUILD
	multilib-testing/wine/PKGBUILD
	multilib/lib32-e2fsprogs/PKGBUILD
	multilib/lib32-gmp/PKGBUILD
	multilib/lib32-libidn/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	testing/fontforge/PKGBUILD
	testing/java7-openjdk/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdegraphics-okular/PKGBUILD
	testing/kdegraphics-strigi-analyzer/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libreoffice/PKGBUILD.next_stable
	testing/opencv/PKGBUILD
	testing/php/PKGBUILD
	testing/php/php-fpm.conf.in.patch
	testing/php/php.ini.patch
	testing/xine-ui/PKGBUILD

20 files changed, 223 insertions, 91 deletions

diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD
index 1612ba93e..e886b8a88 100644
--- a/community/cuda-toolkit/PKGBUILD
+++ b/community/cuda-toolkit/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=cuda-toolkit
 pkgver=4.1.28
-pkgrel=1
+pkgrel=2
 _fedver=14
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('i686' 'x86_64')
@@ -38,6 +38,7 @@ package() {
   sh cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run --keep -- --prefix=$pkgdir/opt/cuda-toolkit
 
   sed -i "/unsupported GNU/d" $pkgdir/opt/cuda-toolkit/include/host_config.h
+  sed -i "s|/build/pkg||g" $pkgdir/opt/cuda-toolkit/bin/nvvp
 
   install -Dm755 cuda-toolkit.sh $pkgdir/etc/profile.d/cuda-toolkit.sh
   install -Dm644 cuda-toolkit.conf $pkgdir/etc/ld.so.conf.d/cuda-toolkit.conf
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index cacbd5519..e15bdd371 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 63009 2012-01-30 12:36:34Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=go
 pkgver=r60.3
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD
index 30708fafe..290c9b43e 100644
--- a/community/ibus/PKGBUILD
+++ b/community/ibus/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 63348 2012-01-30 21:56:05Z ebelanger $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -5,45 +6,43 @@
 
 pkgname=ibus
 pkgver=1.4.0
-pkgrel=1
-pkgdesc='Next Generation Input Bus for Linux.'
+pkgrel=2
+pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://ibus.googlecode.com"
 license=('LGPL')
-url='http://ibus.googlecode.com'
-depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'python2' 'pygtk' 'pyxdg' 'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme' 'gtk3')
+depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'pyxdg' \
+         'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme')
+makedepends=('intltool' 'gobject-introspection')
 optdepends=('notification-daemon')
-makedepends=('intltool')
 options=('!libtool')
 install=ibus.install
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('b4f063794e89c71eb1f8cb543210da30')
 
 build() {
-  	cd ${pkgname}-${pkgver}
-
-  	export PYTHON=python2
-
-  	./configure \
-    		--prefix=/usr \
-    		--libexecdir=/usr/lib/ibus \
-    		--sysconfdir=/etc \
-    		--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-    		--enable-gtk3
-
-  	# python2 fix
-  	for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
-    		sed -i 's_exec python_exec python2_' $file
-  	done
-
-  	make
+  cd ${pkgname}-${pkgver}
+  export PYTHON=python2
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/ibus \
+    --sysconfdir=/etc \
+    --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+    --enable-gtk3
+
+# python2 fix
+  for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
+    sed -i 's_exec python_exec python2_' $file
+  done
+
+  make
 }
 
 package() {
-  	cd ${pkgname}-${pkgver}
-
-  	export PYTHON=python2
-
-  	make DESTDIR=${pkgdir} install
-
-  	find ${pkgdir} -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
+  cd ${pkgname}-${pkgver}
+  export PYTHON=python2
+  make DESTDIR="${pkgdir}" install
+  install -d "${pkgdir}/etc/xdg/autostart"
+  ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop"
+  find "${pkgdir}" -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
 }
diff --git a/community/ibus/ibus.install b/community/ibus/ibus.install
index 439f00b29..c55665c27 100644
--- a/community/ibus/ibus.install
+++ b/community/ibus/ibus.install
@@ -1,10 +1,10 @@
 post_install() {
     echo "Updating gtk.immodules..."
-    /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
     echo "Done."
 
-    /usr/sbin/gconfpkg --install ibus
-    gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
+    gconfpkg --install ibus
+    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
 
     # update for gkt3
     gtk-query-immodules-3.0 --update-cache 
@@ -19,12 +19,12 @@ post_upgrade() {
 }
 
 pre_remove() {
-    /usr/sbin/gconfpkg --uninstall ibus
+    gconfpkg --uninstall ibus
 }
 
 post_remove() {
-    /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-    gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
+    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
 
     # update for gkt3
     gtk-query-immodules-3.0 --update-cache 
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 5da48ee45..aceea031c 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 62167 2012-01-17 08:00:28Z spupykin $
+# $Id: PKGBUILD 62999 2012-01-30 10:47:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
 # Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com>
 
 pkgname=minidlna
-pkgver=1.0.22
-pkgrel=5
+pkgver=1.0.23
+pkgrel=2
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/minidlna/"
@@ -18,7 +18,7 @@ backup=('etc/minidlna.conf'
 changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
         minidlna.rc)
-md5sums=('3de2f6b54f43bb998dfad3c8fa75cef3'
+md5sums=('409a36830a9ac2aaddfaff4c8b90a40f'
          'b64b8b749f1c23b3f1a2ee6d6ded07fd')
 
 build() {
@@ -29,7 +29,9 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   DESTDIR=$pkgdir make install
-  install -D -m755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna
+  install -Dm644 minidlna.conf ${pkgdir}/etc/minidlna.conf
+
+  install -Dm755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna
   mkdir -p $pkgdir/etc/conf.d
   echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna
 }
diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD
index fda586748..e6997bf23 100644
--- a/community/tcsh/PKGBUILD
+++ b/community/tcsh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57883 2011-11-04 08:18:37Z lfleischer $
+# $Id: PKGBUILD 63350 2012-01-30 22:26:07Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcsh
-pkgver=6.17.00
-pkgrel=4
+pkgver=6.18.00
+pkgrel=1
 pkgdesc='Enhanced version of the Berkeley C shell.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.tcsh.org/Welcome'
@@ -16,25 +16,23 @@ backup=('etc/csh.cshrc'
 install='tcsh.install'
 source=("ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'csh.cshrc'
-        'tcsh-6.17.00-ls-colors-var.patch'
         'csh.login')
-md5sums=('c47de903e3d52f6824c8dd0c91eeb477'
+md5sums=('ee9b3aa36fb38d32eab6a37a34e4c341'
          '7ca0fe6d1a1b9a0093f632499d4fb112'
-         '0ed594ef77bc689265632682e18462eb'
          '4869b9da87c79854e2cc97241f125853')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p0 < ../tcsh-6.17.00-ls-colors-var.patch
-
-  ./configure --prefix=/ --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --bindir=/bin
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  install -dm0755 "${pkgdir}/bin/"
+
   make DESTDIR="${pkgdir}" mandir=/usr/share/man install install.man
 
   install -Dm0644 "${srcdir}/csh.cshrc" "${pkgdir}/etc/csh.cshrc"
diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD
index 2d9812429..c8035d68b 100644
--- a/community/v8/PKGBUILD
+++ b/community/v8/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61849 2012-01-09 06:27:02Z tdziedzic $
+# $Id: PKGBUILD 62986 2012-01-30 06:42:07Z tdziedzic $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: tocer <tocer.deng@gmail.com>
 
 pkgname=v8
-pkgver=3.6.6.14
+pkgver=3.6.6.20
 pkgrel=1
 pkgdesc='A fast and modern javascript engine'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD
index 1a98e7f65..eb5d1ba8c 100644
--- a/community/xwax/PKGBUILD
+++ b/community/xwax/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53200 2011-07-31 23:46:37Z lfleischer $
+# $Id: PKGBUILD 63352 2012-01-30 22:33:32Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: sputnick <gilles DOT quenot AT gmail DOT com>
 
 pkgname=xwax
-pkgver=1.0
+pkgver=1.1
 pkgrel=1
 pkgdesc='Open-source vinyl emulation software for Linux.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import'
             'mpg123: for MP3 import'
             'ffmpeg: for video fallback import')
 source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cb07866ac8d4f9e2e12518a6ebd1d6e7')
+md5sums=('17649401ee16a91f56c1cdc8995a752a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/curl/0001-include-headers-for-tcp-keepalives.patch b/core/curl/0001-include-headers-for-tcp-keepalives.patch
new file mode 100644
index 000000000..780fb5b82
--- /dev/null
+++ b/core/curl/0001-include-headers-for-tcp-keepalives.patch
@@ -0,0 +1,31 @@
+From d906981b20d41466d040e6cc2570099c8d665f7f Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Sat, 28 Jan 2012 08:05:02 -0500
+Subject: [PATCH] include headers for tcp-keepalives
+
+---
+ src/tool_cb_skt.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/tool_cb_skt.c b/src/tool_cb_skt.c
+index 156c110..e74d5e4 100644
+--- a/src/tool_cb_skt.c
++++ b/src/tool_cb_skt.c
+@@ -27,6 +27,14 @@
+ #  include <sys/socket.h>
+ #endif
+ 
++#ifdef HAVE_NETINET_TCP_H
++#  include <netinet/tcp.h>
++#endif
++
++#ifdef HAVE_NETINET_IN_H
++#  include <netinet/in.h>
++#endif
++
+ #define ENABLE_CURLX_PRINTF
+ /* use our own printf() functions */
+ #include "curlx.h"
+-- 
+1.7.8.4
+
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index f8653faad..2d51b93c4 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147269 2012-01-25 13:57:06Z dreisner $
+# $Id: PKGBUILD 148373 2012-01-30 19:14:16Z ibiru $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
@@ -15,11 +15,11 @@ license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        fix-J-with-O-regression.patch
+        0001-include-headers-for-tcp-keepalives.patch
         curlbuild.h)
 md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
          '710242df6bc318d16eea611e7d1b1410'
-         'aa4539ec4f4a2dad1663dc22dd3ab0a1'
+         '84833972c2ff36abb2bfdd4ac065c2e5'
          '751bd433ede935c8fae727377625a8ae')
 
 ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
@@ -34,6 +34,8 @@ esac
 build() {
   cd "$pkgname-$pkgver"
 
+  patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch"
+
   ./configure \
       --prefix=/usr \
       --mandir=/usr/share/man \
diff --git a/cross/README b/cross/README
new file mode 100644
index 000000000..004f01114
--- /dev/null
+++ b/cross/README
@@ -0,0 +1,20 @@
+# Build order
+
+* $target-binutils
+* cross-$target-gcc-core
+* $target-linux-api-headers
+* cross-$target-glibc-headers
+* cross-$target-gcc-core-shared
+* $target-glibc
+* $target-gcc
+
+cross-* packages are used to bootstrap the full toolchain for the first time,
+you'll only need binutils, linux-api-headers, glibc and gcc once you're done.
+
+
+# Create a new toolchain
+
+Copy the base PKGBUILDS from mips64el-unknown-linux-gnu and change this part of
+the names to your target. At the header of each PKGBUILD there're several
+variables to configure the target system. Take note some require other manual
+changes, like final gcc.
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index b38398183..2a9c7b8eb 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145092 2011-12-16 20:04:34Z ronald $
+# $Id: PKGBUILD 148378 2012-01-30 21:38:30Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64" 'mips64el')
 url="http://amarok.kde.org"
@@ -21,11 +21,16 @@ optdepends=("libgpod: support for Apple iPod audio devices"
             "ifuse: support for Apple iPod Touch and iPhone"
             "libmygpo-qt: gpodder.net Internet Service")
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+	"toolbarfix.patch")
+sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
+          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f')
 
 build() {
   cd "${srcdir}"
+
+  patch -Np0 -i "${srcdir}"/toolbarfix.patch
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/amarok/toolbarfix.patch b/extra/amarok/toolbarfix.patch
new file mode 100644
index 000000000..ec012ca74
--- /dev/null
+++ b/extra/amarok/toolbarfix.patch
@@ -0,0 +1,61 @@
+diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp
+--- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp	2011-12-15 08:36:48.000000000 +0100
++++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp	2012-01-29 20:20:01.901360205 +0100
+@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
+     }
+ }
+ 
++void Context::AppletToolbar::setContainment( Containment * containment )
++{
++    m_cont = containment;
++}
++
++Context::Containment *
++Context::AppletToolbar::containment() const
++{
++    return m_cont;
++}
++
+ QSizeF
+ Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
+ {
+Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
+Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
+diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h
+--- amarok-2.5.0/src/context/toolbar/AppletToolbar.h	2011-12-15 08:36:48.000000000 +0100
++++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h	2012-01-29 20:17:52.414686784 +0100
+@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
+         
+         void appletRemoved( Plasma::Applet* applet );
+ 
++        void setContainment( Containment * containment );
++        Containment* containment() const;
++
+     signals:
+         void showApplet( Plasma::Applet* );
+         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
+Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
+diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp
+--- amarok-2.5.0/src/context/ToolbarView.cpp	2011-12-15 08:36:48.000000000 +0100
++++ amarok-2.5.0.new/src/context/ToolbarView.cpp	2012-01-29 20:17:52.394686782 +0100
+@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
+     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+ 
+     // now we create the toolbar
+-    m_toolbar = new AppletToolbar( containment );
++    m_toolbar = new AppletToolbar(0);
++    scene->addItem(m_toolbar.data());
++    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
+     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
+     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
+ 
+@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
+ 
+ Context::ToolbarView::~ToolbarView()
+ {
+-
++    delete m_toolbar.data();
+ }
+ 
+ void
+Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index 5f1992744..2f83c56ea 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,28 +1,36 @@
-# $Id: PKGBUILD 127670 2011-06-17 17:20:53Z andrea $
+# $Id: PKGBUILD 148037 2012-01-30 10:37:49Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=cfitsio
-pkgver=3.280
-_pkgver=3280
+pkgver=3.290
 pkgrel=1
 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-license=('GPL2')
+license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig')
 options=('!libtool')
-source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${_pkgver}.tar.gz")
-md5sums=('fdb9c0f51678b47e78592c70fb5dc793')
+source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
+md5sums=('bba93808486cf5edac236a941283b3c3')
 
 build() {
   cd "${srcdir}"/${pkgname}
+  export CFLAGS="$CFLAGS -lm"
   ./configure --prefix=/usr
-  make shared
+  make  shared 
+}
+
+check() {
+  cd "${srcdir}"/${pkgname}
+  make testprog
+  LD_LIBRARY_PATH=. ./testprog > testprog.lis
+  [[ -z $(diff testprog.lis testprog.out) ]] || return 1
+  [[ -z $(cmp testprog.fit testprog.std) ]] || return 1
 }
 
 package() {
   cd "${srcdir}"/${pkgname}
   make DESTDIR="${pkgdir}" install
+  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
 }
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 5183fed7d..f4fb29451 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 146919 2012-01-19 07:41:51Z tpowa $
+# $Id: PKGBUILD 148030 2012-01-30 07:42:40Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=5.2
+pkgver=5.3
 pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
@@ -20,8 +20,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  rm -r $pkgdir/usr/bin
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/sbin/mount.cifs
 }
-md5sums=('2ca839553cccd0c3042f7dd8737cc9de')
+md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index 340ac6abc..c8c0684f8 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 147820 2012-01-28 10:33:47Z andrea $
+# $Id: PKGBUILD 148039 2012-01-30 11:43:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kde.org/applications/system/konsole/'
 pkgdesc="Terminal"
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
-depends=('kdebase-runtime')
+depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
 sha1sums=('f99abc20fd0042be62e48308f334b66a6a3135d7')
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index ffc2c48ed..f994246cc 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 125846 2011-05-30 12:25:37Z andrea $
+# $Id: PKGBUILD 148371 2012-01-30 19:05:43Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=libgadu
-pkgver=1.11.0
+pkgver=1.11.1
 pkgrel=1
 pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('openssl')
 options=('!libtool')
 source=("http://toxygen.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c779891298ce5d081c1e871e1e5b256d')
+md5sums=('01016ad3b0ea955b61ef4badf2bd48bf')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index c510b4659..544b9493d 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146388 2012-01-10 00:35:24Z eric $
+# $Id: PKGBUILD 148035 2012-01-30 08:08:56Z eric $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
 pkgver=1.3.4a
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 07f91ab67..95f039860 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 147668 2012-01-26 08:10:51Z tpowa $
+# $Id: PKGBUILD 148032 2012-01-30 07:48:01Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('smbclient' 'samba')
-pkgver=3.6.2
+pkgver=3.6.3
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.2
+_realver=3.6.3
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -136,7 +136,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('bd2bb63b1c90161b88262f813bd1ce8b'
+md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1'
          'a3da19515a234c703876cf850c44e996'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 053c92e47..61583fbef 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142435 2011-11-09 18:50:28Z andrea $
+# $Id: PKGBUILD 148047 2012-01-30 18:21:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=virtuoso
 pkgver=6.1.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
@@ -35,4 +35,10 @@ package() {
   # install driver
   cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver
   make DESTDIR=${pkgdir} install
+
+  # Install some useful tools; rename to avoid conflicts
+  for bin in isql isqlw; do
+    install -Dm755 ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/tests/$bin \
+      ${pkgdir}/usr/bin/$bin-vt
+  done
 }