From a3190955da8122da9bb6e49ce7496a5fb0e6f96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 19 Jun 2013 00:33:43 -0300 Subject: ecasound-libre-2.9.0-3: fix https://bugs.archlinux.org/task/34451 --- libre/ecasound-libre/PKGBUILD | 19 ++++++++++--------- libre/ecasound-libre/ruby2.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 libre/ecasound-libre/ruby2.patch (limited to 'libre/ecasound-libre') diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD index 30cbbc641..6fbdd3fb3 100644 --- a/libre/ecasound-libre/PKGBUILD +++ b/libre/ecasound-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 180827 2013-03-26 13:29:04Z schiv $ # Maintainer: Ray Rashif # Contributor: Eric Belanger # Contributor: Tom Newsom @@ -7,13 +7,12 @@ _pkgname=ecasound pkgname=ecasound-libre pkgver=2.9.0 -pkgrel=2.1 -pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)" +pkgrel=3 +pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation" arch=('i686' 'x86_64') url="http://www.eca.cx/ecasound/" license=('GPL' 'LGPL') -depends=('audiofile' 'liblo' - 'liboil' 'lilv') +depends=('audiofile' 'liblo' 'liboil' 'lilv') makedepends=('python2' 'ruby') optdepends=('python2: ecamonitor, ECI API' 'ruby: ECI API' @@ -27,14 +26,16 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver options=('!libtool') -source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz) -md5sums=('05e7d4664cdf4c7a138c098e9506a551') +source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz" + 'ruby2.patch') +md5sums=('05e7d4664cdf4c7a138c098e9506a551' + '6909dbd4f67f76d3bd31ce7c7fe16212') build() { cd "$srcdir/$_pkgname-$pkgver" - # use vendor_ruby for ruby files - sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure + # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files + patch -Np1 -i "$srcdir/ruby2.patch" PYTHONPATH=/usr/bin/python2 ./configure \ --prefix=/usr \ diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-libre/ruby2.patch new file mode 100644 index 000000000..d55f12140 --- /dev/null +++ b/libre/ecasound-libre/ruby2.patch @@ -0,0 +1,12 @@ +diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure +--- ecasound-2.9.0.orig/configure 2013-03-26 17:14:51.759045636 +0800 ++++ ecasound-2.9.0/configure 2013-03-26 17:15:50.502060731 +0800 +@@ -6535,7 +6535,7 @@ + rubyecasound_support=no + ECA_S_RUBY_SITEDIR="" + else +- ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" ++ ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" + fi + + -- cgit v1.2.3-2-g168b