Mise à jour paquets gnome

diff --git a/config/packages-list b/config/packages-list
index 0b9996f..61f380e 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -14,7 +14,8 @@ APR="apr-1.3.9"
 APR_UTIL="apr-util-1.3.9"
 AVR_GDB="gdb-6.4"
 AVRDUDE="avrdude-5.1"
-ATK="atk-1.30.0"
+ATK="atk-1.32.0"
+ATKMM="atkmm-2.22.5"
 AUDIOFILE="audiofile-0.2.6"
 AUTOCONF="autoconf-2.67"
 AUTOMAKE="automake-1.11.1"
@@ -30,8 +31,8 @@ AVR_BINUTILS=${BINUTILS}
 BRIDGE_UTILS="bridge-utils-1.4"
 BZIP2="bzip2-1.0.5"
 
-CAIRO="cairo-1.8.10"
-CAIROMM="cairomm-1.8.4"
+CAIRO="cairo-1.10.2"
+CAIROMM="cairomm-1.10.0"
 CDRTOOLS="cdrtools-2.01"
 CDRDAO="cdrdao-1.2.2"
 CKERMIT="ckermit-8.0.211"
@@ -40,8 +41,8 @@ CLOOG_PPL="cloog-ppl-0.15.10"
 CONSOLEKIT="ConsoleKit-0.4.1"
 COREUTILS="coreutils-8.9"
 CPIO="cpio-2.11"
-CUPS="cups-1.4.5"
-CUPS_PDF="cups-pdf-2.5.0"
+CUPS="cups-1.4.6"
+CUPS_PDF="cups-pdf-2.5.1"
 CURL="curl-7.19.7"
 CVS="cvs-1.11.23"
 
@@ -72,7 +73,7 @@ EGGDBUS="eggdbus-0.6"
 EGLIBC="eglibc-2.12-r12509"
 EGLIBC_PORTS="eglibc-ports-2.12-r12509"
 UCLIBC="uClibc-0.9.30.1"
-EMACS="emacs-23.2"
+EMACS="emacs-23.3"
 ESOUND="esound-0.2.37"
 EXPAT="expat-2.0.1"
 
@@ -112,10 +113,10 @@ GHOSTSCRIPT="ghostscript-9.00"
 GHOSTSCRIPT_FONTS_STD="ghostscript-fonts-std-8.11"
 GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0"
 GNASH=" gnash-0.8.5"
-GIMP="gimp-2.6.8"
+GIMP="gimp-2.6.11"
 GUTENPRINT="gutenprint-5.2.5"
-GLIB="glib-2.24.2"
-GLIBMM="glibmm-2.24.2"
+GLIB="glib-2.28.7"
+GLIBMM="glibmm-2.28.1"
 GLITZ="glitz-0.5.6"
 GPERF="gperf-3.0.4"
 
@@ -124,14 +125,14 @@ GNOME2_VER="gnome-2.28.1"
 GNOME2_PREFIX="/opt/${GNOME2_VER}"
 ORBIT2="ORBit2-2.14.19"
 LIBBONOBO="libbonobo-2.24.2"
-GCONF="GConf-2.28.1"
+GCONF="GConf-2.32.3"
 GNOME_MIME_DATA="gnome-mime-data-2.18.0"
 GNOME_VFS="gnome-vfs-2.24.2"
 GNOME_VFS_MONIKERS="gnome-vfs-monikers-2.15.3"
 LIBGNOME="libgnome-2.28.0"
 LIBGNOMECANVAS="libgnomecanvas-2.26.0"
 LIBBONOBOUI="libbonoboui-2.24.2"
-GNOME_KEYRING="gnome-keyring-2.30.1"
+GNOME_KEYRING="gnome-keyring-2.32.1"
 ICON_NAMING_UTILS="icon-naming-utils-0.8.90"
 GNOME_ICON_THEME="gnome-icon-theme-2.28.0"
 LIBGNOMEUI="libgnomeui-2.24.2"
@@ -190,7 +191,7 @@ GDM="gdm-2.28.1"
 GMP="gmp-5.0.1"
 GNOME_MOUNT="gnome-mount-0.6"
 GNUTLS="gnutls-2.10.2"
-GOBJECT_INSTROSPECTION="gobject-introspection-0.6.14"
+GOBJECT_INSTROSPECTION="gobject-introspection-0.10.2"
 GOFFICE="goffice-0.2.2"
 GNUMERIC="gnumeric-1.6.3"
 GNUPG="gnupg-1.4.11"
