From 76be003fe4ca3d35a009b560d59bebbe438346c2 Mon Sep 17 00:00:00 2001 From: gobo72 Date: Sun, 28 Aug 2011 13:56:43 +0000 Subject: [PATCH] =?utf8?q?-Enlev=C3=A9=20libproxy=20-D=C3=A9sactiv=C3=A9?= =?utf8?q?=20YASM=20pour=20gst-ffmpeg=20(bug=20de=20compilation)=20-Enlev?= =?utf8?q?=C3=A9=20commandes=20chown=20pour=20Firefox=20-Mise=20=C3=A0=20j?= =?utf8?q?our=20=C3=A0=20Firefox-3.6.20=20-Ajout=20d'un=20"source=20/etc/p?= =?utf8?q?rofile"=20avant=20d'installer=20chaque=20paquet=20=20pour=20avoi?= =?utf8?q?r=20les=20derni=C3=A8res=20valeurs=20de=20variables=20-Ajout=20d?= =?utf8?q?e=20ldconfig=20apr=C3=A8s=20l'installation=20de=20chaque=20paque?= =?utf8?q?t.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/packages-list | 7 +++---- config/sysinfos.amd64 | 2 +- functions/main | 6 ++++++ stage5/hv-install-1 | 3 +-- stage5/packages-update | 1 - stage5/pkg/firefox | 4 ---- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/config/packages-list b/config/packages-list index 3aac532..f1d5b31 100644 --- a/config/packages-list +++ b/config/packages-list @@ -79,15 +79,15 @@ EXPAT="expat-2.0.1" 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" +FIREFOX="firefox-3.6.20" +XULRUNNER_VER="1.9.2.20" FILE_PKG="file-5.05" FINDUTILS="findutils-4.4.2" FIRMWARE_B43_LPPHY="broadcom-wl-4.178.10.4" FLAC="flac-1.2.1" FLEX="flex-2.5.35" FONTCONFIG="fontconfig-2.7.3" -FONTFORGE="fontforge_full-20110222" +FONTFORGE="fontforge_full-20110222" FREETYPE="freetype-2.3.11" FRIBIDI="fribidi-0.10.9" FUSE="fuse-2.8.3" @@ -273,7 +273,6 @@ LIBOIL="liboil-0.3.17" LIBOPENJPEG="libopenjpeg-1.2" LIBPCAP="libpcap-1.1.1" LIBPNG="libpng-1.2.44" -LIBPROXY="libproxy-0.2.3" LIBPTHREAD_STUBS="libpthread-stubs-0.3" LIBRSVG="librsvg-2.32.1" LIBSAMPLERATE="libsamplerate-0.1.7" diff --git a/config/sysinfos.amd64 b/config/sysinfos.amd64 index 2ba0774..503a202 100644 --- a/config/sysinfos.amd64 +++ b/config/sysinfos.amd64 @@ -11,7 +11,7 @@ MAKEJOBS=1 # you have mounted your new LFS partition, but it can also be any directory. # This is relevant only for stage 0 and 1. LFS="/mnt/hvlinux" -LFS_PARTITION="/dev/sdb7" +LFS_PARTITION="/dev/sdb8" BOOT_PARTITION="/dev/sdb1" SWAP_PARTITION="/dev/sdb2" diff --git a/functions/main b/functions/main index 8b14988..6fcafdf 100644 --- a/functions/main +++ b/functions/main @@ -850,6 +850,9 @@ ipkg() local HVMAKE_ORIG=${HVMAKE} + # Make sure to get latest variables assignments (ex: pkg-config) + source /etc/profile + while getopts "jl:m:s:" flag ;do case ${flag} in j) @@ -954,6 +957,9 @@ ipkg() ipkg_trap_end + # Make sure to update dynamic linker run-time bindings + ldconfig + return $EXIT_SUCCESS } diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index 686f563..8f5ae01 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -42,7 +42,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${LIBIDL} # Dépendence de quoi?? ipkg ${ORBIT2} ipkg -m acnb ${GCONF} - ipkg ${LIBPROXY} "--with-gnome" ipkg ${GNOME_KEYRING} ipkg ${LIBSOUP} "--without-gnome" fi @@ -121,7 +120,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg ${GST_PLUGINS_GOOD} ipkg ${GST_PLUGINS_BAD} ipkg ${GST_PLUGINS_UGLY} - ipkg -m acnb ${GST_FFMPEG} + ipkg -m acnb ${GST_FFMPEG} "--with-ffmpeg-extra-configure=--disable-yasm" ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control fi diff --git a/stage5/packages-update b/stage5/packages-update index 56e5d5d..d3d205d 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -41,7 +41,6 @@ fpkg -m gnome ${LIBGLADE} fpkg -m gnome ${LIBIDL} fpkg -m gnome ${ORBIT2} fpkg -m gnome ${GCONF} -fpkg -e "tar.gz" ${LIBPROXY} "http://libproxy.googlecode.com/files" fpkg -m gnome ${GNOME_KEYRING} fpkg -m gnome ${LIBSOUP} diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox index 0b799b2..0dc3ac1 100644 --- a/stage5/pkg/firefox +++ b/stage5/pkg/firefox @@ -115,9 +115,5 @@ EOF 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 } -- 2.20.1