Éliminé variables Gnome2

diff --git a/config/packages-list b/config/packages-list
index 0473354..93479a3 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -120,8 +120,7 @@ GLIBMM="glibmm-2.28.1"
 GLITZ="glitz-0.5.6"
 GPERF="gperf-3.0.4"
 
-# GNOME2 core packages
-GNOME2_VER="gnome-2.28.1"
+# Gnome core packages
 ORBIT2="ORBit2-2.14.19"
 LIBBONOBO="libbonobo-2.24.2"
 GCONF="GConf-2.32.3"
@@ -156,7 +155,7 @@ GNOME_APPLETS="gnome-applets-2.28.0"
 GNOME_SESSION="gnome-session-2.28.0"
 GNOME_USER_DOCS="gnome-user-docs-2.28.0"
 
-# GNOME2 Additional Packages - Libraries
+# Gnome Additional Packages - Libraries
 LIBGNOMECUPS="libgnomecups-0.2.2"
 LIBGNOMEPRINT="libgnomeprint-2.18.0"
 LIBGNOMEPRINTUI="libgnomeprintui-2.18.0"
@@ -168,7 +167,7 @@ GTKSOURCEVIEW="gtksourceview-1.8.5"
 SYSTEM_TOOLS_BACKENDS="system-tools-backends-1.4.2"
 GNOME_AUDIO="gnome-audio-2.0.0"
 GIFLIB="giflib-4.1.6"
-# GNOME2 Additional Packages - Utilities
+# Gnome Additional Packages - Utilities
 GEDIT="gedit-2.18.2"
 EOG="eog-2.18.2"
 EVINCE="evince-2.28.2"

diff --git a/stage1/create-config-files b/stage1/create-config-files
index c9510c5..32c6399 100755 (executable)
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -73,7 +73,6 @@ LANG="en_US.UTF-8"
 # LC_COLLATE equals en_US.ISO8859-1, then leading dots as well
 # as case are ignored in determining the sort order.
 LC_COLLATE=C
-################# LC_ALL=POSIX
 
 export PATH MANPATH LANG LC_COLLATE PS1 PS2 USER LOGNAME MAIL HISTFILESIZE HISTSIZE HOSTNAME EDITOR CFLAGS CXXFLAGS
 EOF

diff --git a/stage5/gnome-config b/stage5/gnome-config
deleted file mode 100755 (executable)
index fe1de3c..0000000
--- a/stage5/gnome-config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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 0a3a94d..d68fbb9 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -35,7 +35,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${HVCLOCK}
     ipkg ${WMNOTIFY}
 
-    # Needed by GNOME-2
+    # Needed by Gnome
     ipkg ${DESKTOP_FILE_UTILS}
     ipkg -m acnb ${SHARED_MIME_INFO}
     ipkg ${STARTUP_NOTIFICATION}
@@ -44,27 +44,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBXKLAVIER}
     ipkg ${LIBGLADE}
     ipkg ${LIBIDL} # Dépendence de quoi??
-
-    # GNOME-2.X configuration
-    rscr mult "Configuring ${GNOME2_VER}" gnome-config
-    source /etc/profile
-
-    echo "Test"
-    exit 0
-
-    ipkg_gnome ${ORBIT2}
-    ipkg ${GCONF}
+    ipkg ${ORBIT2}
+    ipkg -m acnb ${GCONF}
     ipkg ${LIBPROXY} "--with-gnome"
-    ipkg_gnome ${GNOME_KEYRING}
-    ipkg ${LIBSOUP}
+    ipkg ${GNOME_KEYRING}
+    ipkg ${LIBSOUP} "--without-gnome"
 fi
 
 ipkg ${HELP2MAN}
 ipkg ${GSL}
 ipkg -m acnb ${CUPS}
 ipkg -m noac ${CUPS_PDF}
-ipkg ${SPLIX}
-ipkg ${GHOSTSCRIPT}
+###################ipkg -m noac ${SPLIX}
+ipkg -m acnb ${GHOSTSCRIPT}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -76,24 +68,22 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${GEGL}
     ipkg ${GIMP} "--disable-print"
     ipkg -m acnb ${GUTENPRINT}