@@ -198,17 +199,17 @@ GREP="grep-2.6.3"
 GRIP="grip-3.3.1"
 GROFF="groff-1.20.1"
 GRUB="grub-1.99"
-GSL="gsl-1.14"
+GSL="gsl-1.15"
 GSTREAMER="gstreamer-0.10.20"
 GST_PLUGINS_BASE="gst-plugins-base-0.10.20"
 GST_PLUGINS_GOOD="gst-plugins-good-0.10.10"
 GST_PLUGINS_BAD="gst-plugins-bad-0.10.8"
 GST_PLUGINS_UGLY="gst-plugins-ugly-0.10.10"
 GST_FFMPEG="gst-ffmpeg-0.10.6"
-GTK="gtk+-2.18.7"
-GTK_DOC="gtk-doc-1.14"
-GTK_ENGINES="gtk-engines-2.20.1"
-GTKMM="gtkmm-2.20.3"
+GDK_PIXBUF="gdk-pixbuf-2.22.1"
+GTK="gtk+-2.24.4"
+GTK_ENGINES="gtk-engines-2.20.2"
+GTKMM="gtkmm-2.24.0"
 GUILE="guile-1.8.7"
 GZIP="gzip-1.4"
 
@@ -217,7 +218,7 @@ HAL_INFO="hal-info-20091130"
 HELP2MAN="help2man-1.37.1"
 HICOLOR_ICON_THEME="hicolor-icon-theme-0.11"
 HTTPD="httpd-2.2.8"
-HVCLOCK="hvclock-1.0.1"
+HVCLOCK="hvclock-1.0.2"
 
 IANA="iana-etc-2.30"
 IMAGE_MAGICK="ImageMagick-6.6.8-1"
@@ -247,7 +248,7 @@ LESSTIF="lesstif-0.95.2"
 LFS_BOOTSCRIPTS="lfs-bootscripts-20070813"
 LIBA52="a52dec-0.7.4"
 LIBART="libart_lgpl-2.3.20"
-BOOST="boost_1_42_0"
+BOOST="boost_1_45_0"
 LIBCROCO="libcroco-0.6.2"
 LIBDVDCSS="libdvdcss-1.2.10"
 LIBDVDREAD="libdvdread-0.9.7"
@@ -275,11 +276,11 @@ LIBPCAP="libpcap-1.1.1"
 LIBPNG="libpng-1.2.44"
 LIBPROXY="libproxy-0.2.3"
 LIBPTHREAD_STUBS="libpthread-stubs-0.3"
-LIBRSVG="librsvg-2.26.3"
+LIBRSVG="librsvg-2.32.1"
 LIBSAMPLERATE="libsamplerate-0.1.7"
 LIBSIGCPP="libsigc++-2.2.8"
 LIBSNDFILE="libsndfile-1.0.23"
-LIBSOUP="libsoup-2.30.2"
+LIBSOUP="libsoup-2.32.2"
 LIBSPF2="libspf2-1.2.5"
 LIBTASN1="libtasn1-2.8"
 LIBTHEORA="libtheora-1.1.1"
@@ -288,7 +289,7 @@ LIBVORBIS="libvorbis-1.2.3"
 VORBIS_TOOLS="vorbis-tools-1.2.0"
 LIBUSB="libusb-1.0.2"
 LIBUSB_COMPAT="libusb-compat-0.1.3"
-LIBWNCK="libwnck-2.30.2"
+LIBWNCK="libwnck-2.30.6"
 LIBXKLAVIER="libxklavier-5.0"
 LIBXML2="libxml2-2.7.7"
 LIBXSLT="libxslt-1.1.26"
@@ -303,6 +304,7 @@ METACITY="metacity-2.18.5"
 MFOUR="m4-1.4.15"
 MILTER_GREYLIST="milter-greylist-4.0"
 MILTER_SPF="smf-spf-2.0.1"
+MM_COMMON="mm-common-0.9.5"
 MOC="moc-2.4.4"
 MODULE_INIT_TOOLS="module-init-tools-3.12"
 MPC="mpc-0.8.2"
@@ -327,13 +329,13 @@ OPENSSL="openssl-1.0.0b"
 OPENSSL_ROOT_CERTS="BLFS-ca-bundle-3.12.8.0"
 
 PAM="Linux-PAM-1.1.3"
