Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 25 insertions, 6 deletions

diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD
index f13c7c7e0..526dd8f57 100644
--- a/extra/rubberband/PKGBUILD
+++ b/extra/rubberband/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135007 2011-08-09 21:02:54Z schiv $
+# $Id: PKGBUILD 140085 2011-10-06 09:24:38Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com>
 
 pkgname=rubberband
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Time-stretching and pitch-shifting audio library and utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.breakfastquay.com/rubberband/"
@@ -12,9 +12,8 @@ license=('GPL')
 depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk')
 makedepends=('ladspa')
 source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2"
-        'gcc46.patch')
-md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc'
-         '7c2f404975da6052f6b80eac12efbeb4')
+        'gcc46.patch'
+        'vectorops.patch')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -22,6 +21,10 @@ build() {
   # fix gcc 4.6 compatibility
   patch -Np1 -i "$srcdir/gcc46.patch"
 
+  # fix bug exposed by gcc 4.6
+  # see https://bugs.archlinux.org/task/26140
+  patch -Np1 -i "$srcdir/vectorops.patch"
+
   ./configure --prefix=/usr
   make
 }
@@ -29,7 +32,10 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc'
+         '7c2f404975da6052f6b80eac12efbeb4'
+         '4bdc9689179d3a2cf64172f0f911701d')
diff --git a/extra/rubberband/vectorops.patch b/extra/rubberband/vectorops.patch
new file mode 100644
index 000000000..cae961591
--- /dev/null
+++ b/extra/rubberband/vectorops.patch
@@ -0,0 +1,13 @@
+--- a/src/system/VectorOps.h    Mon Mar 21 21:51:33 2011 +0000
++++ b/src/system/VectorOps.h    Sun Oct 02 21:12:42 2011 +0100
+@@ -84,8 +84,8 @@
+ }
+
+ template<typename T>
+-inline void v_move(T *const R__ dst,
+-                   const T *const R__ src,
++inline void v_move(T *const dst,
++                   const T *const src,
+                    const int count)
+ {
+     memmove(dst, src, count * sizeof(T));