From 8887b3d2cb7e7c981711da161366b7f0641683a2 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 10 Mar 2020 09:42:51 -0700
Subject: Updated to 74.0 Re-enabled sideloading addons

---
 PKGBUILD               | 16 ++++++++--------
 mozconfig.in           |  1 +
 mozconfig.in.clang     |  1 +
 mozconfig.in.clang.pgo |  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 42c7d5d..e965ba2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,8 +18,8 @@ _modclang=0
 #_modclang=1 # FIXME
 
 pkgname=firefox
-pkgver=73.0.1
-pkgrel=1
+pkgver=74.0
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
@@ -28,8 +28,8 @@ depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg
          ttf-font libpulse alsa-lib
          bzip2 libffi icu libjpeg-turbo libevent libvpx nspr nss pixman libpng sqlite libwebp zlib)
 makedepends=(unzip zip diffutils python-setuptools yasm mesa imake inetutils
-             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2
-             python nodejs python-psutil cbindgen nasm python2)
+             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python
+             nodejs python2-psutil cbindgen nasm)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'alsa-utils: ALSA support'
@@ -54,14 +54,14 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-b2sums=('15b04ae179180916508ac480876f9899baca83a33092f03d86d7a4d9ecfc10b68d3feae2bb119664a7653a18828936f194c07964cf19f9e4908dd31fca2548d0'
+b2sums=('4c478b64ecf0f48e9f678040d1d467ce988c7054c5a586fdc97132d1453a0963b34438e7f9c7d0bd99b9d72b9053a6492924e09212508638892edfdaccc56231'
         'SKIP'
         'b4683a33448cf7a891d629e4e1fd290622fcf96cacf593cb733eb4daad2fd66909e125e64e5129096051ba0d2453b831b14c8faf98d345f248f2132e3931355d'
         '51d7eb22cb568f0437ece2433091d8b54012324edd2fe52ec52cc00f1ad0d4bd84a4d549d78b4d77bbd6ae1c1e7d029d9d4dbff61c60f714362ef791f09fba8b'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
-        '535cd9e5f2af64378d7f4130b6f48154eaf671da27a7b61f1ddd222ce03c39cc1120efc210c577c38b32a492e6afb44c51eca3025c7acc45fbe1a93c759864b3'
-        'a66abc624721f9d81b2a69624e6aa6bedf01b781d0e0841a22ad467b2e188aae2f4466d7dde8337205f351ce7e44cc74ff42b1548725a955a57c28faf43471dd'
-        'cd3014c83dc1789d6ee5d6090a2c0835148fc317a40960dfde0c2272ef5bee0bc7c30e8a0fd93905433737bfba6362b663625ee4c206637638408cbebf35a870'
+        '1e88c2ba69ffd167c7b5bf2aed816e54740782e55eadd5db59f601c11b56ef31a3514126b91c7710e72c67906dc9f6f220ebac98ff305870b1ff749dcd9e6d5d'
+        '503dd9566de9ef21201d3440374a4c829c65d6e33abc7fa658a9656fdfc175343a214d5191d6fa479bb5407bd1aef64af4f667fa6bd02102d2170b95a57e6d7d'
+        'b552f33654fe47946ec7778a4e8e240e79b780493124281856204a137f2950cde3cde027960a2b5fd4ddb669330e386d2a933a29753f43b6ce57859499eb29e1'
         '1e8cdc2968a78fa395b77b654496dbbf21d37308a7fd560ab5cff8dc092d9b5123c374af8a5a18dec7fd2a053f411a1478ebfd928365208d22042391da444b4b'
         '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d'
         '4c0f100c52721f9d9a840d7de1f1d5310578ef7fbc350c62341d96b2af23d8bcb774a289429693153635964860cbb05074149bf043941dec87a1d86655b4d4b6'
diff --git a/mozconfig.in b/mozconfig.in
index a5da920..94acdfc 100644
--- a/mozconfig.in
+++ b/mozconfig.in
@@ -24,6 +24,7 @@ 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
+ac_add_options --allow-addon-sideload
 export MOZILLA_OFFICIAL=1
 export MOZ_REQUIRE_SIGNING=0
 export MOZ_ADDON_SIGNING=0
diff --git a/mozconfig.in.clang b/mozconfig.in.clang
index 60f170e..cb9e2fb 100644
--- a/mozconfig.in.clang
+++ b/mozconfig.in.clang
@@ -22,6 +22,7 @@ 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
+ac_add_options --allow-addon-sideload
 
 # System libraries
 ac_add_options --with-system-bz2
diff --git a/mozconfig.in.clang.pgo b/mozconfig.in.clang.pgo
index be9f426..fc6bbd7 100644
--- a/mozconfig.in.clang.pgo
+++ b/mozconfig.in.clang.pgo
@@ -22,6 +22,7 @@ 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
+ac_add_options --allow-addon-sideload
 
 # System libraries
 ac_add_options --with-system-bz2
-- 
cgit v1.2.1