X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=452fcc58d2ee782130e961e188cedbf7bdae87cb;hb=2ae8d010cef72cd9f12c7ca3cf9260ffe68fa4ca;hp=4c3b61ab378bd848a0c8811ce30115251200c96b;hpb=39a19cacbb9a44c5ceadd254463ea87c588a82a3;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 4c3b61a..452fcc5 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -21,7 +21,6 @@ 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
@@ -34,7 +33,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
     ipkg ${ATK}
-    ipkg ${GDK_PIXBUF}
+    ipkg ${GDK_PIXBUF} "--with-x11"
     ipkg ${GTK} "--disable-gtk-doc"
     ipkg ${ATKMM}
     ipkg ${GTKMM} "--disable-documentation"
@@ -58,6 +57,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${GCONF}
     ipkg ${GNOME_KEYRING}
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
+
+    ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
 fi
 
 ipkg ${GPARTED} "--disable-doc"
@@ -167,9 +168,15 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         NOCOLOR=1 ipkg ${MIDORI}
     fi
 
+    ipkg -m noac ${NSPR} "--with-mozilla --with-pthreads \
+        $([ $(uname -m) = x86_64 ] && echo --enable-64bit)"
+    ipkg -m noac ${NSS}
     ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
+    ipkg -m noac ${KEYUTILS}
+    ipkg -s ecryptfs-utils ${ECRYPTFS_UTILS}
+
     ipkg -s qt ${QT}
     source /etc/profile
     ipkg -m noac ${LUA}
@@ -221,14 +228,14 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     # Subversion server (client was already installed in stage2)
     ipkg ${SUBVERSION}
-
-    ipkg ${LIBGSF}
-    ipkg -m acnb ${GOFFICE}
-    ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"
-    ipkg ${WV}
-    ipkg ${ABIWORD} "--disable-spellcheck"
 fi
 
+ipkg ${LIBGSF}
+ipkg -m acnb ${GOFFICE}
+ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"
+ipkg ${WV}
+ipkg ${ABIWORD} "--disable-spellcheck"
+
 ipkg -m noac ${MERCURIAL}
 
 ipkg ${INDENT}
@@ -257,6 +264,13 @@ ipkg ${TRANSMISSION} "--disable-daemon"
 #ipkg ${GEDA_SYMCHECK}
 #ipkg ${GEDA_GATTRIB}
 
+# Astronomie
+ipkg -m noac ${STELLARIUM}
+ipkg ${GTKGLEXT}
+ipkg -m acnb ${CELESTIA} "--with-gtk"
+
+ipkg -m noac ${I2C_TOOLS}
+
 rscr mult  "Performing post-install" post-install
 
 write_completed_stage