From 9e070c7eda97914d00dfcb9cb201554bf087c68d Mon Sep 17 00:00:00 2001
From: Sergej Pupykin <spupykin@archlinux.org>
Date: Wed, 18 Aug 2010 21:04:42 +0000
Subject: [PATCH] package update
---
PKGBUILD | 10 +++++++---
lilypond-gcc45.patch | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 lilypond-gcc45.patch
diff --git a/PKGBUILD b/PKGBUILD
index 51ffd19..925e692 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
# Contributor: Andrea `BaSh` Scarpino <bash.lnx@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -5,7 +6,7 @@
pkgname=lilypond
pkgver=2.12.3
-pkgrel=2
+pkgrel=3
pkgdesc="An automated music engraving system"
arch=('i686' 'x86_64')
url="http://lilypond.org"
@@ -13,8 +14,10 @@ license=('GPL')
depends=('guile' 'python' 'tetex' 'ghostscript' 'pango' 'fontforge' 'fontconfig')
makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo')
options=('emptydirs')
-source=(http://download.linuxaudio.org/lilypond/sources/v2.12/$pkgname-$pkgver.tar.gz)
-md5sums=('2303bf5f2ea8d4628f33a68f016f3866')
+source=(http://download.linuxaudio.org/lilypond/sources/v2.12/$pkgname-$pkgver.tar.gz
+ lilypond-gcc45.patch)
+md5sums=('2303bf5f2ea8d4628f33a68f016f3866'
+ '023636ea13dc6eb2de379e5ef369b218')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -23,6 +26,7 @@ build() {
autoconf
automake
./configure --prefix=/usr --disable-gui
+ patch -p1 <$srcdir/lilypond-gcc45.patch
make || return 1
make DESTDIR="$pkgdir" install || return 1
}
diff --git a/lilypond-gcc45.patch b/lilypond-gcc45.patch
new file mode 100644
index 0000000..6af391f
--- /dev/null
+++ b/lilypond-gcc45.patch
@@ -0,0 +1,16 @@
+diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
+index 99fe982..6949458 100644
+--- a/lily/spacing-spanner.cc
++++ b/lily/spacing-spanner.cc
+@@ -38,8 +38,8 @@ Spacing_spanner::get_columns (Grob *me_grob)
+ vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
+ &Paper_column::less_than);
+
+- all = vector<Grob*>::vector<Grob*> (all.begin () + start,
+- all.begin () + end + 1);
++ all = vector<Grob*> (all.begin () + start,
++ all.begin () + end + 1);
+ return all;
+ }
+
+--
--
GitLab