Updated package firefox-esr52 52.9.0-7

3 files changed, 27 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14f24a7aae7a..90fa487ed606 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firefox-esr52
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release 52.x with NPAPI support
 	pkgver = 52.9.0
-	pkgrel = 6
+	pkgrel = 7
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = x86_64
 	license = MPL
@@ -59,6 +59,7 @@ pkgbase = firefox-esr52
 	source = gcc9_format-overflow.patch
 	source = glibc-gettid-wrapper.patch
 	source = gfxFont.patch
+	source = linux_remove_sysctl.patch
 	validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A
 	sha256sums = c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6
 	sha256sums = 9efd02ff78c31f8690a12401faac2605dffcac12eaf11e1791ec4221570c2746
@@ -76,6 +77,7 @@ pkgbase = firefox-esr52
 	sha256sums = b66a84af7cc1809fe9dd0d7737f6043be2919ebe0a2c752cca483d67957ad431
 	sha256sums = e2f6353d2021bb2490acd7216762cd5bae41eb55a82e245813a62a7024c01229
 	sha256sums = ba7858a8cb852388c870bb9acd20bedc5e9cb0b2cf7bdfa5c334e61350279232
+	sha256sums = 1f324e9a5bf195a58416f622c025a9dd0aac7d802f838e44d9b55b34a0e56585
 
 pkgname = firefox-esr52
 
diff --git a/PKGBUILD b/PKGBUILD
index cca88b879e4e..ce25957b82e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-esr52
 pkgver=52.9.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Standalone web browser from mozilla.org, Extended Support Release 52.x with NPAPI support'
 arch=('x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -36,7 +36,8 @@ source=("https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefo
         "distribution.ini"
         "gcc9_format-overflow.patch"
         "glibc-gettid-wrapper.patch"
-        "gfxFont.patch")
+        "gfxFont.patch"
+        "linux_remove_sysctl.patch")
 sha256sums=('c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6'
             '9efd02ff78c31f8690a12401faac2605dffcac12eaf11e1791ec4221570c2746'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
@@ -52,7 +53,8 @@ sha256sums=('c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6'
             '8ae5b7cd1f7092f13859b632e1e5f69948b2801e0459fdf29c745c89f8eeb823'
             'b66a84af7cc1809fe9dd0d7737f6043be2919ebe0a2c752cca483d67957ad431'
             'e2f6353d2021bb2490acd7216762cd5bae41eb55a82e245813a62a7024c01229'
-            'ba7858a8cb852388c870bb9acd20bedc5e9cb0b2cf7bdfa5c334e61350279232')
+            'ba7858a8cb852388c870bb9acd20bedc5e9cb0b2cf7bdfa5c334e61350279232'
+            '1f324e9a5bf195a58416f622c025a9dd0aac7d802f838e44d9b55b34a0e56585')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -114,6 +116,9 @@ prepare() {
   
   # Fix for gfxFont.cpp
   patch -Np1 -i "${srcdir}/gfxFont.patch"
+  
+  # Fix for missing sysctl.h in memory/mozjemalloc/jemalloc.c
+  patch -Np1 -i "${srcdir}/linux_remove_sysctl.patch"
 }
 
 build() {
diff --git a/linux_remove_sysctl.patch b/linux_remove_sysctl.patch
new file mode 100644
index 000000000000..b55784386c03
--- /dev/null
+++ b/linux_remove_sysctl.patch
@@ -0,0 +1,16 @@
+diff -Naur firefox-52.9.0esr.orig/memory/mozjemalloc/jemalloc.c firefox-52.9.0esr/memory/mozjemalloc/jemalloc.c
+--- firefox-52.9.0esr.orig/memory/mozjemalloc/jemalloc.c	2017-05-12 02:25:50.000000000 +0200
++++ firefox-52.9.0esr/memory/mozjemalloc/jemalloc.c	2020-12-12 22:13:48.502275579 +0100
+@@ -331,9 +331,9 @@
+ #endif
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
+-#include <sys/sysctl.h>
+-#endif
++//#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
++//#include <sys/sysctl.h>
++//#endif
+ #include <sys/uio.h>
+ #ifndef MOZ_MEMORY
+ #include <sys/ktrace.h> /* Must come after several other sys/ includes. */