From 6aadc57ae091f6fb0adb24cdf7f23d04f0503545 Mon Sep 17 00:00:00 2001
From: Li Q <li66@21cn.com>
Date: Sat, 13 Jul 2019 14:11:58 -0300
Subject: community/firefox-esr: upgrade to 68.0

See https://www.mozilla.org/en-US/security/advisories/mfsa2019-22/
---
 community/firefox-esr/fix-webrtc-glibcisms.patch | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'community/firefox-esr/fix-webrtc-glibcisms.patch')

diff --git a/community/firefox-esr/fix-webrtc-glibcisms.patch b/community/firefox-esr/fix-webrtc-glibcisms.patch
index dc9206b50e..658b076dc8 100644
--- a/community/firefox-esr/fix-webrtc-glibcisms.patch
+++ b/community/firefox-esr/fix-webrtc-glibcisms.patch
@@ -1,13 +1,20 @@
 --- ./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>
+@@ -14,7 +14,7 @@
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(a, b) 0
+ #endif
 -#if __GLIBC_PREREQ(2, 16)
-+#if !defined(__GLIBC__)
-+#include <sys/auxv.h>
-+#elif __GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
  #include <sys/auxv.h>
  #else
  #include <fcntl.h>
+@@ -32,7 +32,7 @@
+   int architecture = 0;
+   unsigned long hwcap = 0;
+   const char* platform = NULL;
+-#if __GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
+   hwcap = getauxval(AT_HWCAP);
+   platform = (const char*)getauxval(AT_PLATFORM);
+ #else
-- 
cgit v1.2.3