X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=936f213ebd3d6bb8fd5a553426c86d25aa8d9431;hb=b6f8c455b6b970c08eab79303c95acbc1506f61d;hp=e19e182a9ae9f4ed38f2209915d2905f52a3e377;hpb=156d2726bb5be61a74ac4de5112085c7ae5d849a;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index e19e182..936f213 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -44,6 +44,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
     ipkg ${ATK}
     ipkg ${ATKMM}
+    ipkg ${AT_SPI2_CORE}
+    ipkg ${AT_SPI2_ATK}
     ipkg ${GTK} "--disable-gtk-doc"
     ipkg ${GTKMM} "--disable-documentation"
     ipkg ${ADWAITA_ICON_THEME}
@@ -64,7 +66,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 +76,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"
@@ -82,9 +89,14 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib"
     ipkg ${VIEWNIOR}
     # xpdf headers are needed by inkscape
-    ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
+    ipkg ${POPPLER} "\
+        --enable-xpdf-headers \
+        --enable-zlib \
+        --enable-build-type=release \
+        --enable-cmyk"
     ipkg ${BABL}
     ipkg ${GEGL}
+    ipkg -m acnb ${DIA}
     ipkg ${GIMP}
     ipkg -m acnb ${GUTENPRINT}
     ipkg -s boost -m noac ${BOOST}
@@ -98,7 +110,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 +129,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}
@@ -146,7 +162,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LIBOIL}
 
         # Audio applications
-        ipkg ${VTE} "--libexecdir=/usr/lib/vte --disable-gtk-doc"
+        ipkg ${VTE} "--disable-static --enable-introspection --disable-gtk-doc"
         ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
         ipkg ${ID3LIB}
@@ -209,7 +225,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}
@@ -287,7 +303,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
@@ -309,8 +329,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}