From 08d5f1fc59f439aab0d2d8a5f46cc69f9f5e1383 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Thu, 10 May 2018 03:38:14 +0200
Subject: [PATCH] firefox: update to 60.0.

---
 .../patches/fix-webrtc-glibcisms.patch        | 13 +++++++++++++
 .../patches/rust-unitialized-field.patch      | 19 +++++++++++++++++++
 srcpkgs/firefox/template                      |  7 +++----
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
 create mode 100644 srcpkgs/firefox/patches/rust-unitialized-field.patch

diff --git a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
new file mode 100644
index 00000000000..0a9304430b2
--- /dev/null
+++ b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
@@ -0,0 +1,13 @@
+--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2018-05-09 23:48:44.677389171 +0200
++++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2018-05-09 23:48:56.254373557 +0200
+@@ -11,7 +11,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <features.h>
+-#if __GLIBC_PREREQ(2, 16)
++#if !__GLIBC__
++#include <sys/auxv.h>
++#elif __GLIBC_PREREQ(2, 16)
+ #include <sys/auxv.h>
+ #else
+ #include <fcntl.h>
diff --git a/srcpkgs/firefox/patches/rust-unitialized-field.patch b/srcpkgs/firefox/patches/rust-unitialized-field.patch
new file mode 100644
index 00000000000..67ef3a02ab8
--- /dev/null
+++ b/srcpkgs/firefox/patches/rust-unitialized-field.patch
@@ -0,0 +1,19 @@
+--- ./media/audioipc/audioipc/src/cmsg.rs.orig	2018-05-09 22:19:14.748631939 +0200
++++ ./media/audioipc/audioipc/src/cmsg.rs	2018-05-09 22:19:22.961620862 +0200
+@@ -106,11 +106,11 @@ impl ControlMsgBuilder {
+                 return Err(Error::NoSpace);
+             }
+ 
+-            let cmsghdr = cmsghdr {
+-                cmsg_len: cmsg_len as _,
+-                cmsg_level: level,
+-                cmsg_type: kind,
+-            };
++            use std::mem;
++            let mut cmsghdr: cmsghdr =  unsafe { mem::zeroed() };
++            cmsghdr.cmsg_len = cmsg_len as _;
++            cmsghdr.cmsg_level = level;
++            cmsghdr.cmsg_type = kind;
+ 
+             let cmsghdr = unsafe {
+                 slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::<cmsghdr>())
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 1db492233f5..1bf0d243240 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,14 +3,14 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=59.0.3
+version=60.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="https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${version//./_}_RELEASE.tar.bz2"
-checksum=f6531edaad69b54ae4cbda364f467342b8c01fe9aefad75b0f77712789fdbe21
+distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
+checksum=4bc4fd997e6239f53e16a70b04f197791e5c5d09367e2916bcfe4a427999f842
 
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 lib32disabled=yes
@@ -30,7 +30,6 @@ conflicts="firefox-esr>=0"
 
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio"
-wrksrc="mozilla-release-FIREFOX_${version//./_}_RELEASE"
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in