From bcf1d2e10b67cab85ee7c1de1256c32344626937 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Mon, 2 Sep 2019 05:49:37 -0400
Subject: [iceweasel][iceweasel-l10n]: upgrade to v68.0.2

---
 libre/iceweasel/PKGBUILD | 55 ++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

(limited to 'libre/iceweasel')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index f3c8b2d9a..a7e23629e 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -1,21 +1,22 @@
-# 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>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
+# Contributor (ConnochaetOSl): Henry Jensen <hjensen@connochaetos.org>
+# Contributor: Andreas Grapentin <andreas@grapentin.org>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: vando <facundo@esdebian.org>
 # Contributor: Figue <ffigue at gmail>
+# Contributor: evr <evanroman at gmail>
+# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
 # Contributor: taro-k <taro-k@movasense_com>
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 # Contributor: Isaac David <isacdaavid@isacdaavid.info>
 # Contributor: bill-auger <bill-auger@programmer.net>
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
+
 
 # Rational for inclusion in [libre]:
 #  - Modify the addons pages to use GNU IceCat plugins sources, rather
@@ -40,9 +41,9 @@
 pkgname=iceweasel
 replaces=('firefox')
 epoch=1
-pkgver=68.0.1
+pkgver=68.0.2
 pkgrel=1
-pkgrel+=.parabola2
+pkgrel+=.parabola1
 _brandingver=67.0
 _brandingrel=2
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
@@ -74,7 +75,7 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         searchengines.patch)
 # FIXME: branding tarball needs re-working
 source+=(aboutlogins.svg)
-sha256sums=('6037f77bdab29d79ca5e3fbd1d32f6c209e09d2066189a13dc7f7491227f5568'
+sha256sums=('9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840'
             'SKIP'
             'e439117380218898cd5c60a8da8947847efbd0fe64cc06b129d6ca20a392cb3d'
             '0151b49e9f5d3bdce64ac0854d84fa5157a65df2d7e16eb683366cbeee021805'
@@ -86,18 +87,19 @@ sha256sums=('6037f77bdab29d79ca5e3fbd1d32f6c209e09d2066189a13dc7f7491227f5568'
             'dfed11d97f1d4198a3dc608be159b6b53a11054f376cdb73bb0fe9a487ae9418')
 sha256sums+=('SKIP')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases
-              'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
+              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
 prepare() {
-  [[ -d mozbuild ]] && rm -rf mozbuild
-  mkdir mozbuild
-  cd firefox-$pkgver
+  cd "$srcdir/firefox-$pkgver"
+  [[ -d $srcdir/mozbuild ]] && rm -rf $srcdir/mozbuild
 
+  ## build configuration
   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
@@ -121,8 +123,9 @@ ac_add_options --enable-system-sqlite
 ac_add_options --with-system-bz2
 ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
-# FIXME: firefox does not build against libvpx-1.8.0
-# ac_add_options --with-system-libvpx
+# FIXME: does not build against libvpx-1.8.0 - disable --with-system-libvpx
+#        libvpx-1.8.1 is in [extra] now - try re-enabling (untested)
+ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-zlib
@@ -150,6 +153,7 @@ END
 
     cat >> .mozconfig <<END
 ac_add_options --enable-optimize="-O2"
+ac_add_options --disable-lto
 ac_add_options --disable-elf-hack
 ac_add_options --disable-av1
 mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -195,7 +199,7 @@ END
   #   "${brandingsrcdir}/branding/watermark.svg" # FIXME: delete
   # FIXME: newtab patch below will not work
   #       the new tab page needs to be a plugin, created externally
-  #       see: the branding-dev-build/ dir ont the '68.0' branch of the branding git repo 
+  #       see: the branding-dev-build/ dir on the '68.0' branch of the branding git repo
   #       that will also be useful for creating a replacement 'mozilla-searchplugins' package
   # custom new tab page
   local newtabdestdir=browser/components/newtab/data/content/assets/
@@ -246,13 +250,12 @@ END
 }
 
 build() {
-  cd firefox-$pkgver
+  cd "$srcdir/firefox-$pkgver"
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
-
   if [[ $CARCH = armv7h ]]; then
-    export RUSTFLAGS+=" -Cdebuginfo=0"
+    export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
   fi
 
@@ -261,10 +264,10 @@ build() {
     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
   fi
 
-  # LTO needs more open files
-  ulimit -n 4096
+  if [[ $CARCH = x86_64 ]]; then
+    # LTO needs more open files
+    ulimit -n 4096
 
-  if [[ $CARCH == x86_64 ]]; then
     xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
   else
     ./mach build
@@ -277,10 +280,12 @@ package() {
   _icu_ver=$(pacman -S --print-format='%v' icu)
   depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))")
 
-  cd firefox-$pkgver
+  cd "$srcdir/firefox-$pkgver"
+
   DESTDIR="$pkgdir" ./mach install
   find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
 
+  ## runtime configuration
   _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
   install -Dm644 /dev/stdin "$_vendorjs" <<END
 // Use LANG environment variable to choose locale
-- 
cgit v1.2.2