summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Linden <karl.j.linden@gmail.com>2015-10-31 14:04:47 +0100
committerKarl Linden <karl.j.linden@gmail.com>2015-11-04 17:16:35 +0100
commitb01a4bd24dff326307247ae5fa9d245b12904b46 (patch)
tree69e6b82b5bc68146b8957525d7be39b6a56f751e /media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
parentnet-analyzer/pmacct: Add USE=geoipv2. (diff)
downloadgentoo-b01a4bd24dff326307247ae5fa9d245b12904b46.tar.gz
gentoo-b01a4bd24dff326307247ae5fa9d245b12904b46.tar.bz2
gentoo-b01a4bd24dff326307247ae5fa9d245b12904b46.zip
media-sound/lilypond: fix compilation with fontforge wrt #557160
Package-Manager: portage-2.2.23
Diffstat (limited to 'media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch')
-rw-r--r--media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
new file mode 100644
index 00000000000..cfd3295b394
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
@@ -0,0 +1,29 @@
+From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001
+From: Masamichi Hosoda <trueroad@trueroad.jp>
+Date: Sat, 22 Aug 2015 21:20:17 +0900
+Subject: [PATCH] Fix fontforge version detection
+
+Newer fontforge shows git hash in `fontforge --version`.
+In that case, configure script
+might recognize it as date (version).
+---
+ aclocal.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 48d0b77..0037c58 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
+
+ if test -z "$_ver"; then
+ ## If empty, try date [fontforge]
+- eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
++ eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
++ | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
+ | head -n 1 \
+ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+ fi
+--
+2.6.2
+