X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fstage5-install;h=cd267f7e18e649408047a18ef9e441c92e6f4b19;hb=7f1a3e5d69d0b1d64619604c30243e0070dc09ad;hp=61ef3405099852fb49c57060eb26d4e72b52b9c5;hpb=532a0d1a77242192d6809b03ec7c14e271e29e82;p=hvlinux.git

diff --git a/stage5/stage5-install b/stage5/stage5-install
index 61ef340..cd267f7 100755
--- a/stage5/stage5-install
+++ b/stage5/stage5-install
@@ -23,23 +23,24 @@ init_log_file
 # Scripts directory
 export SCRDIR=$(pwd)
 
-# X-Window
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     # Gtk
+    ipkg_ac    ${LIBSIGCPP}
+    ipkg_ac    ${JASPER} "--enable-shared"
     ipkg_ac    ${GTK_DOC}
-#####    ipkg_ac    ${GLITZ} DEPRECATED
-    ipkg_ac    ${CAIRO} "--enable-glitz"
+    ipkg_ac    ${GLIBMM}
+    ipkg_ac    ${CAIRO}
     ipkg_ac    ${CAIROMM}
-    ipkg_ac    ${PANGO}
+    ipkg_ac_nb ${PANGO}
+    ipkg_ac    ${PANGOMM}
     ipkg_ac    ${ATK}
-    ipkg_ac    ${GTK} "--without-libjasper"
+    ipkg_ac    ${GTK}
+    ipkg_ac    ${GTKMM}
     ipkg_ac    ${GTK_ENGINES}
     ipkg_ac    ${PYGOBJECT}
+    ipkg_ac    ${PYCAIRO}
     ipkg_ac    ${PYGTK}
-    ipkg_ac    ${LIBSIGCPP}
     ipkg_ac    ${GC}
-    ipkg_ac    ${GLIBMM}
-    ipkg_ac    ${GTKMM}
 
     ipkg_cust  ${EMACS} cis-emacs
     ipkg_ac    ${HVCLOCK}
@@ -50,21 +51,41 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${SHARED_MIME_INFO}
     ipkg_ac    ${STARTUP_NOTIFICATION}
     ipkg_ac    ${LIBWNCK}
+    ipkg_cust  ${ISO_CODES} cis-iso-codes
     ipkg_ac    ${LIBXKLAVIER}
     ipkg_ac    ${LIBGLADE}
-    ipkg_ac    ${LIBSOUP}
+    ipkg_ac    ${LIBTASN1}
+    ipkg_ac    ${GUILE} \
+        --enable-posix \
+        --disable-static \
+        --enable-networking \
+        --enable-regex
+    ipkg_ac    ${LIBGPG_ERROR}
+    ipkg_ac    ${LIBGCRYPT}
+    ipkg_ac_nb ${GNUTLS}
     ipkg_ac    ${LIBIDL}
+
+    # GNOME-2.X configuration
+    rscr mult "Configuring ${GNOME2_VER}" ./cis-gnome-config
+    source /etc/profile
+
+    ipkg_gnome ${ORBIT2}
+    ipkg_cust  ${GCONF} cis-gconf
+    ipkg_ac    ${LIBPROXY} "--with-gnome"
+    ipkg_gnome ${GNOME_KEYRING}
+    ipkg_ac    ${LIBSOUP}
 fi
 
 ipkg_ac   ${HELP2MAN}
 ipkg_ac   ${GSL}
 ipkg_cust ${CUPS}     cis-cups
-ipkg_cust ${SPLIX}    cis-splix # Drivers Samsung pour CUPS
-ipkg_ac   ${JASPER} "--enable-shared"
+ipkg_cust ${CUPS_PDF} cis-cups-pdf
+ipkg_cust ${SPLIX}    cis-splix
 ipkg_cust ${GHOSTSCRIPT} cis-ghostscript
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    ipkg_ac    ${IMAGE_MAGICK} "--with-modules"
+    ipkg_ac    ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib"
+    # xpdf headers needed by inkscape
     ipkg_ac    ${POPPLER} "--enable-xpdf-headers --enable-zlib"
     ipkg_ac    ${LIBRSVG} "--disable-gtk-doc --disable-mozilla-plugin"
     ipkg_ac    ${BABL}
@@ -72,14 +93,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${GIMP} "--disable-print"
     ipkg_ac_nb ${GUTENPRINT}
     ipkg_cust  ${BOOST} cis-boost
-    ipkg_ac    ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
+    # inkscape-0.47 has a problem with poppler >= 0.12.2
+    ####ipkg_ac    ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
 fi
 
-exit 1
-exit 1
-
-
-
 ipkg_cust ${CDRTOOLS} cis-cdrtools
 ipkg_cust ${DVDRWTOOLS} cis-dvd-rw-tools
 ipkg_ac   ${LIBDVDCSS}
@@ -88,6 +105,8 @@ ipkg_cust ${DVDFS} cis-dvdfs
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg_cust ${TETEX_SRC} cis-tetex
+
+    # 'Five years old' bug --> Change the date to something in 2004 before installing.
     ipkg_cust ${JADETEX}   cis-jadetex
 fi
 
@@ -243,12 +262,6 @@ ipkg_ac_nb ${KVM}
 ipkg_ac_nb ${BRIDGE_UTILS}
 ipkg_cust  ${UML_UTILITIES} cis-uml-utilities
 
-ipkg_ac    ${GUILE} \
-    --enable-posix \
-    --disable-static \
-    --enable-networking \
-    --enable-regex
-
 ipkg_cust  ${CKERMIT} cis-ckermit
 
 # BitTorrent client
@@ -256,6 +269,18 @@ ipkg_ac    ${TRANSMISSION} "--disable-daemon"
 
 ipkg_ac    ${GNUPG} "--libexecdir=/usr/lib"
 
+
+
+
+ipkg_ac  ${LIBGEDA}
+ipkg_ac  ${GEDA_SYMBOLS}
+ipkg_ac  ${GEDA_GSCHEM}
+ipkg_ac  ${GEDA_GNETLIST}
+ipkg_ac  ${GEDA_SYMCHECK}
+ipkg_ac  ${GEDA_GATTRIB}
+
+
+
 rscr mult  "Performing post-install" cis-post-install
 
 exit $?