-    ipkg -m noac ${BOOST}
+    ipkg -s boost -m noac ${BOOST}
     # inkscape-0.47 has a problem with poppler >= 0.12.2
     # Try 0.48.1
     ipkg ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
 fi
 
-ipkg ${CDRTOOLS}
-ipkg ${DVDRWTOOLS}
+ipkg -m noac ${CDRTOOLS}
+ipkg -m noac ${DVDRWTOOLS}
 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/pkg/GConf b/stage5/pkg/GConf
new file mode 100644 (file)
index 0000000..c0e897d
--- /dev/null
+++ b/stage5/pkg/GConf
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+hvbuild_post()
+{
+    install -v -m755 -d /etc/gconf/gconf.xml.system
+}

diff --git a/stage5/pkg/gconf b/stage5/pkg/gconf
deleted file mode 100644 (file)
index 81e999e..0000000
--- a/stage5/pkg/gconf
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Common installation script
-./cis-gnome ${*}
-
-# Custom post-installation
-install -v -m755 -d /etc/gnome/${GNOME2_VER}/gconf/gconf.xml.system &&
-
-# Configure D-Bus so that it can search for GNOME installed .conf files
-# (This is assuming that system-local.conf does not exist yet. If it does,
-# then you will need to merge in the changes):
-dbusfile=/etc/dbus-1/system-local.conf &&
-if [ -f ${dbusfile} ]; then
-    cat ${dbusfile} >> ${dbusfile}.old
-    echo "Warning, file ${dbusfile} already exists,"
-    echo "appending content to \"${dbusfile}.old\""
-fi &&
-
-cat > ${dbusfile} << "EOF" &&
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-EOF
-echo "  <!-- Search for .conf files in /etc/gnome/${GNOME2_VER}/dbus-1/system.d -->" >> ${dbusfile} &&
-echo "  <includedir>/etc/gnome/${GNOME2_VER}/dbus-1/system.d</includedir>" >> ${dbusfile} &&
-echo "</busconfig>" >> ${dbusfile}
-
-exit $?

diff --git a/stage5/pkg/gnome b/stage5/pkg/gnome
deleted file mode 100644 (file)
index b45fe94..0000000
--- a/stage5/pkg/gnome
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    CONFIGURE_OPTS=" \
-        --prefix=/usr \
-        --libexecdir=/usr/sbin \
-        --infodir=/usr/share/info \
-        --localstatedir=/var/lib \
-        --sysconfdir=/etc/gnome/${GNOME2_VER}"
-}

diff --git a/stage5/pkg/gnome-nobuild b/stage5/pkg/gnome-nobuild
deleted file mode 100644 (file)
index b45fe94..0000000
--- a/stage5/pkg/gnome-nobuild
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    CONFIGURE_OPTS=" \
-        --prefix=/usr \
-        --libexecdir=/usr/sbin \
-        --infodir=/usr/share/info \
-        --localstatedir=/var/lib \
-        --sysconfdir=/etc/gnome/${GNOME2_VER}"
-}

diff --git a/stage5/pkg/tango-icon-theme b/stage5/pkg/tango-icon-theme
new file mode 100755 (executable)
index 0000000..94ab7ac
--- /dev/null
+++ b/stage5/pkg/tango-icon-theme
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+hvbuild_post()
+{
+    cat > /etc/skel/.gtkrc-2.0 << "EOF"
+gtk-icon-theme-name="Tango"
+EOF
+}

diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index 5fbdcda..379356f 100755 (executable)
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -14,11 +14,7 @@ fi
 
 init_log_file
 
-# GNOME-2.X configuration
-#action_checkbox "Configuring ${GNOME2_VER}" ./cis-gnome-config
-#action_checkbox "Reloading /etc/profile" source /etc/profile
-
-# Gnome 2 core packages
+# Gnome core packages
 ##ipkg_gnome ${ORBIT2}
 ipkg_gnome ${LIBBONOBO}
 ###ipkg  ${GCONF} cis-gconf
@@ -32,7 +28,7 @@ ipkg ${GNOME_ICON_THEME}
 ##ipkg_gnome ${GNOME_KEYRING}
 ipkg_gnome ${LIBGNOMEUI}
 ipkg ${GNOME_THEMES}
