diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-06-23 16:23:28 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-06-23 16:23:28 +0000 |
| commit | f90039d9e28ad8783bb1d8d55272ce2c90b966ec (patch) | |
| tree | 99dc33ba305bc4546851da1e7040d3b0ca87bff4 /media-sound/lilypond | |
| parent | Fix library presence, the previous commit broke it for those using multilib s... (diff) | |
| download | gentoo-2-f90039d9e28ad8783bb1d8d55272ce2c90b966ec.tar.gz gentoo-2-f90039d9e28ad8783bb1d8d55272ce2c90b966ec.tar.bz2 gentoo-2-f90039d9e28ad8783bb1d8d55272ce2c90b966ec.zip | |
Add patch from Ed Catmur in bug #178629 to allow building with newer fontforge versions.
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'media-sound/lilypond')
| -rw-r--r-- | media-sound/lilypond/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/lilypond/files/lilypond-2.10.25-fontforge.patch | 11 | ||||
| -rw-r--r-- | media-sound/lilypond/lilypond-2.10.25-r1.ebuild | 10 |
3 files changed, 25 insertions, 3 deletions
diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog index 1d056a0d5ad5..3dd180d2e4b2 100644 --- a/media-sound/lilypond/ChangeLog +++ b/media-sound/lilypond/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/lilypond # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.57 2007/06/22 11:17:11 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.58 2007/06/23 16:23:28 flameeyes Exp $ + + 23 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> + +files/lilypond-2.10.25-fontforge.patch, lilypond-2.10.25-r1.ebuild: + Add patch from Ed Catmur in bug #178629 to allow building with newer + fontforge versions. *lilypond-2.11.27 (22 Jun 2007) diff --git a/media-sound/lilypond/files/lilypond-2.10.25-fontforge.patch b/media-sound/lilypond/files/lilypond-2.10.25-fontforge.patch new file mode 100644 index 000000000000..f8a77709e6b1 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.10.25-fontforge.patch @@ -0,0 +1,11 @@ +--- buildscripts/pfx2ttf.fontforge 2007/05/15 21:18:30 1.1 ++++ buildscripts/pfx2ttf.fontforge 2007/05/15 21:27:34 +@@ -21,7 +21,7 @@ SelectIf("trademark", "trademark", \ + "afii61352", "afii61352", \ + "ij", "ij", \ + "IJ", "IJ"); +-RemoveATT("Ligature", "*", "*"); ++RemovePosSub("*"); + + Generate($3 + $fontname + ".otf"); + diff --git a/media-sound/lilypond/lilypond-2.10.25-r1.ebuild b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild index 7a0685f6f786..2548b28befb3 100644 --- a/media-sound/lilypond/lilypond-2.10.25-r1.ebuild +++ b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.10.25-r1.ebuild,v 1.3 2007/06/17 13:36:58 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.10.25-r1.ebuild,v 1.4 2007/06/23 16:23:28 flameeyes Exp $ inherit eutils autotools versionator toolchain-funcs elisp-common @@ -37,7 +37,6 @@ RDEPEND=" DEPEND="${RDEPEND} >=media-gfx/fontforge-20060406 - <=media-gfx/fontforge-20070312 >=app-text/mftrace-1.2.9 >=sys-apps/texinfo-4.8 sys-devel/make @@ -55,6 +54,13 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-fontforge.patch" +} + src_compile() { if [[ $(gcc-major-version) -lt 4 ]]; then eerror "You need GCC 4.x to build this software." |