From 0900547b35518fe7beaa0e563f6a00939dae24c2 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 14 Dec 2014 23:49:40 -0500 Subject: [PATCH] Upgrade to lilypond-2.18.2 --- config/packages-list | 2 +- .../common/lilypond-2.18.2-fontforge.patch | 357 ++++++++++++++++++ 2 files changed, 358 insertions(+), 1 deletion(-) create mode 100644 stage5/patches/common/lilypond-2.18.2-fontforge.patch diff --git a/config/packages-list b/config/packages-list index ee0c8cd..7be0388 100644 --- a/config/packages-list +++ b/config/packages-list @@ -261,7 +261,7 @@ LIBXML2="libxml2-2.9.2" LIBXSLT="libxslt-1.1.26" LIBX264="x264-snapshot-20130416-2245" LIGHTTPD="lighttpd-1.4.32" -LILYPOND="lilypond-2.16.2" +LILYPOND="lilypond-2.18.2" LLVM="llvm-3.1" LTSP_UTILS="ltsp-utils-0.25-0" LUA="lua-5.2.3" diff --git a/stage5/patches/common/lilypond-2.18.2-fontforge.patch b/stage5/patches/common/lilypond-2.18.2-fontforge.patch new file mode 100644 index 0000000..8bf909e --- /dev/null +++ b/stage5/patches/common/lilypond-2.18.2-fontforge.patch @@ -0,0 +1,357 @@ +diff -Naur lilypond-2.18.2.orig/aclocal.m4 lilypond-2.18.2.new/aclocal.m4 +--- lilypond-2.18.2.orig/aclocal.m4 2014-03-17 11:29:16.000000000 -0400 ++++ lilypond-2.18.2.new/aclocal.m4 2014-12-26 23:41:23.660317995 -0500 +@@ -42,7 +42,7 @@ + + 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-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +diff -Naur lilypond-2.18.2.orig/configure lilypond-2.18.2.new/configure +--- lilypond-2.18.2.orig/configure 2014-03-17 11:29:16.000000000 -0400 ++++ lilypond-2.18.2.new/configure 2014-12-26 23:50:54.329361451 -0500 +@@ -2295,7 +2295,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -2444,7 +2444,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -2594,7 +2594,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -2851,7 +2851,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -4362,7 +4362,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -5271,7 +5271,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -5788,7 +5788,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -6094,7 +6094,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -6588,7 +6588,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -6669,7 +6669,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -6826,7 +6826,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -7707,7 +7707,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -7858,7 +7858,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -8007,7 +8007,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -8071,7 +8071,7 @@ + + if test -z "$_ver"; then + ## If empty, try date [fontforge] +- eval _ver=\"\`("$METAPOST" --version || "$METAPOST" -V) 2>&1 | grep '[0-9]\{6,8\}' \ ++ eval _ver=\"\`("$METAPOST" --version || "$METAPOST" -V) 2>&1 | grep ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -8223,7 +8223,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -8323,7 +8323,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -9329,7 +9329,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -10007,7 +10007,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -10921,7 +10921,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -11823,7 +11823,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -11907,7 +11907,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -12123,7 +12123,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -12323,7 +12323,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -12528,7 +12528,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -12679,7 +12679,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -12828,7 +12828,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -12977,7 +12977,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -13126,7 +13126,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -13275,7 +13275,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -13424,7 +13424,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -13573,7 +13573,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -13722,7 +13722,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -13897,7 +13897,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -14046,7 +14046,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -14196,7 +14196,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi +@@ -14345,7 +14345,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 ' [0-9]\{6,8\}' \ + | head -n 1 \ + | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + fi -- 2.20.1