diff options
Diffstat (limited to 'community/lilypond')
3 files changed, 106 insertions, 5 deletions
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 9502f54ef..c179fafe6 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92554 2013-06-08 11:18:50Z bpiotrowski $ +# $Id: PKGBUILD 102973 2013-12-25 08:45:14Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=lilypond pkgver=2.16.2 -pkgrel=3 +pkgrel=4 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" @@ -15,9 +15,13 @@ depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') -install=lilypond.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) -md5sums=('6db27f17d47e4f66a3b0716c65db3041') +#install=lilypond.install +source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz + lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch + lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch) +md5sums=('6db27f17d47e4f66a3b0716c65db3041' + '121ac86f1004338ae20ad55a5690c0ad' + 'fa5073506f0e4dd96fb1858e3a75e08e') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -32,6 +36,10 @@ prepare() { sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure rm -rf python/out/ + + # Fix build + patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch" + patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch" } build() { @@ -39,6 +47,7 @@ build() { export PYTHON=/usr/bin/python2 export GUILE=/usr/bin/guile1.8 export GUILE_CONFIG=/usr/bin/guile-config1.8 + export LDFLAGS="$LDFLAGS -lpthread" ./configure --prefix=/usr --disable-documentation make } diff --git a/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch b/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch new file mode 100644 index 000000000..57b5b8ef6 --- /dev/null +++ b/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch @@ -0,0 +1,29 @@ +From: Julien Rioux <julien.rioux@gmail.com> +Date: Mon, 28 Oct 2013 20:42:43 +0000 (+0100) +Subject: Build: Fix compilation with GNU make 4.0 +X-Git-Tag: release/2.17.95-1~4^2 +X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=1ca9814191d16fd3c571d93035247db039254fc1;hp=025f0236ebab947e6fe2047f20b7f74f4cec3fc4 + +Build: Fix compilation with GNU make 4.0 + +Fix "recipes commence before first target" error. + +Patch from Thomas Klausner. +--- + +diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make +index 8919dab..8a0dd76 100644 +--- a/stepmake/stepmake/po-targets.make ++++ b/stepmake/stepmake/po-targets.make +@@ -37,10 +37,10 @@ ifneq ($(strip $(ALL_PO_SOURCES)),) + --keyword=_ --keyword=_f --keyword=_i \ + $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES) + endif +-endif + sed -i '1,2d' $(po-outdir)/$(package).po + sed -i -e 's/^\# This file is distributed.*/$(sed-header)/' $(po-outdir)/$(package).po + sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/' $(po-outdir)/$(package).po ++endif + + + po-update: po diff --git a/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch new file mode 100644 index 000000000..ad0c3d4fe --- /dev/null +++ b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch @@ -0,0 +1,63 @@ +From: Werner Lemberg <wl@gnu.org> +Date: Thu, 5 Dec 2013 14:01:48 +0000 (+0100) +Subject: Issue 3694: Use standard inclusion scheme for FreeType headers. +X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=7705e46966bfa05015fb9fb20c68da844ab88028;hp=88435714e762229ebe2715bcf6863eb89c1f8dff + +Issue 3694: Use standard inclusion scheme for FreeType headers. + +The most recent FreeType release (2.5.1) has changed locations for header +files. Using the standard way, this is not visible to applications. +--- + +diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc +index 00e5cae..88af76c 100644 +--- a/lily/freetype-error.cc ++++ b/lily/freetype-error.cc +@@ -31,7 +31,7 @@ const struct Freetype_error_message + const char *err_msg; + } ft_errors[] = + +-#include <freetype/fterrors.h> ++#include FT_ERRORS_H + + ; + +diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc +index df6a744..837a1f2 100644 +--- a/lily/open-type-font.cc ++++ b/lily/open-type-font.cc +@@ -23,7 +23,7 @@ + + using namespace std; + +-#include <freetype/tttables.h> ++#include FT_TRUETYPE_TABLES_H + + #include "dimensions.hh" + #include "freetype.hh" +diff --git a/lily/pango-font.cc b/lily/pango-font.cc +index ee986fc..b148a5b 100644 +--- a/lily/pango-font.cc ++++ b/lily/pango-font.cc +@@ -22,7 +22,7 @@ + #define PANGO_ENABLE_BACKEND + + #include <pango/pangoft2.h> +-#include <freetype/ftxf86.h> ++#include FT_XFREE86_H + + #include <map> + #include <cstdio> +diff --git a/lily/ttf.cc b/lily/ttf.cc +index eaeb67a..6d7f97b 100644 +--- a/lily/ttf.cc ++++ b/lily/ttf.cc +@@ -20,7 +20,7 @@ + #include <cstdio> + #include "freetype.hh" + +-#include <freetype/tttables.h> ++#include FT_TRUETYPE_TABLES_H + + #include "international.hh" + #include "memory-stream.hh" |