X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=5ed574bd56676fd5864fcdc1fc65b4587f5d04e4;hb=498549fb1b100f0649a8fcee8a5f5a0e0593369a;hp=77c9cf78402fbcaed43cfd6db7b7ca5674451683;hpb=60157f2c50d533839a848c05bb99e6fbf8d2da01;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 77c9cf7..5ed574b 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -8,6 +8,10 @@ init_log_file
 
 ipkg ${HELP2MAN}
 ipkg ${GSL}
+
+ipkg ${FOOMATIC_FILTERS}
+ipkg -m noac ${FOO2ZJS}
+
 ipkg -m acnb ${CUPS}
 ipkg -m noac ${CUPS_PDF}
 ipkg -m noac ${SPLIX}
@@ -54,6 +58,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 fi
 
+ipkg ${GPARTED} "--disable-doc"
 ipkg -m acnb ${GHOSTSCRIPT}
 ipkg ${LIBSPECTRE}
 
@@ -116,8 +121,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}
@@ -172,6 +184,9 @@ ipkg ${XARCHIVER}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
+ipkg -s apache ${HTTPD} # Apache
+ipkg ${PHP}
+
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${PROCMAIL}
     ipkg -m noac ${LIBSPF2}
@@ -192,18 +207,12 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     ipkg ${UW_IMAP}
 
-    ipkg ${HTTPD} # Apache
-    ipkg ${PHP}
-
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
     # Subversion server (client was already installed in stage2)
     ipkg ${SUBVERSION}
-fi
 
-if [ "x${INST_TYPE}" = "xworkstation" -o \
-    "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${LIBGSF}
     ipkg -m acnb ${GOFFICE}
     ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"