Upgrade to firefox-34.0.5

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

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 3fac0bf..d18b863 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -32,6 +32,11 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${GLIBMM}
     ipkg ${CAIRO} "--enable-tee"
     ipkg ${CAIROMM}
+    ipkg ${HARFBUZZ}
+
+    # Freetype was installed in stage3, but needs to be reinstalled after harfbuzz
+    ipkg ${FREETYPE} "--disable-static"
+
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
     ipkg ${GDK_PIXBUF} "--with-x11"
@@ -63,7 +68,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -c -m noac ${CERTDATA}
     ipkg ${P11KIT}
     ipkg ${GCR} "--without-gtk" # Needs Gtk3
-    ipkg ${GNOME_KEYRING}
+    ipkg ${GNOME_KEYRING} "--with-pam-dir=/lib/security --disable-debug"
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 
     ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
@@ -195,8 +200,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     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 ${FIREFOX}
 
     ipkg -m noac ${KEYUTILS}
     ipkg -s ecryptfs-utils ${ECRYPTFS_UTILS}
@@ -215,7 +219,7 @@ fi
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
 ipkg ${MENU_CACHE}
 ipkg ${GVFS}
-ipkg ${XARCHIVER}
+ipkg -m acnb ${XARCHIVER}
 ipkg ${GNOME_MENUS}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}