X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=8c049cd4ddcdac7cbfe5225f72eb5cf466a829b0;hb=496fe638ddb82977bb02578cc9e1c39ffcc8c41e;hp=c4709cb94b1c95557b79992677fd224e279bcd17;hpb=4ac4f006de179a329334e661774805daf19a8284;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index c4709cb..8c049cd 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -8,9 +8,18 @@ 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}
+ipkg ${GLIB_NETWORKING} "\
+    --libexecdir=/usr/lib/glib-networking \
+    --with-ca-certificates=/etc/ssl/ca-bundle.crt \
+    --disable-static"
+ipkg -s "icu" ${ICU}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -24,7 +33,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${PANGOMM}
     ipkg ${ATK}
     ipkg ${GDK_PIXBUF}
-    ipkg ${GTK} "--disable-gtk-doc-html"
+    ipkg ${GTK} "--disable-gtk-doc"
     ipkg ${ATKMM}
     ipkg ${GTKMM} "--disable-documentation"
     ipkg ${GTK_ENGINES}
@@ -33,10 +42,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${PYGTK}
 
     ipkg ${EMACS}
+    ipkg ${MMM_MODE}
     ipkg ${HVCLOCK}
     ipkg ${WMNOTIFY}
 
-    # Needed by Gnome
     ipkg ${DESKTOP_FILE_UTILS}
     ipkg -m acnb ${SHARED_MIME_INFO}
     ipkg ${STARTUP_NOTIFICATION}
@@ -46,8 +55,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBGLADE}
     ipkg -m acnb ${GCONF}
     ipkg ${GNOME_KEYRING}
+    ipkg ${LIBSOUP} "--disable-static --without-gnome"
 fi
 
+ipkg ${GPARTED} "--disable-doc"
 ipkg -m acnb ${GHOSTSCRIPT}
 ipkg ${LIBSPECTRE}
 
@@ -57,7 +68,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${VIEWNIOR}
     # xpdf headers are needed by inkscape
     ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
-    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-mozilla-plugin"
+    ipkg ${LIBCROCO} "--disable-static"
+    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
     ipkg ${BABL}
     ipkg ${GEGL}
     ipkg ${GIMP}
@@ -71,10 +83,11 @@ ipkg -m noac ${DVDRWTOOLS}
 ipkg ${LIBDVDCSS}
 ipkg ${LIBDVDREAD}
 ipkg -m noac ${DVDFS}
+ipkg -m acnb ${VOBCOPY}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     rscr once "Installing TexLive texmf" install-texlive-texmf
-    ipkg -s texlive ${TEXLIVE}
+    ipkg -s texlive -m acnb ${TEXLIVE}
 fi
 
 if [ "x${SANE_SUPPORT}" = "xyes" ]; then
@@ -108,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}
@@ -124,12 +144,27 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${GST_PLUGINS_UGLY}
         ipkg -m acnb ${GST_FFMPEG} "--with-ffmpeg-extra-configure=--disable-yasm"
         ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control
+
+        ipkg ${WXGTK} "--enable-unicode --disable-compat26"
+        # Bug with system-installed portaudio and ffmpeg
+        ipkg -m acnb ${AUDACITY} "--with-libsamplerate --with-portaudio=local --with-ffmpeg=local"
     fi
 
     ipkg ${SYLPHEED} "--enable-ssl --enable-ldap"
     ipkg ${LIBNOTIFY}
     ipkg ${YASM}
     ipkg ${LIBVPX} "--enable-shared"
+
+    ipkg -m acnb -t -j ${WEBKIT} "\
+        --libexecdir=/usr/lib/WebKitGTK \
+        --with-gstreamer=0.10 \
+        --enable-introspection \
+        --with-gtk=2.0 \
+        --disable-geolocation \
+        --disable-gtk-doc"
+    ipkg ${VALA}
+    NOCOLOR=1 ipkg ${MIDORI}
+
     ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
@@ -139,7 +174,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m acnb ${VLC}  "--enable-mozilla --enable-qt4 --enable-ncurses"
     ipkg ${SDL}
     ipkg -m noac ${AGG}
-#    ipkg ${GNASH} # Problème de compilation, désactivé
+    ipkg ${GNASH}
 fi
 
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
@@ -149,6 +184,10 @@ ipkg ${XARCHIVER}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
+ipkg -s apache ${HTTPD} # Apache
+ipkg ${LIGHTTPD}
+ipkg ${PHP}
+
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${PROCMAIL}
     ipkg -m noac ${LIBSPF2}
@@ -169,18 +208,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"
@@ -201,7 +234,7 @@ fi
 
 ipkg -m acnb ${KVM}
 ipkg -m acnb ${BRIDGE_UTILS}
-ipkg ${TUNCTL}
+ipkg -m noac ${TUNCTL}
 
 ipkg ${LIBEVENT}
 ipkg ${TRANSMISSION} "--disable-daemon"
@@ -214,7 +247,7 @@ ipkg ${TRANSMISSION} "--disable-daemon"
 #ipkg ${GEDA_SYMCHECK}
 #ipkg ${GEDA_GATTRIB}
 
-#rscr mult  "Performing post-install" post-install
+rscr mult  "Performing post-install" post-install
 
 write_completed_stage
 display_stage_build_stats