Add gcr, p11kit and certdata packages

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

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 68b77ab..3fac0bf 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -34,11 +34,14 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${CAIROMM}
     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,6 +60,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBXKLAVIER}
     ipkg ${LIBGLADE}
     ipkg -m acnb ${GCONF}
+    ipkg -c -m noac ${CERTDATA}
+    ipkg ${P11KIT}
+    ipkg ${GCR} "--without-gtk" # Needs Gtk3
     ipkg ${GNOME_KEYRING}
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 
@@ -67,12 +73,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}
@@ -106,14 +111,18 @@ ipkg ${TANGO_ICON_THEME_EXTRAS}
 ipkg ${GNOME_ICON_THEME}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    ipkg ${GSETTINGS_DESKTOP_SCHEMAS}
     ipkg ${EVINCE} "\
         --without-keyring \
         --disable-nautilus \
         --disable-help \
+        --enable-introspection \
         --enable-pixbuf \
         --enable-dvi \
         --enable-t1lib"
 
+    ipkg ${VALA}
+
     # Audio
     if [ "x${SOUND_CARD}" = "xyes" ]; then
         # Needed by some packages, mostly audio applications.
@@ -179,7 +188,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