-Enlevé ed (plus nécessaire sans tetex)

-Déplacement de gnome-media du stage6 au stage5
-Séparation de firefox avec xulrunner.
-VLV plugin mozilla fonctionne maintenant.
-VLC stand-alone fonctionne avec "vlc --intf skins2"

diff --git a/config/dependencies b/config/dependencies
index 948e5f7..0124dc8 100644 (file)
--- a/config/dependencies
+++ b/config/dependencies
@@ -3,7 +3,6 @@
 ${INTLTOOL}: ${PERL_MOD_XML_PARSER}
 ${GTKMM}: ${PANGOMM}
 ${INKSCAPE}: ${POPPLER} ${BOOST} ${INTLTOOL} ${GTKMM}
-${TETEX_SRC}: ${ED}
 ${PHP}: ${CURL}
 
 # Audio utilities
@@ -69,7 +68,6 @@ ${DVDFS}: ${FUSE} ${LIBDVDREAD}
 ${DVDRWTOOLS}: ${CDRTOOLS}
 
 ${T1LIB}: ${XORG}
-${TETEX}: ${ED} ${LIBPNG} ${T1LIB} ${XORG} ${GD}
 
 ${GIT}: ${OPENSSL} ${EXPAT} ${ZLIB} ${PERL} ${CURL}
 

diff --git a/config/packages-list b/config/packages-list
index 7921147..3baa976 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -80,6 +80,7 @@ FCRON="fcron-3.0.6"
 FETCHMAIL="fetchmail-6.3.12"
 FFMPEG="ffmpeg-0.8.2"
 FIREFOX="firefox-3.6.13"
+XULRUNNER_VER="1.9.2.13"
 FILE_PKG="file-5.05"
 FINDUTILS="findutils-4.4.2"
 FIRMWARE_B43_LPPHY="broadcom-wl-4.178.10.4"
@@ -176,7 +177,7 @@ GCONF_EDITOR="gconf-editor-2.18.0"
 GNOME_UTILS="gnome-utils-2.18.1"
 GNOME_SYSTEM_MONITOR="gnome-system-monitor-2.18.2"
 NAUTILUS_CD_BURNER="nautilus-cd-burner-2.18.2"
-GNOME_MEDIA="gnome-media-2.18.0"
+GNOME_MEDIA="gnome-media-2.32.0"
 GNOME_NETSTATUS="gnome-netstatus-2.12.1"
 GCALCTOOL="gcalctool-5.9.14"
 GUCHARMAP="gucharmap-1.10.0"

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index b4aa2ef..1059d67 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -69,7 +69,6 @@ ipkg -m noac ${UNRAR}
 ipkg ${CPIO}
 
 ipkg ${PARTED} "--disable-device-mapper"
-ipkg ${ED}
 ipkg ${BC} "--with-readline"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}

diff --git a/stage3/packages-update b/stage3/packages-update
index 4701dbd..8d6334f 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -59,7 +59,6 @@ fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" -e "tar.gz" ${UNRAR} \
 fpkg -m gnu ${CPIO}
 
 fpkg -m gnu ${PARTED}
-fpkg -m gnu ${ED}
 fpkg -m gnu ${BC}
 fpkg -m sf ${FUSE}
 fpkg ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools"

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 44cbfa3..8d84886 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -122,18 +122,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${GST_PLUGINS_BAD}
         ipkg ${GST_PLUGINS_UGLY}
         ipkg -m acnb ${GST_FFMPEG}
+        ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control
     fi
 
     ipkg ${SYLPHEED} "--enable-ssl --enable-ldap"
     ipkg ${LIBNOTIFY}
     ipkg ${YASM}
-    ipkg -m noac ${FIREFOX}
+
+    ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
+    ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
     ipkg -s qt ${QT}
     ipkg -m noac ${LUA}
-    ##ipkg ${VLC} "--enable-mozilla"
-    ipkg -m acnb ${VLC} "--disable-mozilla"
-
+    ipkg -m acnb ${VLC}  "--enable-mozilla"
     ####ipkg ${GNASH}
     # GtkGLExt gstreamer SDL xulrunner
 fi

diff --git a/stage5/packages-update b/stage5/packages-update
index 1d5291b..a303c67 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -104,6 +104,7 @@ fpkg -m fd -o "gstreamer" -s "src/gst-plugins-good" ${GST_PLUGINS_GOOD}
 fpkg -m fd -o "gstreamer" -s "src/gst-plugins-bad"  ${GST_PLUGINS_BAD}
 fpkg -m fd -o "gstreamer" -s "src/gst-plugins-ugly" ${GST_PLUGINS_UGLY}
 fpkg -m fd -o "gstreamer" -s "src/gst-ffmpeg"       ${GST_FFMPEG}
+fpkg -m gnome ${GNOME_MEDIA}
 
 fpkg ${SYLPHEED} \
     "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})"

diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox
index 180865c..0b799b2 100644 (file)
--- a/stage5/pkg/firefox
+++ b/stage5/pkg/firefox
@@ -3,15 +3,21 @@
 hvbuild()
 {
     FIREFOX_BUILD_DIR="${PACKAGE}-build"
+    FIREFOX_VERSION="$(get_pkg_ver ${PACKAGE})"
     FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})"
 
-    # This file contains the options used in the Firefox build.
     cd ${LFS_TMP}/${PACKAGE}
