From af4ec02d2b72b134895dee597f7e7debc5e20718 Mon Sep 17 00:00:00 2001
From: Molly Miller <adelie@m-squa.red>
Date: Wed, 22 May 2019 17:36:09 +0000
Subject: experimental/firefox: bump to 68.0.1

Includes:
* Depend on nasm; otherwise AV1 support won't be built on x86.
* Add mozconfig option --disable-elf-hack. Otherwise there's a weird
  failure in rootpkg, and according to awilfox we want to disable this
  anyway.
* Strip trailing spaces from the makedepends lines.
---
 experimental/firefox/bad-google-code.patch | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 experimental/firefox/bad-google-code.patch

(limited to 'experimental/firefox/bad-google-code.patch')

diff --git a/experimental/firefox/bad-google-code.patch b/experimental/firefox/bad-google-code.patch
new file mode 100644
index 000000000..e214af432
--- /dev/null
+++ b/experimental/firefox/bad-google-code.patch
@@ -0,0 +1,49 @@
+--- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
++++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+@@ -45,6 +45,7 @@
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <libgen.h>
+ 
+ #include <iostream>
+ #include <set>
+--- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
++++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
+@@ -41,6 +41,10 @@
+ 
+ #include "common/using_std_string.h"
+ 
++#ifndef N_UNDF
++#define N_UNDF 0
++#endif
++
+ using std::vector;
+ 
+ namespace google_breakpad {
+--- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
++++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
+@@ -55,7 +55,7 @@
+ 
+ #ifdef HAVE_MACH_O_NLIST_H
+ #include <mach-o/nlist.h>
+-#elif defined(HAVE_A_OUT_H)
++#elif 0
+ #include <a.out.h>
+ #endif
+ 
+--- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
++++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+@@ -1134,6 +1134,12 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#undef __NR_pread
++#define __NR_pread __NR_pread64
++#undef __NR_pwrite
++#define __NR_pwrite __NR_pwrite64
++
+ /* End of x86-64 definitions                                                 */
+ #elif defined(__mips__)
+ #if _MIPS_SIM == _MIPS_SIM_ABI32
-- 
cgit v1.2.3-70-g09d2