From c7cdc7dab324278148f75c0833254db6706afbbd Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Fri, 29 Mar 2019 10:55:01 +0100
Subject: libre/iceweasel: updated to 66.0.2

---
 libre/iceweasel/PKGBUILD | 66 +++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

(limited to 'libre/iceweasel/PKGBUILD')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index fe1268b2e..b0cd80005 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -1,9 +1,7 @@
 # Maintainer (Arch:firefox): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor (Arch:firefox): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch:firefox): Jakub Schmidtke <sjakub@gmail.com>
-
 # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer: Luke Shumaker <lukeshu@parabola.nu>
 # Contributor: André Silva <emulatorman@hyperbola.info>
@@ -41,10 +39,10 @@
 pkgname=iceweasel
 replaces=('firefox')
 epoch=1
-pkgver=65.0.2
+pkgver=66.0.2
 pkgrel=1
-pkgrel+=.parabola2
-_brandingver=${pkgver%.*}
+pkgrel+=.parabola1
+_brandingver=66.0
 _brandingrel=1
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
 arch=(x86_64)
@@ -64,19 +62,23 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags !debug)
 source=("https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz"{,.asc}
+        0001-bz-1468911.patch
         $pkgname.desktop
         https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
         libre-searchengines.patch
         libre.patch
-        mozilla-1463035.patch)
-sha256sums=('7d856a681fd8959f492679d0db3c3b787102665670f57cd9739ba9065702059f'
+        arm.patch
+        build-arm-libopus.patch)
+sha256sums=('fc37538e5852d4c97778ad7437fb1d37e9218c284ced70935378562e35184b46'
             'SKIP'
+            '821f858bac2e13ce02b8c20d5387d4ecc8ab2d0e4ebe0a517cbf935da6aeb31b'
             'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
-            '4e4d52addfb0de4b4439e959e5c35194e35a6840a21dcf6b20c46604ae7f6482'
+            'ffac6b832ba2f80ac0682aa5ee88006b7033543b8be89fc17deec30b1b2c4d12'
             'SKIP'
-            '871222c88dfd240b1805b28c98ca7431bd2b87be1ff4dbb06caa6407b106b803'
-            '4a4667d99ab50b1990de6833e9647ddd428d9206e422c7cc3754d4f80aeb8038'
-            '8ed5baf2c10665cf49b823e35a4be9c495c8e87066a8c8357a996ea1762b013a')
+            '24ff5e736723350224115c3420285d3552d1fcd91fc8adff662c35d422f23883'
+            'a315507efe495ba55ab4ae52b1e2b3a0c1e7ac54b7ed976899da1dcd03532f95'
+            '2c9e39b9b62d5a75e31908cb4d42ff8006ff9406aed2f7deff826fe1466cd31a'
+            '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases
               'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
@@ -84,12 +86,14 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
+  patch -Np1 -i ../0001-bz-1468911.patch
+
   cat >.mozconfig <<END
 ac_add_options --enable-application=browser
 
 ac_add_options --prefix=/usr
 ac_add_options --enable-release
-ac_add_options --enable-linker=gold
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
@@ -130,31 +134,33 @@ ac_add_options --disable-eme
 END
 
   if [[ $CARCH = arm* ]]; then
-    msg "disabling LTO for armv7h build (phase 1/2)"
-    cat >> .mozconfig <<END
-ac_add_options --disable-lto
-export CC=gcc
-export CXX=g++
-export AR=gcc-ar
-export NM=gcc-nm
-export RANLIB=gcc-ranlib
-END
-    sed -i '/--enable-linker=gold/d' .mozconfig
+    sed -i '/--enable-hardening/d' .mozconfig
+    sed -i '/--enable-lto/d' .mozconfig
     sed -i '/--enable-rust-simd/d' .mozconfig
     sed -i '/export MOZ_PGO/d' .mozconfig
 
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1463035
-    patch -Np1 -i "$srcdir"/mozilla-1463035.patch
+    patch -Np1 -i ../arm.patch
+    patch -Np1 -i ../build-arm-libopus.patch
 
     cat >> .mozconfig <<END
-ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
+ac_add_options --enable-optimize="-O2"
+ac_add_options --disable-elf-hack
 ac_add_options --disable-webrtc
 ac_add_options --disable-av1
+ac_add_options --disable-lto
+export CC=gcc
+export CXX=g++
+export AR=gcc-ar
+export NM=gcc-nm
+export RANLIB=gcc-ranlib
 END
   fi
 
   if [[ $CARCH = i686 ]]; then
-    msg "disabling LTO for i686 build (phase 1/2)"
+    sed -i '/--enable-lto/d' .mozconfig
+    sed -i '/--enable-rust-simd/d' .mozconfig
+    sed -i '/export MOZ_PGO/d' .mozconfig
+
     cat >> .mozconfig <<END
 ac_add_options --disable-lto
 export CC=gcc
@@ -163,8 +169,6 @@ export AR=gcc-ar
 export NM=gcc-nm
 export RANLIB=gcc-ranlib
 END
-    sed -i '/--enable-linker=gold/d' .mozconfig
-    sed -i '/export MOZ_PGO/d' .mozconfig
   fi
 
   ## Rebranding
@@ -221,13 +225,11 @@ build() {
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
 
   if [[ $CARCH = armv7h ]]; then
-    msg "disabling LTO for armv7h build (phase 2/2)"
-    export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
+    export RUSTFLAGS+=" -Cdebuginfo=0"
     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
   fi
 
   if [[ $CARCH = i686 ]]; then
-    msg "disabling LTO for i686 build (phase 2/2)"
     export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
   fi
@@ -235,7 +237,7 @@ build() {
   # LTO needs more open files
   ulimit -n 4096
 
-  ./mach build
+  xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
   ./mach buildsymbols
 }
 
-- 
cgit v1.2.3