From cd74c15930a3fd5fe14d4555937ec55fc337e922 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Fri, 12 Dec 2014 00:52:14 -0600 Subject: graphics/lilypond: Fix building against fontforge-20141014. Signed-off-by: Kyle Guinn --- graphics/lilypond/lilypond.SlackBuild | 5 +++++ graphics/lilypond/patches/detect-fontforge.diff | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 graphics/lilypond/patches/detect-fontforge.diff 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 -- cgit v1.2.3-65-gdbad