-ipkg -m acnb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/opt/${GNOME2_VER}/share/omf"
+ipkg -m acnb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/usr/share/omf"
 ipkg_gnome ${GNOME_DOC_UTILS}
 ipkg_gnome ${GNOME_DESKTOP}
 ipkg_gnome ${GNOME_BACKGROUNDS}

diff --git a/stage6/pkg/gal b/stage6/pkg/gal
index 9b84b19..c9c0095 100644 (file)
--- a/stage6/pkg/gal
+++ b/stage6/pkg/gal
@@ -22,7 +22,7 @@ cd ${LFS_TMP}/${1}-build &&
     --libexecdir=/usr/sbin \
     --localstatedir=/var/lib \
     --infodir=/usr/share/info \
-    --sysconfdir=/etc/gnome/${GNOME2_VER} &&
+    --sysconfdir=/etc &&
 make &&
 make install &&
 ldconfig

diff --git a/stage6/pkg/gdm b/stage6/pkg/gdm
index 087c241..cd65bc7 100644 (file)
--- a/stage6/pkg/gdm
+++ b/stage6/pkg/gdm
@@ -20,14 +20,14 @@ cd ${LFS_TMP}/${1}-build &&
     --localstatedir=/var/lib \
     --infodir=/usr/share/info \
     --with-pam-prefix=/etc \
-    --sysconfdir=/etc/gnome/${GNOME2_VER} &&
+    --sysconfdir=/etc &&
 make &&
 make install &&
 install -v -m755 -d /var/log/gdm &&
 
 # Changing the directory containing the GDM log files to the /var/log hierarchy.
 sed -i.orig "/\[daemon\]/ a LogDir=/var/log/gdm" \
-    /etc/gnome/${GNOME2_VER}/gdm/custom.conf &&
+    /etc/gdm/custom.conf &&
 rmdir -v /var/lib/log/gdm &&
 rmdir -v /var/lib/log &&
 

diff --git a/stage6/pkg/gnome-applets b/stage6/pkg/gnome-applets
index 50b7913..6af2651 100644 (file)
--- a/stage6/pkg/gnome-applets
+++ b/stage6/pkg/gnome-applets
@@ -15,7 +15,7 @@ cd ${LFS_TMP}/${1}-build &&
     --libexecdir=/usr/sbin \
     --infodir=/usr/share/info \
     --localstatedir=/var/lib \
-    --sysconfdir=/etc/gnome/${GNOME2_VER} &&
+    --sysconfdir=/etc &&
 make &&
 make install &&
 make -C man install-man &&

diff --git a/stage6/pkg/gnumeric b/stage6/pkg/gnumeric
index 53158b7..b7e98e7 100644 (file)
--- a/stage6/pkg/gnumeric
+++ b/stage6/pkg/gnumeric
@@ -13,7 +13,7 @@ cd ${LFS_TMP}/${1} &&
 ./configure \
     --prefix=/usr \
     --localstatedir=/var/lib \
-    --sysconfdir=/etc/gnome/${GNOME2_VER} &&
+    --sysconfdir=/etc &&
 make &&
 make install &&
 

diff --git a/stage6/pkg/metacity b/stage6/pkg/metacity
index 7845d26..b0575dd 100644 (file)
--- a/stage6/pkg/metacity
+++ b/stage6/pkg/metacity
@@ -13,7 +13,7 @@ cd ${LFS_TMP}/${1}-build &&
 ../${1}/configure \
     --prefix=/usr \
     --libexecdir=/usr/lib/metacity \
-    --with-gconf-schema-file-dir=/etc/gnome/${GNOME2_VER}/gconf/schemas \
+    --with-gconf-schema-file-dir=/etc/gconf/schemas \
     --sysconfdir=/etc &&
 make &&
 make install &&

diff --git a/stage6/pkg/nautilus b/stage6/pkg/nautilus
index 953da1c..f1beb43 100644 (file)
--- a/stage6/pkg/nautilus
+++ b/stage6/pkg/nautilus
@@ -15,7 +15,7 @@ cd ${LFS_TMP}/${1}-build &&
     --libexecdir=/usr/sbin \
     --localstatedir=/var/lib \
     --infodir=/usr/share/info \
-    --sysconfdir=/etc/gnome/${GNOME2_VER} &&
+    --sysconfdir=/etc &&
 make &&
 make install &&
 install -v -m755 -d /usr/share/doc/${NAUTILUS} &&