-PANGO="pango-1.28.2"
-PANGOMM="pangomm-2.26.2"
+PANGO="pango-1.28.4"
+PANGOMM="pangomm-2.28.2"
 PARTED="parted-1.9.0"
 PATCH_PACKAGE="patch-2.6.1"
 PCIUTILS="pciutils-3.1.4"
 PCMANFM="pcmanfm-0.5"
-PCRE="pcre-8.00"
+PCRE="pcre-8.12"
 PERL="perl-5.12.2"
 PERL_MOD_PDL="PDL-2.4.6"
 PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.965001"
@@ -349,10 +351,10 @@ PERL_MOD_URI="URI-1.58"
 PERL_MOD_NET_DNS="Net-DNS-0.66"
 
 PHP="php-5.3.3"
-PIXMAN="pixman-0.17.8"
-POLKIT="polkit-0.96"
+PIXMAN="pixman-0.22.0"
+POLKIT="polkit-0.99"
 POLICYKIT="PolicyKit-0.9"
-POPPLER="poppler-0.14.4"
+POPPLER="poppler-0.16.5"
 PKG_CONFIG="pkg-config-0.23"
 POPT="popt-1.15"
 PORTAUDIO="portaudio-v19_20071207"
@@ -362,9 +364,9 @@ PROCMAIL="procmail-3.22"
 PROCPS="procps-3.2.8"
 PSMISC="psmisc-22.12"
 PULSEAUDIO="pulseaudio-0.9.21"
-PYCAIRO="pycairo-1.8.10"
-PYGOBJECT="pygobject-2.28.0"
-PYGTK="pygtk-2.22.0"
+PYCAIRO="py2cairo-1.10.0"
+PYGOBJECT="pygobject-2.28.4"
+PYGTK="pygtk-2.24.0"
 PYTHON="Python-2.6.4"
 
 READLINE="readline-6.1"
@@ -386,7 +388,7 @@ SGML_DTD4_VER="4.5"
 SGML_DTD4="sgml-dtd-${SGML_DTD4_VER}"
 SGML_SPM="SGMLSpm-1.03ii"
 SHADOW="shadow-4.1.4.2"
-SHARED_MIME_INFO="shared-mime-info-0.70"
+SHARED_MIME_INFO="shared-mime-info-0.90"
 SPAMASSASSIN="Mail-SpamAssassin-3.3.1"
 SPEEX="speex-1.2rc1"
 SPLINT="splint-3.1.1"

diff --git a/stage5/gnome-config b/stage5/gnome-config
new file mode 100644 (file)
index 0000000..fe1de3c
--- /dev/null
+++ b/stage5/gnome-config
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+source ../functions/main
+
+var_add_path "GNOME_LIBCONFIG_PATH" /etc/profile "/usr/lib"
+var_export   "GNOME_LIBCONFIG_PATH" /etc/profile
+
+cat > /etc/skel/.gtkrc-2.0 << "EOF"
+gtk-icon-theme-name="Tango"
+EOF

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 233b8ff..8e4f869 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -15,18 +15,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     # Gtk
     ipkg ${LIBSIGCPP}
     ipkg ${JASPER} "--enable-shared"
-    ipkg ${GTK_DOC}
-    ipkg ${GLIBMM}
+    ipkg -m acnb ${GLIBMM}
     ipkg ${CAIRO}
     ipkg ${CAIROMM}
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
     ipkg ${ATK}
-    ipkg ${GTK}
-    ipkg ${GTKMM}
+    ipkg ${GDK_PIXBUF}
+    ipkg ${GTK} "--disable-gtk-doc-html"
+    ipkg ${ATKMM}
+    ipkg ${GTKMM} "--disable-documentation"
     ipkg ${GTK_ENGINES}
+    ipkg -m acnb ${PYCAIRO}
     ipkg ${PYGOBJECT}
-    ipkg ${PYCAIRO}
     ipkg ${PYGTK}
     ipkg ${GC}
 
@@ -36,7 +37,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
 
     # Needed by GNOME-2
     ipkg ${DESKTOP_FILE_UTILS}
-    ipkg ${SHARED_MIME_INFO}
+    ipkg -m acnb ${SHARED_MIME_INFO}
     ipkg ${STARTUP_NOTIFICATION}
     ipkg ${LIBWNCK}
     ipkg ${ISO_CODES}
@@ -45,7 +46,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBIDL} # Dépendence de quoi??
 
     # GNOME-2.X configuration
