Update to alpha version 60.2.0

8 files changed, 81 insertions, 338 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 392c01ea672b..6fe9876d0759 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
-	pkgver = 52.6.0
+	pkgver = 60.2.0
 	pkgrel = 1
 	url = http://www.gnu.org/software/gnuzilla/
 	arch = i686
@@ -39,24 +39,18 @@ pkgbase = icecat
 	depends = ttf-font
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
+	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	source = http://ftpmirror.gnu.org/gnuzilla/52.6.0/icecat-52.6.0-gnu1.tar.bz2
-	source = http://ftpmirror.gnu.org/gnuzilla/52.6.0/icecat-52.6.0-gnu1.tar.bz2.sig
-	source = mozconfig
+	optdepends = clang
+	source = http://alpha.gnu.org/gnu/gnuzilla/60.2.0/icecat-60.2.0-gnu1.tar.bz2
+	source = http://alpha.gnu.org/gnu/gnuzilla/60.2.0/icecat-60.2.0-gnu1.tar.bz2.sig
 	source = icecat.desktop
 	source = icecat-safe.desktop
-	source = vendor.js
-	source = fix-wifi-scanner.diff
-	source = no-crmf.diff
 	validpgpkeys = A57369A8BABC2542B5A0368C3C76EED7D7E04784
-	sha256sums = 0a0cf3acb2067e0580204b44bb5a02fab2033c6bbf7c0b47522a3c4c1f29d625
+	sha256sums = f40746f1c44b4ae3e5ae6da9d30efbdb78abb9d37864097320a9849ece3b1d53
 	sha256sums = SKIP
-	sha256sums = 558575fd72237d5953f386170eb9ef848beae6ac08d2b53518ae6365e4cc274b
 	sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
-	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
-	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
-	sha256sums = ada119174a2a1779c4195a1b4506e8ae67c49c5306103158805a390237acc1c6
 
 pkgname = icecat
 
diff --git a/PKGBUILD b/PKGBUILD
index 99cb434d3ba1..d8d79b2de849 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=icecat
-pkgver=52.6.0
+pkgver=60.2.0
 _pkgver=${pkgver}-gnu1
 _pkgverbase=${pkgver%%.*}
 pkgrel=1
@@ -20,22 +20,26 @@ makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf' '
              'libpulse' 'gst-plugins-base-libs' 'inetutils' 'rust')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
+            'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech')
-source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
+
+# Set this variable to 1 if you want to build with clang compiler
+_CLANG=1
+if [ "$_CLANG" -eq "1" ]; then
+	optdepends+=(clang)
+fi
+
+#source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
 #source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}      ## Main upstream download site
 #source=(https://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2      ## Good mirror
 #source=(http://jenkins.trisquel.info/icecat/${pkgname}-${_pkgver}.tar.bz2      ## Official developer (Ruben Rodriguez) site. Probably only has developer releases.
-        mozconfig icecat.desktop icecat-safe.desktop vendor.js
-        fix-wifi-scanner.diff no-crmf.diff)
+source=(http://alpha.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
+        icecat.desktop icecat-safe.desktop)
 
-sha256sums=('0a0cf3acb2067e0580204b44bb5a02fab2033c6bbf7c0b47522a3c4c1f29d625'
+sha256sums=('f40746f1c44b4ae3e5ae6da9d30efbdb78abb9d37864097320a9849ece3b1d53'
             'SKIP'
-            '558575fd72237d5953f386170eb9ef848beae6ac08d2b53518ae6365e4cc274b'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
-            '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
-            '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
-            'ada119174a2a1779c4195a1b4506e8ae67c49c5306103158805a390237acc1c6')
+            '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303')
 
 validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
