X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=firefox%2FPkgfile;h=b656353b3089446908279fb5bb567431e9dec6ab;hb=8fa32626c8bfe8d0caf2729998c2911693b2b687;hp=353e0d48a91ca892abb51b6197d39c39569b4905;hpb=c1fcc87213cb3a4f1d218e342417c50ea4f01183;p=ports%2Fopt-arm.git

diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 353e0d4..b656353 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -2,27 +2,28 @@
 # URL: http://www.mozilla.com/firefox/
 # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: nss, libidl, gtk, python, alsa-lib, yasm, mesa3d
+# Depends on: nss, libidl, gtk, python, alsa-lib, xorg-libxt, yasm, mesa3d, gst-plugins-base
 
 name=firefox
-version=27.0
+version=40.0
 release=1
-source=(ftp://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
-        firefox-install-dir.patch firefox.desktop)
+source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
+        firefox-install-dir.patch 0001-Fix-build-with-USE_SKIA_GPU.patch firefox.desktop)
 
 build() {
   cd mozilla-release
 
-  patch -p 1 -i $SRC/firefox-install-dir.patch
+  patch -p1 -i $SRC/firefox-install-dir.patch
+  patch -p1 -i $SRC/0001-Fix-build-with-USE_SKIA_GPU.patch
 
   cat <<- EOF > .mozconfig
   mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared
   mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s"
   ac_add_options --prefix=/usr
-  #ac_add_options --with-system-jpeg
+  ac_add_options --with-system-jpeg
   ac_add_options --with-system-zlib
   ac_add_options --with-system-mng
-  #ac_add_options --with-system-png
+  ac_add_options --with-system-png
   ac_add_options --with-system-nspr
   ac_add_options --with-system-nss
   ac_add_options --enable-system-ffi
@@ -32,6 +33,7 @@ build() {
   ac_add_options --with-pthreads
   ac_add_options --enable-optimize="$CFLAGS"
   ac_add_options --enable-official-branding
+  ac_add_options --with-distribution-id=nu.crux
   ac_add_options --enable-extensions=default,-gnomevfs
   ac_add_options --enable-shared
   ac_add_options --enable-svg
@@ -43,6 +45,8 @@ build() {
   ac_add_options --enable-places_bookmarks
   ac_add_options --enable-image-encoder=all
   ac_add_options --enable-xft
+  ac_add_options --enable-gstreamer=1.0
+  ac_add_options --enable-pic
   ac_add_options --disable-static
   ac_add_options --disable-tests
   ac_add_options --disable-mochitest
@@ -58,17 +62,14 @@ build() {
   ac_add_options --disable-crashreporter
   ac_add_options --disable-necko-wifi
   ac_add_options --disable-libnotify
-  ac_add_options --disable-gstreamer
-  ac_add_options --disable-neon
+  ac_add_options --disable-pulseaudio
 EOF
 
+  sed "s|\['-march=armv7-a', '-mthumb', '-mfloat-abi=softfp', '-mfpu=neon'\]|\[\]|g" -i media/libvpx/moz.build
   make -f client.mk build
   make -f client.mk DESTDIR=$PKG install
-  
-  install -d $PKG/etc/ld.so.conf.d
-  echo "/usr/lib/firefox" > $PKG/etc/ld.so.conf.d/$name.conf
-
+ 
   mkdir -p $PKG/usr/share/pixmaps
-  ln -s /usr/lib/firefox/browser/chrome/browser/content/branding/icon48.png $PKG/usr/share/pixmaps/firefox_default48.png
+  ln -s /usr/lib/firefox/browser/chrome/icons/default/default48.png $PKG/usr/share/pixmaps/firefox_default48.png
   install -D -m 0644 $SRC/firefox.desktop $PKG/usr/share/applications/firefox.desktop
 }