Updated package firefox-esr52 52.9.0-5

3 files changed, 44 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bb94feabe39..832b54916f90 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 = 4
+	pkgrel = 5
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = x86_64
 	license = MPL
@@ -57,6 +57,7 @@ pkgbase = firefox-esr52
 	source = vendor.js
 	source = distribution.ini
 	source = gcc9_format-overflow.patch
+	source = glibc-gettid-wrapper.patch
 	validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A
 	sha256sums = c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6
 	sha256sums = 9efd02ff78c31f8690a12401faac2605dffcac12eaf11e1791ec4221570c2746
@@ -72,6 +73,7 @@ pkgbase = firefox-esr52
 	sha256sums = 3c039dbfdcf63022812b51f35289b176b26b4a9933da073f8788fde02be9fdcd
 	sha256sums = 8ae5b7cd1f7092f13859b632e1e5f69948b2801e0459fdf29c745c89f8eeb823
 	sha256sums = b66a84af7cc1809fe9dd0d7737f6043be2919ebe0a2c752cca483d67957ad431
+	sha256sums = e2f6353d2021bb2490acd7216762cd5bae41eb55a82e245813a62a7024c01229
 
 pkgname = firefox-esr52
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c8cf61d9b82..f53520e79bcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-esr52
 pkgver=52.9.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Standalone web browser from mozilla.org, Extended Support Release 52.x with NPAPI support'
 arch=('x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -34,7 +34,8 @@ source=("https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefo
         "mozconfig"
         "vendor.js"
         "distribution.ini"
-        "gcc9_format-overflow.patch")
+        "gcc9_format-overflow.patch"
+        "glibc-gettid-wrapper.patch")
 sha256sums=('c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6'
             '9efd02ff78c31f8690a12401faac2605dffcac12eaf11e1791ec4221570c2746'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
@@ -48,7 +49,8 @@ sha256sums=('c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6'
             '1c17c99ffc7ddf83d79ee76a91927a55a45bb6bd459bcff3baf79c5ad5748645'
             '3c039dbfdcf63022812b51f35289b176b26b4a9933da073f8788fde02be9fdcd'
             '8ae5b7cd1f7092f13859b632e1e5f69948b2801e0459fdf29c745c89f8eeb823'
-            'b66a84af7cc1809fe9dd0d7737f6043be2919ebe0a2c752cca483d67957ad431')
+            'b66a84af7cc1809fe9dd0d7737f6043be2919ebe0a2c752cca483d67957ad431'
+            'e2f6353d2021bb2490acd7216762cd5bae41eb55a82e245813a62a7024c01229')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -103,6 +105,10 @@ prepare() {
   # https://forum.palemoon.org/viewtopic.php?t=21745
   # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925781
   patch -Np1 -i "${srcdir}/gcc9_format-overflow.patch"
+
+  # Fix for gettid() wrapper in newer glibc
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1533969
+  patch -Np1 -i "${srcdir}/glibc-gettid-wrapper.patch"
 }
 
 build() {
diff --git a/glibc-gettid-wrapper.patch b/glibc-gettid-wrapper.patch
new file mode 100644
index 000000000000..643bde10519b
--- /dev/null
+++ b/glibc-gettid-wrapper.patch
@@ -0,0 +1,32 @@
+--- a/tools/profiler/core/platform.h	2017-04-10 19:13:25.000000000 -0700

++++ b/tools/profiler/core/platform.h	2019-11-23 13:26:09.765046334 -0800

+@@ -59,16 +59,13 @@

+ #include <vector>

+ #include "StackTop.h"

+ 

+-// We need a definition of gettid(), but Linux libc implementations don't

++// We need a definition of gettid(), but old Linux libc implementations don't

+ // provide a wrapper for it (except for Bionic)

+ #if defined(__linux__)

+ #include <unistd.h>

+ #if !defined(__BIONIC__)

+ #include <sys/syscall.h>

+-static inline pid_t gettid()

+-{

+-  return (pid_t) syscall(SYS_gettid);

+-}

++#define gettid() static_cast<pid_t>(syscall(SYS_gettid))

+ #endif

+ #endif

+ 

+--- a/tools/profiler/core/GeckoSampler.cpp	2017-04-10 19:13:25.000000000 -0700

++++ b/tools/profiler/core/GeckoSampler.cpp	2019-11-23 14:17:39.549385223 -0800

+@@ -67,7 +67,7 @@

+ 

+ #if defined(LINUX) || defined(XP_MACOSX)

+ #include <sys/types.h>

+-pid_t gettid();

++//pid_t gettid();

+ #endif

+ 

+ #if defined(__arm__) && defined(ANDROID)
\ No newline at end of file