Fix compile bug with xarchiver build directory

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

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index d49f978..29e2f3d 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"
@@ -41,6 +46,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     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"
@@ -59,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"
@@ -211,7 +220,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}