From c736c1a35f98a9141ed3dccafa93a21a08275c30 Mon Sep 17 00:00:00 2001 From: hugo Date: Fri, 5 Mar 2010 23:25:45 +0000 Subject: [PATCH] Travail sur stage5 --- dependencies | 15 ++++++- packages-list | 18 ++++---- {stage4 => stage5}/cis-emacs | 0 {stage6 => stage5}/cis-gconf | 0 {stage6 => stage5}/cis-gnome | 0 {stage6 => stage5}/cis-gnome-config | 0 {stage6 => stage5}/cis-gnome-nobuild | 0 {stage6 => stage5}/cis-iso-codes | 0 stage5/packages-update | 23 +++++++--- .../resources/emacs/buffer-cycle.el | 0 {stage4 => stage5}/resources/emacs/emacsrc | 0 stage5/stage5-install | 44 +++++++++++++------ stage6/cis-gnome-nb | 28 ------------ 13 files changed, 72 insertions(+), 56 deletions(-) rename {stage4 => stage5}/cis-emacs (100%) rename {stage6 => stage5}/cis-gconf (100%) rename {stage6 => stage5}/cis-gnome (100%) rename {stage6 => stage5}/cis-gnome-config (100%) rename {stage6 => stage5}/cis-gnome-nobuild (100%) rename {stage6 => stage5}/cis-iso-codes (100%) rename {stage4 => stage5}/resources/emacs/buffer-cycle.el (100%) rename {stage4 => stage5}/resources/emacs/emacsrc (100%) delete mode 100755 stage6/cis-gnome-nb diff --git a/dependencies b/dependencies index 45c102b..a905320 100644 --- a/dependencies +++ b/dependencies @@ -44,8 +44,6 @@ ${EGGDBUS}: ${DBUS_GLIB} ${GOBJECT_INSTROSPECTION}: ${GLIB} ${LIBFFI} ${POLKIT}: ${GOBJECT_INSTROSPECTION} ${EGGDBUS} -${GNOME_KEYRING}: ${LIBTASN1} - ${HELP2MAN}: ${PERL} ${BITBAKE}: ${HELP2MAN} @@ -100,3 +98,16 @@ webalizer: gd-2.0.33 ${LILYPOND}: fontforge mftrace t1utils autotrace ${TANGO}: ${PERL_MOD_XML_SIMPLE} ${PERL_MOD_PARSE_REDESCENT} + +${LIBGPG_ERROR}: +${LIBGCRYPT}: ${LIBGPG_ERROR} +${LIBTASN1}: +${GUILE}: +${GNUTLS}: ${LIBGCRYPT} ${LIBTASN1} ${GUILE} + +${LIBIDL}: ${GLIB} +${ORBIT2}: ${LIBIDL} ${OPENSSL} +${GCONF}: ${ORBIT2} ${POLKIT} ${GTK} +${LIBPROXY}: ${GCONF} +${GNOME_KEYRING}: ${GCONF} ${LIBTASN1} ${LIBGCRYPT} +${LIBSOUP}: ${GNUTLS} ${GNOME_KEYRING} ${LIBPROXY} ${SQLITE} ${LIBXML2} diff --git a/packages-list b/packages-list index 0f76ace..a2c79e8 100644 --- a/packages-list +++ b/packages-list @@ -88,9 +88,7 @@ FUSE="fuse-2.8.3" GAWK="gawk-3.1.7" GC="gc6.8" -GCC_CORE="gcc-4.4.2" -ARM_GCC_CORE=${GCC_CORE} -AVR_GCC_CORE=${GCC_CORE} +GCC="gcc-4.4.2" GDB="gdb-6.4" GDBM="gdbm-1.8.3" GIT="git-1.6.6.1" @@ -111,7 +109,7 @@ GIMP="gimp-2.6.8" GUTENPRINT="gutenprint-5.2.5" GLIB="glib-2.22.4" GLIBMM="glibmm-2.22.1" -#####GLITZ="glitz-0.5.6" #DEPRECATED +GLITZ="glitz-0.5.6" # GNOME2 core packages GNOME2_VER="gnome-2.28.1" @@ -183,7 +181,7 @@ GNOME_TOTEM="totem-2.28.1" GDM="gdm-2.28.1" GMP="gmp-4.3.1" GNOME_MOUNT="gnome-mount-0.6" -GNUTLS="gnutls-1.6.3" +GNUTLS="gnutls-2.8.5" GOBJECT_INSTROSPECTION="gobject-introspection-0.6.5" GOFFICE="goffice-0.2.2" GNUMERIC="gnumeric-1.6.3" @@ -222,7 +220,7 @@ INKSCAPE="inkscape-0.47" INTLTOOL="intltool-0.40.6" IPROUTE2="iproute2-2.6.29-1" IPTABLES="iptables-1.3.8" -ISO_CODES="iso-codes-1.2" +ISO_CODES="iso-codes-3.11" JACK="jack-audio-connection-kit-0.103.0" JADETEX="jadetex-3.13" @@ -250,8 +248,10 @@ LIBFAAD2="faad2-2.7" LIBFAAC="faac-1.28" LIBFFI="libffi-3.0.8" LIBGAMIN="gamin-0.1.9" +LIBGCRYPT="libgcrypt-1.4.5" LIBGEDA="libgeda-1.2.0" LIBGLADE="libglade-2.6.4" +LIBGPG_ERROR="libgpg-error-1.7" LIBGSF="libgsf-1.14.7" LIBID3TAG="libid3tag-0.15.1b" LIBIDL="libIDL-0.8.13" @@ -265,6 +265,7 @@ LIBOIL="liboil-0.3.15" LIBOPENJPEG="libopenjpeg-1.2" LIBPCAP="libpcap-1.0.0" LIBPNG="libpng-1.2.39" +LIBPROXY="libproxy-0.2.3" LIBPTHREAD_STUBS="libpthread-stubs-0.1" LIBRSVG="librsvg-2.26.0" LIBSAMPLERATE="libsamplerate-0.1.2" @@ -272,7 +273,7 @@ LIBSIGCPP="libsigc++-2.2.4.2" LIBSNDFILE="libsndfile-1.0.18pre18" LIBSOUP="libsoup-2.28.2" LIBSPF2="libspf2-1.2.5" -LIBTASN1="libtasn1-2.2" +LIBTASN1="libtasn1-2.3" LIBTHEORA="libtheora-1.0" LIBTOOL="libtool-2.2.6a" LIBVORBIS="libvorbis-1.2.3" @@ -349,9 +350,10 @@ PROCMAIL="procmail-3.22" PROCPS="procps-3.2.8" PSMISC="psmisc-22.9" PULSEAUDIO="pulseaudio-0.9.12" -PYTHON="Python-2.6.4" +PYCAIRO="pycairo-1.8.8" PYGOBJECT="pygobject-2.20.0" PYGTK="pygtk-2.16.0" +PYTHON="Python-2.6.4" READLINE="readline-6.1" REISERFSPROGS="reiserfsprogs-3.6.21" diff --git a/stage4/cis-emacs b/stage5/cis-emacs similarity index 100% rename from stage4/cis-emacs rename to stage5/cis-emacs diff --git a/stage6/cis-gconf b/stage5/cis-gconf similarity index 100% rename from stage6/cis-gconf rename to stage5/cis-gconf diff --git a/stage6/cis-gnome b/stage5/cis-gnome similarity index 100% rename from stage6/cis-gnome rename to stage5/cis-gnome diff --git a/stage6/cis-gnome-config b/stage5/cis-gnome-config similarity index 100% rename from stage6/cis-gnome-config rename to stage5/cis-gnome-config diff --git a/stage6/cis-gnome-nobuild b/stage5/cis-gnome-nobuild similarity index 100% rename from stage6/cis-gnome-nobuild rename to stage5/cis-gnome-nobuild diff --git a/stage6/cis-iso-codes b/stage5/cis-iso-codes similarity index 100% rename from stage6/cis-iso-codes rename to stage5/cis-iso-codes diff --git a/stage5/packages-update b/stage5/packages-update index 54344bc..866d189 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -21,9 +21,11 @@ if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then export TEST_INTEGRITY=1 fi +GNUPG_URL="ftp://ftp.gnupg.org/gcrypt" + # Gtk fpkg_gnome ${GTK_DOC} -######fpkg ${GLITZ} "http://cairographics.org/snapshots" +fpkg ${GLITZ} "http://cairographics.org/snapshots" fpkg ${CAIRO} "http://cairographics.org/releases" fpkg ${CAIROMM} "http://cairographics.org/releases" fpkg_gnome ${PANGO} @@ -31,6 +33,7 @@ fpkg_gnome ${ATK} fpkg_gnome ${GTK} fpkg_gnome ${GTK_ENGINES} fpkg_gnome ${PYGOBJECT} +fpkg ${PYCAIRO} "http://cairographics.org/releases" fpkg_gnome ${PYGTK} fpkg_gnome ${LIBSIGCPP} fpkg ${GC} " http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source" @@ -45,10 +48,22 @@ fpkg ${DESKTOP_FILE_UTILS} "http://freedesktop.org/software/desktop-file-u fpkg ${SHARED_MIME_INFO} "http://people.freedesktop.org/~hadess" fpkg_gnome ${STARTUP_NOTIFICATION} fpkg_gnome ${LIBWNCK} +fpkg ${ISO_CODES} ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes fpkg_sf ${LIBXKLAVIER} gswitchit fpkg_gnome ${LIBGLADE} -fpkg_gnome ${LIBSOUP} +fpkg_gnu ${LIBTASN1} +fpkg_gnu ${GUILE} +fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL} +fpkg -s "libgcrypt" ${LIBGCRYPT} ${GNUPG_URL} +fpkg -s "gnutls" ${GNUTLS} ${GNUPG_URL} fpkg_gnome ${LIBIDL} +fpkg_gnome ${ORBIT2} +fpkg_gnome ${GCONF} +fpkg ${LIBPROXY} "http://libproxy.googlecode.com/files" +fpkg_gnome ${GNOME_KEYRING} +fpkg_gnome ${LIBSOUP} + + fpkg_gnu ${HELP2MAN} fpkg_gnu ${GSL} @@ -205,8 +220,6 @@ fpkg_sf ${KVM} fpkg_hv ${BRIDGE_UTILS} fpkg_hv ${UML_UTILITIES} -fpkg_gnu ${GUILE} - fpkg ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files" fpkg_hv ${CKERMIT} @@ -214,6 +227,6 @@ fpkg_hv ${CKERMIT} fpkg ${LIBGAMIN} "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles" fpkg_sf ${PCMANFM} -fpkg ${GNUPG} "ftp://ftp.gnupg.org/gcrypt/gnupg" +fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt" exit $? diff --git a/stage4/resources/emacs/buffer-cycle.el b/stage5/resources/emacs/buffer-cycle.el similarity index 100% rename from stage4/resources/emacs/buffer-cycle.el rename to stage5/resources/emacs/buffer-cycle.el diff --git a/stage4/resources/emacs/emacsrc b/stage5/resources/emacs/emacsrc similarity index 100% rename from stage4/resources/emacs/emacsrc rename to stage5/resources/emacs/emacsrc diff --git a/stage5/stage5-install b/stage5/stage5-install index 61ef340..0eba619 100755 --- a/stage5/stage5-install +++ b/stage5/stage5-install @@ -23,23 +23,23 @@ 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 ${GTK_DOC} -##### ipkg_ac ${GLITZ} DEPRECATED - ipkg_ac ${CAIRO} "--enable-glitz" +### ipkg_ac ${GLITZ} + ipkg_ac ${CAIRO} ipkg_ac ${CAIROMM} - ipkg_ac ${PANGO} + ipkg_ac_nb ${PANGO} ipkg_ac ${ATK} ipkg_ac ${GTK} "--without-libjasper" 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_ac ${GTKMM} ipkg_cust ${EMACS} cis-emacs ipkg_ac ${HVCLOCK} @@ -50,14 +50,38 @@ 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} + +exit 1 +exit 1 + ipkg_cust ${CUPS} cis-cups ipkg_cust ${SPLIX} cis-splix # Drivers Samsung pour CUPS ipkg_ac ${JASPER} "--enable-shared" @@ -243,12 +267,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 diff --git a/stage6/cis-gnome-nb b/stage6/cis-gnome-nb deleted file mode 100755 index 4920e10..0000000 --- a/stage6/cis-gnome-nb +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} && - -cd ${LFS_TMP}/${PACKAGE} && -./configure \ - --prefix=${GNOME2_PREFIX} \ - --libexecdir=${GNOME2_PREFIX}/sbin \ - --sysconfdir=/etc/gnome/${GNOME2_VER} \ - --localstatedir=/var/lib \ - ${CONFIGURE_OPTS} && -make && -make install && -ldconfig - -exit $? -- 2.20.1