v84.0-1

3 files changed, 32 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f59b4a6f3e5..4e9649b409d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 83.0
+	pkgver = 84.0
 	pkgrel = 1
 	url = https://librewolf-community.gitlab.io/
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = librewolf
 	makedepends = imake
 	makedepends = inetutils
 	makedepends = xorg-server-xvfb
-	makedepends = rust<1:1.48.0
+	makedepends = rust
 	makedepends = autoconf2.13
 	makedepends = clang
 	makedepends = llvm
@@ -47,19 +47,19 @@ pkgbase = librewolf
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source_x86_64 = https://archive.mozilla.org/pub/firefox/releases/83.0/source/firefox-83.0.source.tar.xz
+	source_x86_64 = https://archive.mozilla.org/pub/firefox/releases/84.0/source/firefox-84.0.source.tar.xz
 	source_x86_64 = librewolf.desktop
 	source_x86_64 = git+https://gitlab.com/librewolf-community/browser/common.git
 	source_x86_64 = git+https://gitlab.com/librewolf-community/settings.git
 	source_x86_64 = megabar.patch
 	source_x86_64 = remove_addons.patch
-	sha256sums_x86_64 = d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398
+	sha256sums_x86_64 = 23273ef0165b243f5d0908c38e7854d38070282c9b526e8d93b7503cd5f69138
 	sha256sums_x86_64 = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
 	sha256sums_x86_64 = SKIP
 	sha256sums_x86_64 = SKIP
 	sha256sums_x86_64 = 682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5
-	sha256sums_x86_64 = 41719289b309912c4b6bc86b41594f671427979481a90c32a9d3d0bf1cdd6d44
-	source_aarch64 = https://archive.mozilla.org/pub/firefox/releases/83.0/source/firefox-83.0.source.tar.xz
+	sha256sums_x86_64 = f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6
+	source_aarch64 = https://archive.mozilla.org/pub/firefox/releases/84.0/source/firefox-84.0.source.tar.xz
 	source_aarch64 = librewolf.desktop
 	source_aarch64 = git+https://gitlab.com/librewolf-community/browser/common.git
 	source_aarch64 = git+https://gitlab.com/librewolf-community/settings.git
@@ -67,12 +67,12 @@ pkgbase = librewolf
 	source_aarch64 = remove_addons.patch
 	source_aarch64 = arm.patch
 	source_aarch64 = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch
-	sha256sums_aarch64 = d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398
+	sha256sums_aarch64 = 23273ef0165b243f5d0908c38e7854d38070282c9b526e8d93b7503cd5f69138
 	sha256sums_aarch64 = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
 	sha256sums_aarch64 = SKIP
 	sha256sums_aarch64 = SKIP
 	sha256sums_aarch64 = 682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5
-	sha256sums_aarch64 = 41719289b309912c4b6bc86b41594f671427979481a90c32a9d3d0bf1cdd6d44
+	sha256sums_aarch64 = f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6
 	sha256sums_aarch64 = 6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7
 	sha256sums_aarch64 = 2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9
 
diff --git a/PKGBUILD b/PKGBUILD
index 1e76c4f39a86..9dad74849f5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-pkgver=83.0
+pkgver=84.0
 pkgrel=1
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 arch=(x86_64 aarch64)
@@ -13,7 +13,7 @@ license=(MPL GPL LGPL)
 url="https://librewolf-community.gitlab.io/"
 depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             'rust<1:1.48.0' # rust 1.48.0 causes firefox / packed_simd building to fail
+             rust
              autoconf2.13 clang llvm jack gtk2 nodejs cbindgen nasm
              python-setuptools python-psutil python-zstandard git binutils lld)
 optdepends=('networkmanager: Location detection via available WiFi networks'
@@ -39,18 +39,18 @@ source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/
                 arm.patch
                 https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch)
 
-sha256sums_x86_64=('d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398'
+sha256sums_x86_64=('23273ef0165b243f5d0908c38e7854d38070282c9b526e8d93b7503cd5f69138'
                    '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
                    'SKIP'
                    'SKIP'
                    '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5'
-                   '41719289b309912c4b6bc86b41594f671427979481a90c32a9d3d0bf1cdd6d44')
-sha256sums_aarch64=('d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398'
+                   'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6')
+sha256sums_aarch64=('23273ef0165b243f5d0908c38e7854d38070282c9b526e8d93b7503cd5f69138'
                     '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
                     'SKIP'
                     'SKIP'
                     '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5'
-                    '41719289b309912c4b6bc86b41594f671427979481a90c32a9d3d0bf1cdd6d44'
+                    'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6'
                     '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7'
                     '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 
diff --git a/remove_addons.patch b/remove_addons.patch
index a5b8781d4aec..04fe18d783fa 100644
--- a/remove_addons.patch
+++ b/remove_addons.patch
@@ -1,30 +1,25 @@
 diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
-index f71ece6..bd91686 100644
+index 0eb3c53..fb94b5c 100644
 --- a/browser/extensions/moz.build
 +++ b/browser/extensions/moz.build
-@@ -5,9 +5,6 @@
+@@ -4,4 +4,4 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
- DIRS += [
--    'doh-rollout',
-     'formautofill',
--    'screenshots',
--    'webcompat',
--    'report-site-issue'
-+    'screenshots'
- ]
+-DIRS += ["doh-rollout", "formautofill", "screenshots", "webcompat", "report-site-issue"]
++DIRS += ["formautofill", "screenshots"]
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index 05f0242..7c9737a 100644
+index 496379c..dd6f359 100644
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -61,7 +61,6 @@ libs-%:
+@@ -61,7 +61,6 @@ l10n-%:
  ifneq (,$(wildcard ../extensions/formautofill/locales))
  	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
  endif
 -	@$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
  	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
  	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
+ 	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
 @@ -82,7 +81,6 @@ endif
  	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
  	@$(MAKE) chrome AB_CD=$*
@@ -34,17 +29,17 @@ index 05f0242..7c9737a 100644
  package-win32-installer: $(SUBMAKEFILES)
  	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
 diff --git a/browser/locales/filter.py b/browser/locales/filter.py
-index 1fc9b14..d8a9ee2 100755
+index bb2e992..7d7768e 100644
 --- a/browser/locales/filter.py
 +++ b/browser/locales/filter.py
-@@ -13,7 +13,6 @@ def test(mod, path, entity=None):
-                    "browser",
-                    "browser/extensions/formautofill",
-                    "browser/extensions/fxmonitor",
--                   "browser/extensions/report-site-issue",
-                    "extensions/spellcheck",
-                    "other-licenses/branding/firefox",
-                    "browser/branding/official",
+@@ -20,7 +20,6 @@ def test(mod, path, entity=None):
+         "browser",
+         "browser/extensions/formautofill",
+         "browser/extensions/fxmonitor",
+-        "browser/extensions/report-site-issue",
+         "extensions/spellcheck",
+         "other-licenses/branding/firefox",
+         "browser/branding/official",
 diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
 index f4cb7ca..4efac13 100644
 --- a/browser/locales/l10n.ini
@@ -58,7 +53,7 @@ index f4cb7ca..4efac13 100644
  [includes]
  # non-central apps might want to use %(topsrcdir)s here, or other vars
 diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
-index 0b53c52..f8b605d 100644
+index b9b18fe..af7c583 100644
 --- a/browser/locales/l10n.toml
 +++ b/browser/locales/l10n.toml
 @@ -133,10 +133,6 @@ locales = [