Date: Tuesday, June 4, 2013 @ 16:18:42 Author: spupykin Revision: 92393
upgpkg: lilypond 2.16.2-3 upd Modified: lilypond/trunk/PKGBUILD ----------+ PKGBUILD | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-06-04 14:06:38 UTC (rev 92392) +++ PKGBUILD 2013-06-04 14:18:42 UTC (rev 92393) @@ -6,12 +6,12 @@ pkgname=lilypond pkgver=2.16.2 -pkgrel=1 +pkgrel=3 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" license=('GPL') -depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') +depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') @@ -19,7 +19,7 @@ source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) md5sums=('6db27f17d47e4f66a3b0716c65db3041') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # python2 fix @@ -28,9 +28,18 @@ sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure + sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure + rm -rf python/out/ +} - PYTHON=/usr/bin/python2 ./configure --prefix=/usr +build() { + cd "$srcdir/$pkgname-$pkgver" + export PYTHON=/usr/bin/python2 + export GUILE=/usr/bin/guile1.8 + export GUILE_CONFIG=/usr/bin/guile-config1.8 + ./configure --prefix=/usr --disable-documentation make }