firefox 13.0-1 maj

(cherry picked from commit 0667d8205d5560dd37b44994b828e05e525e6bde)

1 files changed, 34 insertions, 59 deletions

diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 9e27c6c45..416b0e0c1 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -2,81 +2,56 @@
 # URL: http://www.mozilla.com/firefox/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: yasm, desktop-file-utils, startup-notification, alsa-lib, mesa3d, gtk, libidl, pango, curl, nss, libnotify, dbus-glib, libevent, wireless_tools
-# Run on: desktop-file-utils,alsa-lib,mesa3d,gtk,libidl,pango,curl,nss,libnotify,dbus-glib
+# Depends on: yasm, desktop-file-utils, startup-notification, alsa-lib, mesa3d, gtk, libidl, pango, curl, nss, libnotify, dbus-glib, libevent, wireless_tools, hunspell-fr, hyphen
+# Run on: desktop-file-utils,alsa-lib,mesa3d,gtk,libidl,pango,curl,nss,libnotify,dbus-glib,hunspell-fr,hyphen
 
 name=firefox
-version=12.0
+version=13.0
 
 release=1
 
 [ "`uname -m`" == "i686"   ] && _ARCH=i686
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
 
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2\
-        firefox.desktop)
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2
+        firefox.desktop
+	firefox-install-dir.patch
+	vendor.js)
     
 build() {
-    unset CXXFLAGS
-    unset CFLAGS
-    wget ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$version/linux-`uname -m`/xpi/fr.xpi
-    case `uname -m` in
-    x86_64)
-    	export CXXFLAGS="-O2 -fPIC -pipe -fpermissive"
-	export CFLAGS="-O2 -fPIC -pipe -fpermissive";;
-    i?86)
-	export CXXFLAGS="-fpermissive";;
-    esac
+ 
+  wget ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$version/linux-`uname -m`/xpi/fr.xpi
 
-    LDFLAGS="-Wl,-O1,--hash-style=gnu,--no-keep-memory"
-    export MOZ_CO_PROJECT=browser
-    export BUILD_OFFICIAL=1
-    export MOZILLA_OFFICIAL=1
-    export MOZILLA_FIVE_HOME=/usr/lib/firefox
+  cd "mozilla-release"   
+  patch -Np1 -i $SRC/firefox-install-dir.patch
 
-    cd mozilla-*
-    echo 'pref("intl.locale.matchOS", true);' >> browser/app/profile/firefox.js
+	# Fix PRE_RELEASE_SUFFIX
+  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in
 
-    PYTHON=python2 ./configure \
-	--prefix=/usr \
-	--with-system-jpeg \
-	--with-system-zlib \
-	--with-system-nspr \
-	--with-system-nss \
-	--with-system-nspr \
-	--enable-system-cairo \
-	--with-pthreads \
-	--enable-official-branding \
-	--enable-extensions=default \
-	--enable-shared \
-	--enable-svg \
-	--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 \
-	$PKG/usr/include/firefox
+  export PYTHON="/usr/bin/python2"
 
-    cp -rL dist/bin/* $PKG$MOZILLA_FIVE_HOME
-    ln -s /usr/lib/firefox/firefox $PKG/usr/bin/firefox
+  LD_PRELOAD="" DISPLAY=:99 make -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
 
-    # devel stuff
-    cp -frL dist/idl/* $PKG/usr/share/idl/firefox/
-    cp -frL dist/include/* $PKG/usr/include/firefox/
-    install -m755 -d $PKG/usr/share/{applications,pixmaps}
-    install -m644 browser/branding/unofficial/default48.png \
-    	$PKG/usr/share/pixmaps/firefox.png
-    install -m644 ../firefox.desktop \
-    	$PKG/usr/share/applications/
+  make -f client.mk DESTDIR="$PKG" install
+  
+  mkdir -p $PKG/usr/lib/firefox/defaults/pref
+  install -m644 $SRC/vendor.js $PKG/usr/lib/firefox/defaults/pref  
 
+  for i in 16 22 24 32 48 256; do
+      install -Dm644 browser/branding/official/default$i.png \
+        "$PKG/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
+  done
+
+  install -Dm644 "$SRC/firefox.desktop" \
+    "$PKG/usr/share/applications/firefox.desktop"
+
+   rm -rf $PKG/usr/lib/firefox/{dictionaries,hyphenation}
+   ln -s /usr/share/hunspell $PKG/usr/lib/firefox/dictionaries
+   ln -s /usr/share/hyphen $PKG/usr/lib/firefox/hyphenation
+
+#    rm -r $PKG/usr/{include,lib/firefox-devel,share/idl}
 
-    # Suppression des fichiers headers et des dossiers vides
-    find $PKG/usr/include/firefox -name "*.h" -delete
-    find $PKG/usr/include/firefox -type d -empty -delete
     install -Dm644 $SRC/fr.xpi \
-    $PKG/usr/lib/firefox/extensions/langpack-fr@firefox.mozilla.org.xpi
+        $PKG/usr/lib/firefox/extensions/langpack-fr@firefox.mozilla.org.xpi
+
 }