-    cat > .mozconfig << "EOF"
-# Use the default settings specified in the source tree.
-# This includes the option --enable-application=browser
-. $topsrcdir/browser/config/mozconfig
 
+    echo "# This file contains the options used in the Firefox or Xulrunner build." > .mozconfig
+
+    # Use the default settings specified in the source tree.
+    if [ "x${HVLABEL}" = "x${FIREFOX}-xulrunner" ]; then
+        echo '. $topsrcdir/xulrunner/config/mozconfig' >> .mozconfig
+    else
+        echo '. $topsrcdir/browser/config/mozconfig' >> .mozconfig
+    fi
+
+    cat >> .mozconfig << "EOF"
 # Create an object directory and specify to build the package in that
 # directory. If desired, modify the location of the object directory
 # to a directory inside the source tree by removing '../' from the
@@ -27,7 +33,7 @@ ac_add_options --prefix=/usr
 # Compile with a minimal level of optimization
 ac_add_options --enable-optimize
 
-# These options are used so that the Firefox binaries are linked to
+# These options are used so that the Firefox or Xulrunner binaries are linked to
 # the system-installed copies of the specified libraries instead of
 # the source tree code which may not be the most recent versions.
 ac_add_options --with-system-zlib
@@ -73,39 +79,26 @@ ac_add_options --disable-tests
 # in the past.
 ac_add_options --disable-mochitest
 
-# This option is used to enable source tree included LDAP support in
-# the Firefox binaries.
-###################################################################
-#
-# NOTE: You must uncomment this option if there is any chance of
-# compiling the OpenOffice package from source code using this copy
-# of Firefox for your Mozilla support.
-#
-###################################################################
-# Removed this option to fix bug with:
-#   make[3]: Entering directory `/tmp/firefox-3.0.1-build/directory/c-sdk'
-#   make[3]: *** No targets specified and no makefile found.  Stop.
-######ac_add_options --enable-ldap
-
-# This option causes the installed binaries to have the official
-# Firefox name embedded in them. Due to license restrictions, you
-# may not distribute binaries created using this option.
-ac_add_options --enable-official-branding
-
 # use the anti-phishing blacklist
 ac_add_options --enable-safe-browsing
 
-# This option is used so that the debugging symbols are removed from
-# the installed binaries during the installation process. Comment out
-# this option if you may have a need to retain the debugging symbols
-# in the installed binaries. Note that this can substantially
-# increase the size of the installed binaries.
+# Remove the debugging symbols from the installed binaries.
 ac_add_options --enable-strip
 
-# Point to the xulrunner libraries - comment this for a standalone browser
-#ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.0.7
+# If you enable javaxpcom, you must have a java compiler installed.
+ac_add_options --disable-javaxpcom
 EOF
 
+    if [ "x${HVLABEL}" = "x${FIREFOX}-browser" ]; then
+        # Point to the xulrunner libraries.
+        echo "ac_add_options --with-system-libxul" >> .mozconfig
+        echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-${XULRUNNER_VER}" >> .mozconfig
+
+        # This option causes the installed binaries to have the official
+        # Firefox name embedded in them.
+        echo "ac_add_options --enable-official-branding" >> .mozconfig
+    fi
+
     sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig
     if [ -z "${WIFI_SUPPORT}" ]; then
         echo "ac_add_options --disable-necko-wifi" >> .mozconfig
@@ -114,13 +107,17 @@ EOF
     make -f client.mk build
     make -f client.mk install
 
-    # Remove old links and create new ones
-    rm -f /usr/lib/mozilla
-    ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/mozilla
-    rm -f /usr/lib/firefox
-    ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/firefox
-
-    # Addition to /etc/ld.so.conf
-    # This is necessary for shared library libmozjs.so (needed by gxine)
-    string_add "/usr/lib/${FIREFOX_PKG_VERSION}" /etc/ld.so.conf
+    if [ "x${HVLABEL}" = "x${FIREFOX}-xulrunner" ]; then
+        install -v -m755 -d /usr/lib/mozilla
+        # Remove old links (if applicable) and create new ones
+        rm -f /usr/lib/mozilla/plugins
+        ln -sv /usr/lib/xulrunner-${XULRUNNER_VER}/plugins /usr/lib/mozilla
+        chown -Rv root:root /usr/lib/xulrunner-* \
+            /usr/share/idl/xulrunner-* \
+            /usr/include/xulrunner-*
+    else
+        chown -R -v root:root /usr/share/idl/${FIREFOX_PKG_VERSION} \
+            /usr/include/${FIREFOX_PKG_VERSION}   \
+            /usr/lib/firefox-devel-${FIREFOX_VERSION}/sdk/lib
+    fi
 }

diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index c3ba2fa..e78f747 100755 (executable)
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -56,7 +56,6 @@ ipkg_gnome ${GCONF_EDITOR}
 ipkg_gnome ${GNOME_UTILS}
 ipkg_gnome ${GNOME_SYSTEM_MONITOR}
 ipkg_gnome ${NAUTILUS_CD_BURNER}
-ipkg_gnome ${GNOME_MEDIA}
 ipkg_gnome ${GNOME_NETSTATUS}
 ipkg -m gnomenb ${GCALCTOOL}
 ipkg_gnome ${GUCHARMAP}