Updated to 78.8.0

3 files changed, 4 insertions, 83 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 843e84f..4b6c978 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,9 +19,9 @@ _modclang=0
 
 _pkgname=firefox
 pkgname=${_pkgname}-esr
-pkgver=78.7.1
+pkgver=78.8.0
 _pkgver=${pkgver}esr
-pkgrel=2
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
@@ -47,7 +47,6 @@ 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
         rust_1.48.patch.gz
-        rust_1.50.patch
         $pkgname.desktop
         distribution.ini
         mozconfig.in
@@ -58,11 +57,10 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-b2sums=('c0c90488ef9727363f03707c3d1e83ab5965a32775db9e6832883b94f265a3d95bb468648360fa3f016c34044f4c706db84125f7c5b545aaa1dedcf03196cb0c'
+b2sums=('dc2476e8bad026589e8889abf3c38b7a7283efefce99dedd8bfb73bdbcdf66c7480d388e9c3ffc28177abb9c4f78cc2c9f6049e7fcb0a161871a99bcc25fa8ea'
         'SKIP'
         'e4cf5d0ddd2c7271f1723b5c313f0aa8a7bf2242fb301ceba1ab5a4dca655ca7b9461d0aaebe5eaccf84b2f7a4c4199cbb0c18eab2bdaff273fcb730ec27219e'
-        '3eba6b3d45c52cbc708e4abdcc581aad3a6a75ed335a29e19092cb225b88f1b86457ed03853d841615f2fdb2678b49e9b7d2b3a65dff387cd81959e7e5cc4d88'
-        '9677fac5dad81eaaca7514906ba58e81dacf2ccd68345eca66bb1c62a679341a75cefd92c4733256719d24264a19be573d3a5a3eb6ee99bc0fae062e2471dd4c'
+        'b1e8b224ae76b780734080441efdb4cb9a969a8ab96edb870b7f6ca18cec9272262a66fdeb1e675c9bb68f13368d28d450756d2ee8e60f3445e42e13a6c35422'
         '1c3af4cc5199cf7b9f3aad9ceab98b3e8a3dc0d38f50896ed2f32ac648f1e904a1cdda5da559964885989edbfab4c4bf65448e9a0f71d946c77ec0ab5a6aff4c'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
         '8502bac792b4b80522bd143a6d6a274017844f1c5a0261e8b391ce64ebf46e13e0cad912518e3feb0c2e8d481c413ea74759d2813332fece48d395bbe17bef0f'
@@ -84,9 +82,6 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715
   patch -Np1 -i ../rust_1.48.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1684261
-  patch -Np1 -i ../rust_1.50.patch
-
   if [ "${_modclang}" != "1" ]; then
     # Apply gcc pgo patches
     patch -p0 $srcdir/${_pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/arc4_enable-pgo-for-gcc.patch
diff --git a/rust_1.48.patch.gz b/rust_1.48.patch.gz
index a384764..eb1577e 100644
--- a/rust_1.48.patch.gz
+++ b/rust_1.48.patch.gz
diff --git a/rust_1.50.patch b/rust_1.50.patch
deleted file mode 100644
index e7edd7b..0000000
--- a/rust_1.50.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1609006565 0
-# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
-# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
-Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
-
-Fixes errors like:
-
-  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
-
-I've left the most specific dependency, but for wgpu the rev is not
-right, so I've kept the branch which effectively preserves behavior.
-
-Differential Revision: https://phabricator.services.mozilla.com/D100485
-
-diff --git a/.cargo/config.in b/.cargo/config.in
---- a/.cargo/config.in
-+++ b/.cargo/config.in
-@@ -1,16 +1,16 @@
- # This file contains vendoring instructions for cargo.
- # It was generated by `mach vendor rust`.
- # Please do not edit.
- 
- [source."https://github.com/shravanrn/nix/"]
--branch = "r0.13.1"
- git = "https://github.com/shravanrn/nix/"
- replace-with = "vendored-sources"
-+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- 
- [source."https://github.com/mozilla/rkv"]
- git = "https://github.com/mozilla/rkv"
- replace-with = "vendored-sources"
- rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
- 
- [source."https://github.com/mozilla/neqo"]
- git = "https://github.com/mozilla/neqo"
-diff --git a/Cargo.lock b/Cargo.lock
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3195,17 +3195,17 @@ source = "registry+https://github.com/ru
- checksum = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
- dependencies = [
-  "unreachable",
- ]
- 
- [[package]]
- name = "nix"
- version = "0.13.1"
--source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- dependencies = [
-  "bitflags",
-  "cc",
-  "cfg-if",
-  "libc",
-  "void",
- ]
- 
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -68,8 +68,8 @@
- libudev-sys = { path = "dom/webauthn/libudev-sys" }
- packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
- rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }