From b222ee0bf63197e6dee68b2f29c6d72b3628a9cf Mon Sep 17 00:00:00 2001
From: oaken-source <oaken-source@parabola.nu>
Date: Mon, 18 Nov 2019 22:58:44 +0100
Subject: libre/icecat: updated to 60.7.0_gnu1

---
 libre/icecat/PKGBUILD | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'libre/icecat/PKGBUILD')

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 4f962dbb7..7b9194b4c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,9 +15,9 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
 
 pkgname=icecat
-_pkgver=60.3.0-gnu1
+_pkgver=60.7.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=6
+pkgrel=1
 pkgdesc="GNU IceCat - a libre standalone web browser based on Mozilla Firefox."
 arch=(x86_64 i686 armv7h)
 license=(MPL GPL LGPL)
@@ -39,22 +39,29 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{
         libre-searchengines.patch
         libre.patch
         mozilla-1463035.patch
-        deny_missing_docs.patch)
-sha256sums=('6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645'
+        deny_missing_docs.patch
+        fix-double-definition-of-gettid.patch)
+sha256sums=('6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827'
             'SKIP'
             '2f9d117c1524312fb45f3e953cb0de02c525fd385a9b2b6d47308c8aaab0aedd'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
-            'ec6bedc8e7af6db74ce57ea07fe34d266af0280d8d7b46387e6cf5a27c1e6ca7'
-            '6057f40b2a35a0ad01faa810d8cd41d6c22bddc8ae32e883e68b9fc543e4c92d'
+            '99c279d04315c332a973a29b6ee540962364cd6d53cdaafc4055b3e1973e20da'
+            '65a560566db10e11bb1114805a653feaa40f4ff3775ac7e5f84d956deee2ed0a'
             '6c3781e13d3e8343aa2435bdb78d2e2666891154c7abd847388e5331e0424edb'
-            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4')
-validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
+            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4'
+            '3ea006eafe4cee790955024faca3b3d7ac6cd6968b50635b9da3c254a07f4791')
+validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E') # Ruben Rodriguez
 
 prepare() {
   cd "$srcdir/$pkgname-${pkgver%_*}"
 
   patch -Np1 -i ../deny_missing_docs.patch
 
+  patch -Np1 -i ../fix-double-definition-of-gettid.patch
+
+  # needed for 60.7-esr
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
+
   # Patch to move files directly to /usr/lib/icecat. No more symlinks.
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
@@ -98,6 +105,9 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-gconf
 ac_add_options --disable-updater
 ac_add_options --disable-eme
+
+# broken by rust-1.38 in esr60
+ac_add_options --disable-stylo
 END
 
   if [[ $CARCH = arm* ]]; then
-- 
cgit v1.2.3