X-Git-Url: http://gitweb/?a=blobdiff_plain;f=firefox%2FPkgfile;h=b7c9feee3c1226b572b629b2147ae42792f78d6e;hb=65c1966f5926c2c73bc5230ba9a3df776a101439;hp=daaab3ef140271e06c92bcf9af15885679a7b87e;hpb=e48458ec594d6762925fe7630f5b52f07c52ac63;p=ports%2Fopt-arm.git

diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index daaab3e..b7c9fee 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -2,76 +2,74 @@
 # 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, unzip, zip, libidl, gtk, gtk3, python, alsa-lib, xorg-libxt, yasm, mesa3d
+# Depends on: nss, unzip, autoconf-2.13, zip, libidl, gtk, gtk3, python, alsa-lib, xorg-libxt, yasm, mesa3d
 
 name=firefox
-version=46.0
+version=52.0.2
 release=1
 source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
         firefox-install-dir.patch firefox.desktop)
 
 build() {
+  # Fix to avoid gcc6 compilations error at install stage
+  export CFLAGS="$CFLAGS -fno-schedule-insns"
+  export CXXFLAGS="$CFLAGS"
+
   cd $name-$version
 
   sed -i '/^ftfntfmt.h/ i freetype/ftfntfmt.h' config/system-headers
+  # stupid workaround
+  sed -i '2,7d' js/src/configure
   patch -p1 -i $SRC/firefox-install-dir.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 --enable-default-toolkit=cairo-gtk3
   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-nspr
   ac_add_options --with-system-nss
+  ac_add_options --with-system-cairo
   ac_add_options --enable-system-ffi
   ac_add_options --enable-system-pixman
   ac_add_options --enable-system-sqlite
-  #ac_add_options --enable-system-cairo
+  ac_add_options --enable-alsa
   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 --with-distribution-id=nu.crux-arm
   ac_add_options --enable-extensions=default,-gnomevfs
-  ac_add_options --enable-shared
-  ac_add_options --enable-svg
-  ac_add_options --enable-canvas
-  ac_add_options --enable-crypto
-  ac_add_options --enable-single-profile
-  ac_add_options --enable-places
-  ac_add_options --enable-storage
-  ac_add_options --enable-places_bookmarks
-  ac_add_options --enable-image-encoder=all
-  ac_add_options --enable-xft
-  #ac_add_options --enable-elf-hack
-  ac_add_options --disable-gstreamer
-  ac_add_options --enable-pic
-  #ac_add_options --disable-static
   ac_add_options --disable-tests
-  ac_add_options --disable-mochitest
   ac_add_options --disable-dbus
   ac_add_options --disable-debug
-  ac_add_options --disable-installer
   ac_add_options --disable-updater
-  ac_add_options --disable-xprint
-  ac_add_options --disable-profilesharing
-  ac_add_options --disable-gnomevfs
   ac_add_options --disable-gnomeui
-  ac_add_options --disable-mailnews
   ac_add_options --disable-crashreporter
   ac_add_options --disable-necko-wifi
-  ac_add_options --disable-libnotify
   ac_add_options --disable-pulseaudio
   ac_add_options --disable-gconf
+  ac_add_options --disable-skia
 EOF
 
-  sed "s|\['-march=armv7-a', '-mthumb', '-mfloat-abi=softfp', '-mfpu=neon'\]|\[\]|g" -i media/libvpx/moz.build
+# mozonfig optimizations
+  for flag in $CFLAGS; do
+    case $flag in
+      -mfpu=neon*) echo "ac_add_options --with-fpu=neon" >> .mozconfig ;;
+      -march=armv7ve) echo "ac_add_options --with-arch=armv7ve" >> .mozconfig ;;
+    esac
+  done
+
   make -f client.mk build
   make -f client.mk DESTDIR=$PKG install
  
   mkdir -p $PKG/usr/share/pixmaps
   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
+  # Remove crap
+  rm $PKG/usr/lib/firefox/browser/features/{firefox@getpocket.com.xpi,webcompat@mozilla.org.xpi}
+
+  mkdir -p $PKG/etc/revdep.d
+  echo "/usr/lib/firefox" > $PKG/etc/revdep.d/firefox
 }