1 files changed, 12 insertions, 16 deletions
diff --git a/PKGBUILD b/PKGBUILD
index fa56fb3..21b384e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,8 +19,8 @@ _modclang=0
 _testgcc=0
 
 pkgname=firefox
-pkgver=83.0
-pkgrel=2
+pkgver=84.0
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
@@ -44,7 +44,6 @@ conflicts=(firefox-esr)
 source=(
         "https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
-        0002-Bug-1667736-Update-packed_simd-to-compile-on-Rust-1..patch
         $pkgname.desktop
         distribution.ini
         mozconfig.in
@@ -57,21 +56,20 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-b2sums=('b3a805288f4d644f7375c78ebe771c26d59c57f6aad71877abbfe60563c06af5f162b8894cb624cec12a5c72542ffad97e6f8f0cfc3fba0506d4e246a41911e1'
+b2sums=('63b5300fb4eaf402ccde7093cc1cef462109f2cddacec966e7b3d7d3d4dfe2da7184871ceae661f0a201d33d03550adffdcaebb49b45b605e54f3cb3458a70d4'
         'SKIP'
         'c83065fa6eab83c4b74c5e6d5eb61cdc0b050debbb25aae5800a3ab5b58ff946c75d63f5373fc1995f03513888d57f7ee1d63d14c2c891f23460e0a8ee642eb2'
-        '61dbab6ff60e8cd8d1d0cc724941d72af141d71ede2c690e51c495bc98f5fb804a813ac97828e6eb4de0a172970ea94b5ae430ae1242eb1c3a27e1ea9b383fdc'
         'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
-        '87b1436052b415ab62fc0a5b53a757dd50e72e31d45a9f2031ab8ee052e93618d7108b5f5c4f9510e9f5fdc8d7577ef6ebe3788a1b3c4209b6213e16a4d8a2b3'
+        '1c91bdad61a9b01b2c4dc08e3dce78da8ba7e140176a3263c566cd3121977dcad82b970f5882ff264994bc5a28c9373666afbc815f23cfc9bee73f161de5e7cd'
         '08d4e0768c2323b4905b3ba539594e88132b487a4eac2ab61df36020fe6f933c338afba918aea0becd10ecf29795bf94146cefc4f6b111ea658a20fdf6e899cd'
         'aa87016dabc182a4da3db1f29f4a6b274095be883febf848ddbe86615639b6a85f12b2c78ce6b18bba18516982330fb775083f4bab330738d95ee26d70f02dfa'
         'ffb7ca117004a084b1bd7baed6a11b0914ec391459d662fc8887edc3206eb25c41b09f713e9bfe0ed474333d9537295842b0617dd29e9ce222fde548cd9111aa'
         '1c7ac58af8b817067c7d79ffef8d9100f513d77f4fc1a2bce2684ff8d8d3cbc3d37b31865c7e5d873fd71d4649374bbd25ca08166d8afb25ffbd597759655063'
-        '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d'
+        '3b76cfb76a3e527d4c77d61a127606aef0b46826d7a0f7866164e0b490098714cc11429002fc35ac32b75ffbc61f76596a5e984aea37f8876bcd939030bcfa21'
         '1250b2d4a713b241d9768dc386ecf9130d295587efd5070c2e494185436ca9d99a465b97ed80fe23ab14d6d07ecde8537a3a3d11ba843c4e3791b4df52e08f27'
-        '020695637162ce981929f54ea556100bf17e92931179a5849ca8265dfc0016f1b6599d9f77e9f71f192a1a4bb3b2d1eadbf5d5554e6c33bfa3f9388b0a3c7c6e'
-        '635a84c64ea9dccf41fbde33b58a72a8123ecd841995ad045bd329e23855f56ffce05670fe2d69a12c4cef7a7399bc6becfc5f40bfd8cea9a4006074672a634d')
+        '1dce1277c0c8b83089551057ed61c8794aa65242d0c19573dab96081f00b1042af73fbc0a40ba49dfa31eff46f4636ffd985cf8e6bd28db614a639ca6c11c74e'
+        '379adf3726664668f6167eaeab35dec40342d9288ff081d22a8363f163ab0945b17ce69e7d4276a31e99e56f690afa070c410c51a5060ed835356fd216256e7b')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')  # Mozilla Software Releases
 
 prepare() {
@@ -81,17 +79,14 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
-  # Fix build with Rust 1.48 https://bugs.archlinux.org/task/68747
-  patch -Np1 -i ../0002-Bug-1667736-Update-packed_simd-to-compile-on-Rust-1..patch
-
   if [ "${_modclang}" != "1" ]; then
     # Apply gcc pgo patches
-    patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/arc4_enable-lto-for-gcc.patch
+    patch -Np1 -i ../arc4_enable-lto-for-gcc.patch
   fi
 
   if [ "${_testgcc}" == "1" ]; then
     # Apply gcc pgo patches
-    patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/arc4_enable-pgo-for-gcc.patch
+    patch -Np1 -i ../arc4_enable-pgo-for-gcc.patch
   fi
 
   if [ "${_modclang}" == "1" ]; then
@@ -114,10 +109,10 @@ prepare() {
   sed -i 's/;1/;0/' $srcdir/${pkgname}-${pkgver}/toolkit/components/telemetry/components.conf
 
   # Patch out health reporting so that MOZ_DATA_REPORTING=0 can be applied.
-  patch -p0 $srcdir/${pkgname}-${pkgver}/browser/moz.configure $srcdir/arc4_remove-health-reporting.patch
+  patch -Np1 -i ../arc4_remove-health-reporting.patch
 
   # Remove @RESPATH@/browser/features/* to prevent system addons from being part of the output package.
-  patch -p0 $srcdir/${pkgname}-${pkgver}/browser/installer/package-manifest.in $srcdir/arc4_remove-system-addons.patch
+  patch -Np1 -i ../arc4_remove-system-addons.patch
 
 
   # Hide mobile promo
@@ -136,6 +131,7 @@ build() {
   export MACH_USE_SYSTEM_PYTHON=1
 
   # -flto breaks cargo
+  # -fPIE and -pie break compiling
   export CFLAGS="$CFLAGS -O3 -fstack-protector-all -fPIC"
   export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -fPIC"