From d78ad96640642a8d131ffb7bf4eb2a6b9d776fa0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Wed, 14 Jun 2017 15:43:00 +0200
Subject: [PATCH] firefox: update to 54.0.

---
 srcpkgs/firefox/patches/fix-cheddar-dep.patch | 30 -------------------
 srcpkgs/firefox/patches/fix-tools.patch       | 22 ++------------
 srcpkgs/firefox/template                      | 15 +++-------
 3 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-cheddar-dep.patch

diff --git a/srcpkgs/firefox/patches/fix-cheddar-dep.patch b/srcpkgs/firefox/patches/fix-cheddar-dep.patch
deleted file mode 100644
index d9c2ac660f3..00000000000
--- a/srcpkgs/firefox/patches/fix-cheddar-dep.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-See Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1338655
---- media/libstagefright/binding/mp4parse-cargo.patch.orig	2017-05-08 09:40:56.297587573 +0200
-+++ media/libstagefright/binding/mp4parse-cargo.patch	2017-05-08 09:40:00.685697759 +0200
-@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/bindin
- index aeeebc65..5c0836a 100644
- --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
- +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
--@@ -18,18 +18,10 @@ exclude = [
-+@@ -18,18 +18,11 @@ exclude = [
-    "*.mp4",
-  ]
-  
- -build = "build.rs"
---
-++build = false
-+ 
-  [dependencies]
-  byteorder = "1.0.0"
-  "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
---- media/libstagefright/binding/mp4parse_capi/Cargo.toml.orig	2017-05-08 09:37:52.694951351 +0200
-+++ media/libstagefright/binding/mp4parse_capi/Cargo.toml	2017-05-08 09:37:59.369938126 +0200
-@@ -18,6 +18,8 @@ exclude = [
-   "*.mp4",
- ]
- 
-+build = false
-+
- [dependencies]
- byteorder = "1.0.0"
- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
diff --git a/srcpkgs/firefox/patches/fix-tools.patch b/srcpkgs/firefox/patches/fix-tools.patch
index 1f6df6d9214..e64ce3c185a 100644
--- a/srcpkgs/firefox/patches/fix-tools.patch
+++ b/srcpkgs/firefox/patches/fix-tools.patch
@@ -6,9 +6,9 @@
  
 +#include <sys/types.h>
 +
- #ifdef ANDROID
- #include <android/log.h>
- #else
+ #include <stdint.h>
+ #include <math.h>
+ #include "MainThreadUtils.h"
 --- tools/profiler/lul/LulElf.cpp
 +++ tools/profiler/lul/LulElf.cpp
 @@ -579,10 +579,10 @@
@@ -26,19 +26,3 @@
    return base;
  }
  
---- tools/profiler/core/platform-linux.cc.orig	2015-06-11 18:39:35.689739054 +0200
-+++ tools/profiler/core/platform-linux.cc	2015-06-11 18:40:04.479706749 +0200
-@@ -651,11 +651,13 @@ void OS::Startup() {
- void TickSample::PopulateContext(void* aContext)
- {
-   MOZ_ASSERT(aContext);
-+#if defined(__GLIBC__)
-   ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext);
-   if (!getcontext(pContext)) {
-     context = pContext;
-     SetSampleContext(this, aContext);
-   }
-+#endif
- }
- 
- void OS::SleepMicro(int microseconds)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index ed94c0f7da1..b9a3bfba930 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -1,20 +1,19 @@
 # Template build file for 'firefox'.
 pkgname=firefox
-version=53.0.3
+version=54.0
 revision=1
 short_desc="Mozilla Firefox web browser"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="https://www.mozilla.org/firefox/"
 license="MPL-2.0, GPL-2, LGPL-2.1"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=78cc89650b6d8baacaf55f1a486de06bf3bb5b8a3082fd044e70225e2816e348
+checksum=08a9ff6870d904a2af1d03c17c6c44f67413608efb66bb280894d7b92c336a77
 
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 nopie=yes
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
- $(vopt_if rust 'rust cargo')"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo"
 makedepends="
  nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel
  sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel
@@ -26,15 +25,10 @@ makedepends="
 depends="nss>=3.29 desktop-file-utils hicolor-icon-theme"
 conflicts="firefox-esr>=0"
 
-build_options="alsa dbus gtk3 rust pulseaudio startup_notification xscreensaver"
+build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver"
 build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver"
 
 desc_option_gtk3="Build the GTK+3 toolkit UI"
-desc_option_rust="Build rust components"
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*) build_options_default+=" rust" ;;
-esac
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -99,7 +93,6 @@ ac_add_options $(vopt_enable alsa)
 ac_add_options $(vopt_enable dbus)
 ac_add_options $(vopt_enable dbus necko-wifi)
 ac_add_options $(vopt_enable pulseaudio)
-ac_add_options $(vopt_enable rust)
 ac_add_options $(vopt_enable startup_notification startup-notification)
 !