From 544b178847abc0c7e7190ed99bcf845f0459548c Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 12 Jul 2019 17:27:43 -0700
Subject: Updated to 68.0

---
 PKGBUILD | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 97817b3..8750a03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
 # Arch version lacks privacy and security by default
 
 pkgname=firefox
-pkgver=67.0.4
+pkgver=68.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
@@ -37,15 +37,13 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags)
 source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
         $pkgname.desktop $pkgname-symbolic.svg
-        0001-bz-1521249.patch
         pgo-1.patch
         moz.configure.diff
         package-manifest.diff)
-sha256sums=('b2fb2d3e64a6947ef4f8212b72649acf2aa2cd4c8f70548abb636dd581fd6dc5'
+sha256sums=('f7d61a08820088f1280d27f0808e355152c1dd0c94625fd077ced7319e522565'
             'SKIP'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
-            'd0673786a6a1f1b9f6f66a3a1356afa33f1f18f59dabd92bd193c88c52a1d04c'
             'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
             'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
             '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
@@ -55,9 +53,6 @@ prepare() {
 #   mkdir mozbuild
   cd ${pkgname}-${pkgver}
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
-  patch -Np1 -i ../0001-bz-1521249.patch
-
   # Apply pgo patches
   patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
 
@@ -82,6 +77,7 @@ export RANLIB=gcc-ranlib
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.artixlinux
+ac_add_options --with-unsigned-addon-scopes=app,system
 
 # System libraries
 ac_add_options --with-system-bz2
@@ -103,16 +99,19 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-alsa
 ac_add_options --enable-jack
 ac_add_options --enable-startup-notification
+#ac_add_options --disable-cdp
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
 ac_add_options --disable-eme
 ac_add_options --disable-gconf
+#ac_add_options --disable-marionette
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-parental-controls
 ac_add_options --disable-tests
 ac_add_options --disable-updater
-# # Disabling webspeech breaks compiling ff67
+# # Disabling webspeech breaks compiling ff67+
+#ac_add_options --disable-synth-speechd
 #ac_add_options --disable-webspeech
 ac_add_options --disable-webrtc
 
@@ -169,8 +168,8 @@ package() {
   DESTDIR="$pkgdir" ./mach install
 
 
-  _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
-  install -Dm644 /dev/stdin "$_distini" <<END
+  install -Dm644 /dev/stdin \
+    "$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" <<END
 [Global]
 id=artixlinux
 version=1.0
@@ -182,6 +181,8 @@ app.distributor.channel=$pkgname
 app.partner.artixlinux=artixlinux
 END
 
+  # don't duplicate the binary, use a symlink instead
+  rm "$pkgdir/usr/bin/firefox"
   ln -s "/usr/lib/$pkgname/firefox" "$pkgdir/usr/bin/firefox"
 
 
-- 
cgit v1.2.1