From ee738742fa90a09ae267a05ff2a7b4e1039a7a65 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Tue, 29 Jan 2013 17:13:54 -0500
Subject: [PATCH] Fixed problems with Lilypond-2.16 by installing guile1

---
 config/packages-list   |  5 +++--
 stage3/hv-install-1    |  2 +-
 stage3/packages-update |  2 +-
 stage5/hv-install-1    | 11 +++++++++--
 stage5/packages-update |  2 +-
 stage5/pkg/guile1      | 17 +++++++++++++++++
 6 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 stage5/pkg/guile1

diff --git a/config/packages-list b/config/packages-list
index 4edf987..eb99d59 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -150,7 +150,8 @@ GST_FFMPEG="gst-ffmpeg-0.10.13"
 GTK="gtk+-2.24.12"
 GTK_ENGINES="gtk-engines-2.20.2"
 GTKMM="gtkmm-2.24.2"
-GUILE="guile-2.0.6"
+GUILE1="guile-1.8.8"
+GUILE2="guile-2.0.7"
 GUITARTEX="guitartex-hv-r119"
 GUTENPRINT="gutenprint-5.2.7"
 GVFS="gvfs-1.12.3"
@@ -241,7 +242,7 @@ LIBWNCK="libwnck-2.30.7"
 LIBXKLAVIER="libxklavier-5.2.1"
 LIBXML2="libxml2-2.8.0"
 LIBXSLT="libxslt-1.1.26"
-LILYPOND="lilypond-2.16.0"
+LILYPOND="lilypond-2.16.2"
 LLVM="llvm-3.1"
 LTSP_UTILS="ltsp-utils-0.25-0"
 LUA="lua-5.1.4"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 143216c..a609765 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -137,7 +137,7 @@ ipkg -m noac ${CKERMIT}
 ipkg ${LIBTASN1}
 ipkg ${LIBUNISTRING}
 ipkg ${BDWGC}
-ipkg ${GUILE} \
+ipkg ${GUILE2} \
     --enable-posix \
     --disable-static \
     --enable-networking \
diff --git a/stage3/packages-update b/stage3/packages-update
index 27ba1cb..b97428f 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -127,7 +127,7 @@ fpkg -m hv ${CKERMIT}
 fpkg -m gnu ${LIBTASN1}
 fpkg -m gnu ${LIBUNISTRING}
 fpkg ${BDWGC} "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source"
-fpkg -m gnu ${GUILE}
+fpkg -m gnu ${GUILE2}
 fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL}
 fpkg -s "libgcrypt"    ${LIBGCRYPT}    ${GNUPG_URL}
 fpkg -e "tar.gz" ${NETTLE} "http://www.lysator.liu.se/~nisse/archive"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index d9cf9d0..857d31e 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -117,8 +117,15 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
         ipkg -m acnb ${EASYTAG}
-        ipkg -m acnb ${FONTFORGE}
-        ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
+        ipkg -m acnb ${FONTFORGE} "--enable-double"
+
+        # -Wno-error=unused-but-set-variable: Fix for newer GCC.
+        CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable" \
+            ipkg -s guile1 ${GUILE1}
+
+        # Lilypond 2.17 ne fonctionne pas encore avec guile2
+        PATH="/opt/guile1/bin/:$PATH" \
+            ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
 
         # ChordPro utils
         ipkg -m noac ${CHORDPACK}
diff --git a/stage5/packages-update b/stage5/packages-update
index 7847bf0..9bdf359 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -102,9 +102,9 @@ fpkg -m sf ${GRIP}
 fpkg -m sf -e "tar.bz2" ${CDRDAO}
 fpkg -m sf -e "tar.bz2" ${EASYTAG}
 fpkg -m sf -e "tar.bz2" -s "fontforge/fontforge-source" ${FONTFORGE}
+fpkg -m gnu ${GUILE1}
 fpkg -e "tar.gz" ${LILYPOND} \
     "http://lilypond.org/download/sources/v$(get_pkg_ver2 ${LILYPOND})"
-
 fpkg -m hv ${CHORDPACK}
 fpkg -m hv ${GUITARTEX}
 
diff --git a/stage5/pkg/guile1 b/stage5/pkg/guile1
new file mode 100644
index 0000000..47cec6c
--- /dev/null
+++ b/stage5/pkg/guile1
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+hvconfig_pre()
+{
+    CONFIGURE_OPTS="\
+        --prefix=/opt/guile1 \
+        --enable-posix \
+        --disable-static \
+        --enable-networking \
+        --enable-regex"
+}
+
+hvbuild_post()
+{
+    # Addition to /etc/ld.so.conf
+    string_add "/opt/guile1/lib" /etc/ld.so.conf
+}
-- 
2.20.1