diff options
| author | Kyle Guinn <elyk03@gmail.com> | 2014-12-12 00:52:14 -0600 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-12-13 10:35:41 +0700 |
| commit | cd74c15930a3fd5fe14d4555937ec55fc337e922 (patch) | |
| tree | d643eb7cb726bdb34de0b7a15721509f8228b9e7 | |
| parent | 158949367c827185ec652cb474a0e3668a716d13 (diff) | |
| download | slackbuilds-cd74c15930a3fd5fe14d4555937ec55fc337e922.tar.gz | |
graphics/lilypond: Fix building against fontforge-20141014.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
| -rw-r--r-- | graphics/lilypond/lilypond.SlackBuild | 5 | ||||
| -rw-r--r-- | graphics/lilypond/patches/detect-fontforge.diff | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild index 027ae1fe62..267d53fb87 100644 --- a/graphics/lilypond/lilypond.SlackBuild +++ b/graphics/lilypond/lilypond.SlackBuild @@ -67,6 +67,11 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . +# configure does some sed-fu on `fontforge --version` and is finding a git hash +# instead of a version/date since at least fontforge-20141014. +# This appears to detect the fontforge build date, which should be good enough. +patch -p1 < $CWD/patches/detect-fontforge.diff + 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 diff --git a/graphics/lilypond/patches/detect-fontforge.diff b/graphics/lilypond/patches/detect-fontforge.diff new file mode 100644 index 0000000000..1d3e546dc5 --- /dev/null +++ b/graphics/lilypond/patches/detect-fontforge.diff @@ -0,0 +1,12 @@ +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -9810,7 +9810,7 @@ + + if test -z "$_ver"; then + ## If empty, try date [fontforge] +- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ ++ eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep 'libfontforge [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi |