Add dia

[hvlinux.git] / stage5 / hv-install-1

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 153e599..61ee5ec 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -64,7 +64,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${ISO_CODES}
     ipkg ${LIBXKLAVIER}
     ipkg ${LIBGLADE}
-    ipkg -m acnb ${GCONF}
+    ipkg -m acnb ${GCONF} "\
+        --disable-orbit \
+        --disable-static"
     ipkg -c -m noac ${CERTDATA}
     ipkg ${P11KIT}
     ipkg ${GCR} "--without-gtk" # Needs Gtk3
@@ -72,6 +74,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 
     ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
+
+    ipkg -m noac ${DBUS_PYTHON}
+    ipkg -m acnb ${WICD}
 fi
 
 ipkg ${GPARTED} "--disable-doc"
@@ -85,6 +90,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
     ipkg ${BABL}
     ipkg ${GEGL}
+    ipkg -m acnb ${DIA}
     ipkg ${GIMP}
     ipkg -m acnb ${GUTENPRINT}
     ipkg -s boost -m noac ${BOOST}
@@ -98,7 +104,6 @@ ipkg ${CUPS_FILTERS} " \
     --with-gs-path=/usr/bin/gs \
     --with-pdftops-path=/usr/bin/gs \
     --disable-static"
-ipkg -m noac ${CUPS_PDF}
 ipkg -m noac ${SPLIX}
 ipkg ${FOOMATIC_FILTERS}
 ipkg -m noac ${FOO2ZJS}
@@ -118,6 +123,11 @@ fi
 if [ "x${SANE_SUPPORT}" = "xyes" ]; then
     ipkg -m acnb ${SANE_BACKENDS}
     ipkg -m acnb ${XSANE}
+
+    # Epson scanners
+    ipkg -m noac ${ISCAN_PLUGIN}
+    ipkg ${ISCAN_DATA}
+    ipkg -m acnb ${ISCAN} "--localstatedir=/var"
 fi
 
 ipkg -m pm ${PERL_MOD_XML_SIMPLE}
@@ -209,7 +219,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     fi
 
     ipkg ${LIBEVENT}
-    ipkg -m noac ${NSPR} "--with-mozilla --with-pthreads \
+    ipkg -d "nspr" ${NSPR} "--with-mozilla --with-pthreads \
         $([ $(uname -m) = x86_64 ] && echo --enable-64bit)"
     ipkg -m noac ${NSS}
     ipkg -m noac ${FIREFOX}
@@ -222,7 +232,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m noac ${LUA}
     ipkg -m acnb ${VLC}  "--enable-mozilla --enable-qt4 --enable-ncurses"
     ipkg ${SDL}
-    ipkg -m noac ${AGG}
+    ipkg ${AGG} " \
+        --disable-static \
+        --enable-ctrl \
+        --enable-gpc"
     if [ "x${USE_GNASH}" = "xyes" ]; then
         ipkg ${GNASH}
     fi
@@ -284,7 +297,11 @@ ipkg -m noac ${MERCURIAL}
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then
-    ipkg ${SAMBA}
+    ipkg -d source ${SAMBA} "\
+        --localstatedir=/var \
+        --with-piddir=/var/run \
+        --with-fhs \
+        --with-smbmount"
 fi
 
 if [ "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -306,8 +323,8 @@ ipkg ${AVRDUDE} "--disable-parport"
 
 # Astronomie
 ipkg -m noac ${STELLARIUM}
-ipkg ${GTKGLEXT}
-ipkg -m acnb ${CELESTIA} "--with-gtk"
+##ipkg ${GTKGLEXT}
+##ipkg -m acnb ${CELESTIA} "--with-gtk"
 
 ipkg -m noac ${I2C_TOOLS}
 ipkg -m noac ${HDPARM}