Fix compilation for gcc 6.x, remove optional Python module which doesn't build for some reason.

1 files changed, 14 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8bf898a9da8f..c5cbab8d3782 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,22 @@
 # Maintainer: Tyler <tjb0607 at gmail dot com?
 # Contributor: Austin <doorknob60 at gmail dot com>
 pkgname=libsndobj-cvs
-pkgver=20100712
+pkgver=20121024
 pkgrel=1
-pkgdesc="The Sound Object Library is an object-oriented audio processing library."
+pkgdesc="an object-oriented audio processing library"
 arch=('i686' 'x86_64')
 url="http://sndobj.sourceforge.net/"
 license=('GPL')
 groups=('lib')
 depends=()
 makedepends=('cvs' 'scons')
+source=('SndPVOCEX.diff')
+md5sums=('bf509789b5c2c738d742d7a30ccfc8a1')
 
 _cvsroot=":pserver:anonymous@sndobj.cvs.sourceforge.net:/cvsroot/sndobj"
 _cvsmod="sndobj"
 
-build() {
+prepare() {
   cd "$srcdir"
  msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
   if [ -d $_cvsmod/CVS ]; then
@@ -31,11 +33,19 @@ build() {
   rm -rf "$srcdir/$_cvsmod-build"
   cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build"
   cd "$srcdir/$_cvsmod-build"
+  patch -p0 < ../SndPVOCEX.diff
+}
 
-  scons prefix=/usr pythonmodule=true instdir="$pkgdir" || return 1
+build() {
+  cd "$srcdir/$_cvsmod-build"
+  scons prefix=/usr instdir="$pkgdir" || return 1
 }
 
 package() {
   cd "$srcdir/$_cvsmod-build"
+  # installation assumes this even if the Python module isn't built
+  mkdir -p "$pkgdir/usr/lib/python2.7/site-packages"
   scons install || return 1
+  # get rid of the bogus directory again
+  rm -rf "$pkgdir/usr/lib/python2.7"
 }