X-Git-Url: http://gitweb/?a=blobdiff_plain;f=firefox%2FPkgfile;h=e693897fa5385a5af6c6bf6a585ae12acc272726;hb=93ebab8b212e4088e5925995de48cd4a0d019531;hp=b27f5ab4b437e73a6867546d0a70375679ad2820;hpb=95ea6ad785becae429bbd32e2b37c1bf0d769dc4;p=ports%2Fopt-arm.git

diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index b27f5ab..e693897 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -2,27 +2,29 @@
 # 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, unzip, autoconf-2.13, zip, libidl, gtk, gtk3, python, alsa-lib, xorg-libxt, yasm, mesa3d
 
 name=firefox
-version=39.0
+version=49.0
 release=1
-source=(ftp://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)
+source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
+        firefox-install-dir.patch firefox.desktop)
 
 build() {
-  cd mozilla-release
+  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
-  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 --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
@@ -33,35 +35,19 @@ 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-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 --disable-static
+  #ac_add_options --enable-elf-hack
+  #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-gstreamer
   ac_add_options --disable-pulseaudio
-  ac_add_options --enable-pic
+  ac_add_options --disable-gconf
 EOF
 
   sed "s|\['-march=armv7-a', '-mthumb', '-mfloat-abi=softfp', '-mfpu=neon'\]|\[\]|g" -i media/libvpx/moz.build
@@ -71,4 +57,9 @@ EOF
   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
 }