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 7936a07..d18b863 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -32,13 +32,21 @@ 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 ${ATK}
     ipkg ${GDK_PIXBUF} "--with-x11"
-    ipkg ${GTK} "--disable-gtk-doc"
+    ipkg ${LIBCROCO} "--disable-static"
+    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
+    ipkg ${ATK}
     ipkg ${ATKMM}
+    ipkg ${GTK} "--disable-gtk-doc"
     ipkg ${GTKMM} "--disable-documentation"
+    ipkg ${ADWAITA_ICON_THEME}
     ipkg ${GTK_ENGINES}
     ipkg -m acnb ${PYCAIRO}
     ipkg ${PYGOBJECT} "--disable-introspection"
@@ -57,7 +65,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBXKLAVIER}
     ipkg ${LIBGLADE}
     ipkg -m acnb ${GCONF}
-    ipkg ${GNOME_KEYRING}
+    ipkg -c -m noac ${CERTDATA}
+    ipkg ${P11KIT}
+    ipkg ${GCR} "--without-gtk" # Needs Gtk3
+    ipkg ${GNOME_KEYRING} "--with-pam-dir=/lib/security --disable-debug"
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 
     ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
@@ -67,12 +78,11 @@ ipkg ${GPARTED} "--disable-doc"
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
+    ipkg -m acnb ${EVIV2}
     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 ${LIBCROCO} "--disable-static"
-    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
     ipkg ${BABL}
     ipkg ${GEGL}
     ipkg ${GIMP}
@@ -116,6 +126,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         --enable-dvi \
         --enable-t1lib"
 
+    ipkg ${VALA}
+
     # Audio
     if [ "x${SOUND_CARD}" = "xyes" ]; then
         # Needed by some packages, mostly audio applications.
@@ -181,7 +193,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
             --with-gtk=2.0 \
             --disable-geolocation \
             --disable-gtk-doc"
-        ipkg ${VALA}
         NOCOLOR=1 ipkg ${MIDORI}
     fi
 
@@ -189,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}
@@ -209,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}