-    rscr mult "Configuring ${GNOME2_VER}" ./cis-gnome-config
+    rscr mult "Configuring ${GNOME2_VER}" gnome-config
     source /etc/profile
 
     ipkg_gnome ${ORBIT2}
@@ -62,7 +63,8 @@ ipkg -m noac ${CUPS_PDF}
 ipkg ${SPLIX}
 ipkg ${GHOSTSCRIPT}
 
-if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+if [ "x${INST_TYPE}" = "xworkstation" -o \
+    "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib"
     # xpdf headers needed by inkscape
     ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
@@ -83,6 +85,12 @@ ipkg ${LIBDVDCSS}
 ipkg ${LIBDVDREAD} "--with-libdvdcss"
 ipkg -m noac ${DVDFS}
 
+
+
+exit 1
+
+
+
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${TETEX_SRC} cis-tetex
 

diff --git a/stage5/packages-update b/stage5/packages-update
index a939103..4a6ac0f 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -10,14 +10,15 @@ update_packages_init ${*}
 
 fpkg -m gnome ${LIBSIGCPP}
 fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"
-fpkg -m gnome ${GTK_DOC}
 fpkg -m gnome ${GLIBMM}
 fpkg -e "tar.gz" ${CAIRO} ${CAIRO_URL}
 fpkg -e "tar.gz" ${CAIROMM} ${CAIRO_URL}
 fpkg -m gnome ${PANGO}
 fpkg -m gnome ${PANGOMM}
 fpkg -m gnome ${ATK}
+fpkg -m gnome ${GDK_PIXBUF}
 fpkg -m gnome ${GTK}
+fpkg -m gnome ${ATKMM}
 fpkg -m gnome ${GTKMM}
 fpkg -m gnome ${GTK_ENGINES}
 fpkg -m gnome ${PYGOBJECT}

diff --git a/stage5/pkg/gnome-config b/stage5/pkg/gnome-config
deleted file mode 100644 (file)
index a8d18e8..0000000
--- a/stage5/pkg/gnome-config
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-hvbuild()
-{
-    # For Gnome 2 variables
-    var_add_path "PATH" /etc/profile "/opt/${GNOME2_VER}/bin"
-    var_export   "PATH" /etc/profile
-    var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/${GNOME2_VER}/lib/pkgconfig"
-    var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/${GNOME2_VER}/share/pkgconfig"
-    var_export   "PKG_CONFIG_PATH" /etc/profile
-    var_add_path "LIBGLADE_MODULE_PATH" /etc/profile "${GNOME2_PREFIX}/lib/libglade/2.0"
-    var_export   "LIBGLADE_MODULE_PATH" /etc/profile
-    var_add_path "XDG_CONFIG_DIRS" /etc/profile "/etc/gnome/${GNOME2_VER}/xdg"
-    var_export   "XDG_CONFIG_DIRS" /etc/profile
-
-    # For Gnome 1 and 2 common variable
-    var_add_path "GNOME_LIBCONFIG_PATH" /etc/profile "/usr/lib"
-    var_export   "GNOME_LIBCONFIG_PATH" /etc/profile
-
-    string_add "/opt/${GNOME2_VER}/lib" /etc/ld.so.conf
-
-    var_add_path "MANPATH" /etc/profile "/opt/${GNOME2_VER}/man"
-    var_export   "MANPATH" /etc/profile
-
-    # There is a third mechanism for customizing the search path. If a
-    # `dirlist' file exists in acdir, then that file is assumed to contain a
-    # list of directories, one per line, to be added to the search list. These
-    # directories are searched after all other directories.
-    touch /usr/share/aclocal/dirlist
-    string_add "/opt/${GNOME2_VER}/share/aclocal" /usr/share/aclocal/dirlist
-
-    cat > /etc/skel/.gtkrc-2.0 << "EOF"
-gtk-icon-theme-name="Tango"
-EOF
-}

diff --git a/stage5/pkg/py2cairo b/stage5/pkg/py2cairo
new file mode 100644 (file)
index 0000000..1404107
--- /dev/null
+++ b/stage5/pkg/py2cairo
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+hvconfig()
+{
+    cd ${LFS_TMP}/${PACKAGE}
+    pwd
+    ls *
+    ./waf configure \
+        --prefix=/usr
+}
+
+hvbuild()
+{
+    ./waf build
+    ./waf install
+}