firefox, maj 4.0-1

1 files changed, 19 insertions, 42 deletions

diff --git a/extra/firefox/Pkgfile b/extra/firefox/Pkgfile
index cfe9cc6a0..0969d3e9c 100644
--- a/extra/firefox/Pkgfile
+++ b/extra/firefox/Pkgfile
@@ -2,67 +2,44 @@
 # URL: http://www.mozilla.com/firefox/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: desktop-file-utils, alsa-lib, gtk, libidl, pango, curl, nss, libnotify, dbus-glib
-# Run on: desktop-file-utils, alsa-lib, gtk, libidl, pango, curl, nss, libnotify, dbus-glib
+# Depends on: desktop-file-utils, startup-notification, alsa-lib, mesa3d, gtk, libidl, pango, curl, nss, libnotify, dbus-glib
+# Run on: desktop-file-utils,alsa-lib,mesa3d,gtk,libidl,pango,curl,nss,libnotify,dbus-glib
 
 name=firefox
 version=4.0
 release=1
 source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2\
 	http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/linux-i686/xpi/fr.xpi\
-        mozconfig firefox.desktop)
+        firefox.desktop)
     
 build() {
+    export CXXFLAGS="$CXXFLAGS -fpermissive"
     export MOZ_CO_PROJECT=browser
     export BUILD_OFFICIAL=1
     export MOZILLA_OFFICIAL=1
     export MOZILLA_FIVE_HOME=/usr/lib/firefox
 
-    cd mozilla-1.9.2
+    cd mozilla-2.0
 
     PYTHON=python2 ./configure \
 	--prefix=/usr \
-	--libdir=/usr/lib${LIBDIRSUFFIX} \
-	--with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/${NAMESRC}-${VERSION} \
-	--enable-application=browser \
-	--with-system-bz2 \
 	--with-system-jpeg \
 	--with-system-zlib \
-	--disable-accessibility \
-	--disable-composer \
-	--disable-crashreporter \
-	--disable-debug \
-	--disable-ldap \
-	--disable-tests \
-	--disable-logging \
-	--disable-pedantic \
-	--disable-profilesharing \
-	--disable-installer \
-	--disable-mailnews \
-	--disable-necko-wifi \
-	--enable-canvas \
-	--enable-cpp-rtti \
-	--enable-crypto \
-	--enable-default-toolkit=cairo-gtk2 \
-	--enable-faststart \
+	--with-system-nspr \
+	--with-system-nss \
+	--with-system-nspr \
+	--enable-system-cairo \
+	--with-pthreads \
 	--enable-official-branding \
-	--enable-optimize=-O2 \
-	--enable-reorder \
-	--enable-safe-browsing \
-	--enable-single-profile \
-	--enable-startup-notification \
-	--enable-strip \
+	--enable-extensions=default \
+	--enable-shared \
 	--enable-svg \
-	--enable-system-cairo \
-	--enable-webm \
-	--enable-xft \
-	--enable-xinerama \
-	--build=${TARGET64} \
-	--host=${TARGET64} 
-
-    make
-
-    install -d \
+	--enable-application=browser \
+	--disable-tests \
+	--disable-necko-wifi \
+	--disable-xpcom-fastload
+	make    
+	install -d \
 	$PKG$MOZILLA_FIVE_HOME \
 	$PKG/usr/bin \
 	$PKG/usr/share/idl/firefox \
@@ -83,7 +60,7 @@ build() {
   # Localisation 
   cd ..
   bsdtar xf fr.xpi
-  cp chrome/fr.jar $PKG/usr/lib/firefox/chrome
+  cp -a chrome/fr $PKG/usr/lib/firefox/chrome
   sed "s|chrome/||" chrome.manifest > $PKG/usr/lib/firefox/chrome/fr.manifest
   cp install.rdf $PKG/usr/lib/firefox
   rm $PKG/usr/lib/firefox/chrome/en-US.*