@@ -47,19 +51,45 @@ prepare() {
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
-  patch -Np1 -i ../fix-wifi-scanner.diff
-
-  # https://bugs.archlinux.org/task/54395
-  patch -Np1 -i ../no-crmf.diff
 
   msg2 "Starting build..."
-
-  cp -v ${srcdir}/mozconfig .mozconfig
-
-  # WebRTC build tries to execute "python" and expects Python 2
-  mkdir -p "$srcdir/path"
-  ln -s /usr/bin/python2 "$srcdir/path/python"
+  
+  cat >.mozconfig <<END
+ac_add_options --enable-application=browser
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+ac_add_options --enable-linker=gold
+ac_add_options --enable-hardening
+ac_add_options --enable-optimize
+ac_add_options --enable-rust-simd
+# Branding
+ac_add_options --enable-official-branding
+ac_add_options --with-distribution-id=org.gnu
+
+# System libraries
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+
+# Features
+ac_add_options --enable-alsa
+ac_add_options --enable-startup-notification
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-debug-symbols
+ac_add_options --disable-tests
+ac_add_options --disable-eme
+
+ac_add_options --with-app-basename=icecat
+ac_add_options --with-app-name=icecat
+END
 }
 
 build() {
@@ -68,21 +98,38 @@ build() {
   ICECATDIR="/usr/lib/${pkgname}" && export ICECATDIR
 
   # _FORTIFY_SOURCE causes configure failures
-  CPPFLAGS+=" -O2"
+  #CPPFLAGS+=" -O2"
 
-  # Hardening
-#  LDFLAGS+=" -Wl,-z,now"
+#  export PATH="$srcdir/path:$PATH"
 
-  export PATH="$srcdir/path:$PATH"
+  # Build with clang
+  if [ "$_CLANG" -eq "1" ]; then
+    export CC=clang
+    export CXX=clang++
+  fi
 
-  make -f client.mk build
+  # Do PGO
+  #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
+  #  MOZ_PGO=1 ./mach build
+  ./mach build
+  ./mach buildsymbols
 }
 
 package () {
-
   cd "${srcdir}/${pkgname}-${pkgver}"
+  DESTDIR="$pkgdir" ./mach install
 
-  make -f client.mk DESTDIR="${pkgdir}" install
+  _vendorjs="$pkgdir/usr/lib/${pkgname}/browser/defaults/preferences/vendor.js"
+  install -Dm644 /dev/stdin "$_vendorjs" <<END
+// Use LANG environment variable to choose locale
+pref("intl.locale.requested", "");
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Opt all of us into e10s, instead of just 50%
+pref("browser.tabs.remote.autostart", true);
+END
 
   msg2 "Finishing..."
   install -m755 -d ${pkgdir}/usr/share/applications
@@ -95,12 +142,4 @@ package () {
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/official/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
   install -Dm644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/
   install -Dm644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
-
-  # implement vendor.js setting the locale to match the os don't disable our languages extensions
-  # https://projects.archlinux.org/svntogit/packages.git/commit/trunk/PKGBUILD?h=packages/firefox&id=281a95c2cca0db88904603d7808936f52797a690
-  install -Dm644 "${srcdir}"/vendor.js "${pkgdir}${ICECATDIR}/browser/defaults/preferences/vendor.js"
-
-  # We don't want the development stuff
-  rm -rv "$pkgdir"/usr/{include,lib/icecat-devel,share/idl}
 }
-
diff --git a/PKGBUILD.gcc5 b/PKGBUILD.gcc5
deleted file mode 100644
index bd1283d96ae4..000000000000
--- a/PKGBUILD.gcc5
+++ /dev/null
@@ -1,116 +0,0 @@
-# Maintainer: Figue <ffigue at gmail>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-pkgname=icecat
-pkgver=38.8.0
-_pkgver=38.8.0-gnu1
-_pkgverbase=${pkgver%%.*}
-pkgrel=1
-pkgdesc="GNU version of the Firefox browser."
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnuzilla/"
-license=('GPL' 'MPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
-         'dbus-glib' 'alsa-lib' 'ffmpeg' 'desktop-file-utils'
-         'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
-makedepends=('gcc5' 'unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
-             'libpulse' 'gst-plugins-base-libs' 'inetutils')
-optdepends=('networkmanager: Location detection via available WiFi networks'
-            'upower: Battery API')
-options=('!emptydirs' '!makeflags')
-install=icecat.install
-source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
-#source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}      ## Main upstream download site
-#source=(https://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2      ## Good mirror
-#source=(http://jenkins.trisquel.info/icecat/${pkgname}-${_pkgver}.tar.bz2      ## Official developer (Ruben Rodriguez) site. Probably only has developer releases.
-        mozconfig
-        icecat.desktop
-        icecat-safe.desktop
-        vendor.js)
-
-sha256sums=('97f76e85cc6f98463f0e0b0e845826816032770f9b589db69ece6b1cff21936c'
-            'SKIP'
-            '96c07883b62dc52768603bedad7e37980410b7c13b63e63880e915c872e39eea'
-            'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
-            '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
-            '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4')
-
-validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
-
-prepare() {
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Patch to move files directly to /usr/lib/icecat. No more symlinks.
-  sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
-  sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
-
-  msg2 "Starting build..."
-
-  cp -v ${srcdir}/mozconfig .mozconfig
-
-  # WebRTC build tries to execute "python" and expects Python 2
-  mkdir "$srcdir/path"
-  ln -s /usr/bin/python2 "$srcdir/path/python"
-
-}
-
-build() {
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ICECATDIR="/usr/lib/${pkgname}" && export ICECATDIR
-
-  # _FORTIFY_SOURCE causes configure failures
-  CPPFLAGS+=" -O2"
-
-  # Default Arch flags
-#  if [ "${CARCH}" = 'x86_64' ]; then
-#    export CFLAGS="-march=x86-64 -mtune=generic -82 -pipe -fstack-protector-strong"
-#    export CXXFLAGS="$CFLAGS"
-#  elif [ "${CARCH}" = 'i686' ]; then
-#    export CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
-#    export CXXFLAGS="$CFLAGS"
-#  fi
-
-  export PATH="$srcdir/path:$PATH"
-#  export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR"
-#  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-#  export PYTHON=python2
-
-  make CXX=g++-5 CC=gcc-5 -f client.mk build
-#  ./configure --with-l10n-base="${srcdir}/${pkgname}-${pkgver}"/l10n -std=gnu89
-#  make
-
-}
-
-package () {
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make CXX=g++-5 CC=gcc-5 -f client.mk DESTDIR="${pkgdir}" install
-#  make DESTDIR="${pkgdir}" install
-
-  msg2 "Finishing..."
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m755 -d ${pkgdir}/usr/share/pixmaps
-
-  for i in 16 32 48; do
-      install -Dm644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/official/default${i}.png \
-      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/icecat.png"
-  done
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/official/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
-  install -Dm644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/
-  install -Dm644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
-
-  # implement vendor.js setting the locale to match the os don't disable our languages extensions
-  # https://projects.archlinux.org/svntogit/packages.git/commit/trunk/PKGBUILD?h=packages/firefox&id=281a95c2cca0db88904603d7808936f52797a690
-  install -Dm644 "${srcdir}"/vendor.js "${pkgdir}${ICECATDIR}/browser/defaults/preferences/vendor.js"
-
-  # We don't want the development stuff
-  rm -rv "$pkgdir"/usr/{include,lib/icecat-devel,share/idl}
-}
-
diff --git a/fix-wifi-scanner.diff b/fix-wifi-scanner.diff
deleted file mode 100644
index f8fdd6c42142..000000000000
--- a/fix-wifi-scanner.diff
+++ /dev/null
@@ -1,16 +0,0 @@
- netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git c/netwerk/wifi/nsWifiScannerDBus.cpp i/netwerk/wifi/nsWifiScannerDBus.cpp
-index 182553e18fa6e104..6fa0a0b023d3e45f 100644
---- c/netwerk/wifi/nsWifiScannerDBus.cpp
-+++ i/netwerk/wifi/nsWifiScannerDBus.cpp
-@@ -62,7 +62,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
-       return NS_ERROR_FAILURE;
-     }
-   } else if (!strcmp(aFuncCall, "GetAll")) {
--    const char* param = "";
-+    const char* param = "org.freedesktop.NetworkManager.AccessPoint";
-     if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
-       return NS_ERROR_FAILURE;
-     }
diff --git a/mozconfig b/mozconfig
deleted file mode 100644
index a23425e8d839..000000000000
--- a/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --enable-gold
-ac_add_options --enable-pie
-ac_add_options --enable-optimize="-O2"
-ac_add_options --enable-official-branding
-ac_add_options --with-distribution-id=org.gnu
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-alsa
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-tests
-ac_add_options --disable-eme
-
-ac_add_options --with-app-basename=icecat
-ac_add_options --with-app-name=icecat
-
-STRIP_FLAGS="--strip-debug"
-
-# vim:set ft=sh:
diff --git a/mozilla-1228540-1.patch b/mozilla-1228540-1.patch
deleted file mode 100644
index be6ffc3169f8..000000000000
--- a/mozilla-1228540-1.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-# HG changeset patch
-# User Jonathan Kew <jkew@mozilla.com>
-# Date 1452675061 0
-#      Wed Jan 13 08:51:01 2016 +0000
-# Node ID cf699e95e98829b465b64a7e0281d95ec851ce8c
-# Parent  3c9f357598e86c2f593e9895d5725bf3498f8f5a
-Bug 1228540 - pt 2 - Remove our HBGetGlyphHOrigin callback, as the default behavior is sufficient.
-
-diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
---- a/gfx/thebes/gfxHarfBuzzShaper.cpp
-+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
-@@ -349,27 +349,16 @@ gfxHarfBuzzShaper::HBGetGlyphVAdvance(hb
-         static_cast<const gfxHarfBuzzShaper::FontCallbackData*>(font_data);
-     // Currently, we don't offer gfxFont subclasses a method to override this
-     // and provide hinted platform-specific vertical advances (analogous to the
-     // GetGlyphWidth method for horizontal advances). If that proves necessary,
-     // we'll add a new gfxFont method and call it from here.
-     return fcd->mShaper->GetGlyphVAdvance(glyph);
- }
- 
--/* static */
--hb_bool_t
--gfxHarfBuzzShaper::HBGetGlyphHOrigin(hb_font_t *font, void *font_data,
--                                     hb_codepoint_t glyph,
--                                     hb_position_t *x, hb_position_t *y,
--                                     void *user_data)
--{
--    // We work in horizontal coordinates, so no origin adjustment needed here.
--    return true;
--}
--
- struct VORG {
-     AutoSwap_PRUint16 majorVersion;
-     AutoSwap_PRUint16 minorVersion;
-     AutoSwap_PRInt16  defaultVertOriginY;
-     AutoSwap_PRUint16 numVertOriginYMetrics;
- };
- 
- struct VORGrec {
-@@ -1262,19 +1251,16 @@ gfxHarfBuzzShaper::Initialize()
-         hb_font_funcs_set_glyph_func(sHBFontFuncs, HBGetGlyph,
-                                      nullptr, nullptr);
-         hb_font_funcs_set_glyph_h_advance_func(sHBFontFuncs,
-                                                HBGetGlyphHAdvance,
-                                                nullptr, nullptr);
-         hb_font_funcs_set_glyph_v_advance_func(sHBFontFuncs,
-                                                HBGetGlyphVAdvance,
-                                                nullptr, nullptr);
--        hb_font_funcs_set_glyph_h_origin_func(sHBFontFuncs,
--                                              HBGetGlyphHOrigin,
--                                              nullptr, nullptr);
-         hb_font_funcs_set_glyph_v_origin_func(sHBFontFuncs,
-                                               HBGetGlyphVOrigin,
-                                               nullptr, nullptr);
-         hb_font_funcs_set_glyph_extents_func(sHBFontFuncs,
-                                              HBGetGlyphExtents,
-                                              nullptr, nullptr);
-         hb_font_funcs_set_glyph_contour_point_func(sHBFontFuncs,
-                                                    HBGetContourPoint,
-diff --git a/gfx/thebes/gfxHarfBuzzShaper.h b/gfx/thebes/gfxHarfBuzzShaper.h
---- a/gfx/thebes/gfxHarfBuzzShaper.h
-+++ b/gfx/thebes/gfxHarfBuzzShaper.h
-@@ -56,21 +56,16 @@ public:
-                        hb_codepoint_t glyph, void *user_data);
- 
-     // get harfbuzz vertical advance in 16.16 fixed point format.
-     static hb_position_t
-     HBGetGlyphVAdvance(hb_font_t *font, void *font_data,
-                        hb_codepoint_t glyph, void *user_data);
- 
-     static hb_bool_t
--    HBGetGlyphHOrigin(hb_font_t *font, void *font_data,
--                      hb_codepoint_t glyph,
--                      hb_position_t *x, hb_position_t *y,
--                      void *user_data);
--    static hb_bool_t
-     HBGetGlyphVOrigin(hb_font_t *font, void *font_data,
-                       hb_codepoint_t glyph,
-                       hb_position_t *x, hb_position_t *y,
-                       void *user_data);
- 
-     hb_position_t GetHKerning(uint16_t aFirstGlyph,
-                               uint16_t aSecondGlyph) const;
- 
diff --git a/no-crmf.diff b/no-crmf.diff
deleted file mode 100644
index f30d17cc31c9..000000000000
--- a/no-crmf.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git i/old-configure.in w/old-configure.in
-index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
---- i/old-configure.in
-+++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
-     AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
- 
--if test -n "$MOZ_SYSTEM_NSS"; then
--   NSS_LIBS="$NSS_LIBS -lcrmf"
--else
-+if test -z "$MOZ_SYSTEM_NSS"; then
-    NSS_CFLAGS="-I${DIST}/include/nss"
-    case "${OS_ARCH}" in
-         # Only few platforms have been tested with GYP
-diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build
-index 9b8005f..4bfcc81 100644
---- a/config/external/nss/crmf/moz.build
-+++ b/config/external/nss/crmf/moz.build
-@@ -8,7 +8,6 @@ Library('crmf')
- 
- if CONFIG['MOZ_NATIVE_NSS']:
-     OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
--    OS_LIBS += ['-lcrmf']
- else:
-     USE_LIBS += [
-         # The dependency on nss is not real, but is required to force the
diff --git a/vendor.js b/vendor.js
deleted file mode 100644
index d8d606bc15d7..000000000000
--- a/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);