Updated to 102.0.1

5 files changed, 48 insertions, 76 deletions

diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
deleted file mode 100644
index 17e0e2c..0000000
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 25 Mar 2019 20:30:11 +0100
-Subject: [PATCH] Use remoting name for GDK application names
-
----
- toolkit/xre/nsAppRunner.cpp |  6 +-----
- widget/gtk/nsAppShell.cpp   | 12 +++++-------
- 2 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index d3bb8096ad02e..95ccce28fa786 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4262,11 +4262,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
-   // consistently.
- 
-   // Set program name to the one defined in application.ini.
--  {
--    nsAutoCString program(gAppData->name);
--    ToLowerCase(program);
--    g_set_prgname(program.get());
--  }
-+  g_set_prgname(gAppData->remotingName);
- 
-   // Initialize GTK here for splash.
- 
-diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 60de473de07ab..004c066575c17 100644
---- a/widget/gtk/nsAppShell.cpp
-+++ b/widget/gtk/nsAppShell.cpp
-@@ -24,6 +24,8 @@
- #  include "WakeLockListener.h"
- #endif
- #include "gfxPlatform.h"
-+#include "nsAppRunner.h"
-+#include "mozilla/XREAppData.h"
- #include "ScreenHelperGTK.h"
- #include "HeadlessScreenHelper.h"
- #include "mozilla/widget/ScreenManager.h"
-@@ -152,13 +154,9 @@ nsresult nsAppShell::Init() {
-       // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
-       //
-       // Only bother doing this for the parent process, since it's the one
--      // creating top-level windows. (At this point, a child process hasn't
--      // received the list of registered chrome packages, so the
--      // GetBrandShortName call would fail anyway.)
--      nsAutoString brandName;
--      mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
--      if (!brandName.IsEmpty()) {
--        gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
-+      // creating top-level windows.
-+      if (gAppData) {
-+        gdk_set_program_class(gAppData->remotingName);
-       }
-     }
-   }
diff --git a/PKGBUILD b/PKGBUILD
index 7f90138..fa89452 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,18 +22,19 @@ _modpgo=0
 
 _pkgname=firefox
 pkgname=${_pkgname}-esr
-pkgver=91.11.0
+pkgver=102.0.1
 _pkgver=${pkgver}esr
-pkgrel=2
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
 url="https://www.mozilla.org/en-US/firefox/enterprise/"
-depends=(gtk3 libxt mime-types dbus-glib ffmpeg4.4 ttf-font libpulse alsa-lib
+depends=(gtk3 libxt 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 yasm mesa imake inetutils xorg-server-xvfb
              autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
-             python-setuptools python-psutil python-zstandard lld dump_syms)
+             python-setuptools python-psutil python-zstandard lld dump_syms
+             wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'alsa-utils: ALSA support'
@@ -49,8 +50,8 @@ conflicts=(firefox)
 provides=(firefox)
 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-fix-ftbfs-newer-cbindgen.patch
+        cbindgen-0.24.0.diff
+        zstandard-0.18.0.diff
         $pkgname.desktop
         identity-icons-brand.svg
         distribution.ini
@@ -64,25 +65,25 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-sha512sums=('bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96'
+sha512sums=('ce804fa4e5dda3b8c4c7937f18994a184b0eb7d8fb9484dc924d04d3213ee3daf018141f91703daed6d060a99bfc5d915186db10a4ddcf220c2ea43e369e58df'
             'SKIP'
-            '88509577b686c995144163538efdba3cfe1a3b01564d3823b9fb7972e64823d1d0a444372636f8d0b355c485f095df8f273a6eb5560fce4c41d4f1c0a0467f75'
-            'e41c1ee61ae18d77cdb98f87d90e48fc4fe6fb2acf938bbcd41bdd75d0255bda9e25b10a7a984cfa86f5d3b956e691abd51417e3b755a79f2dba52ad43bf0b19'
+            '3526402ccae1f0428f2e45bae8d0b2cb909ac2698bc3508b692b827839ccb21203ce414206039776f6ce946fc53e636290b7870e9886284d5e9d1e8ad050aac9'
+            'c949cf492bc93b6f3f1f827744e0f39e555c518434c8e73e27143a769b0d123fe4ba2cae07b7b7e7b594f8da43383d4fb4cd28b6b52e0d3e7a985afbadfb3d04'
             '46b76cc688099bbd4124c0b94eea45c1c43a95e1aab9ea8ff6b9c29cdefe383f7a4885f09ceef34e5e6ee2f1f589024b575352b26512feca703c68a48dc5818f'
             'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17'
             'b075df0ddbcbc5eed5ef9d02d859da8f104fe507808050e9a990c8f3aeb01645b77972a3af07bd2427680449104af623065d97fbbc40fc42aea0b5ba931e8324'
-            '09b62ab955a65d765e1b0ca9eaf0d6827e6f42d944cb1a0a6f1d9d03ab587b72b144fc3bf4e8ab8185b57f0d397f6eb7da4e9ca880ef4e19a80554f45b7fc2e6'
+            '315d88a3b401c56b26592a071efdb9ba4b6a06f03a6d8a9f7c7cf41c3762be81b0474ae493f18a044d06ed34bbc51492c773a8b741b1d490ffc0bea11a34d41c'
             '6c933ebfd683b955a3deb2f47b13f582ccd40f57e1164a0c821a65c4bc6040a1e0baf3a4aab1354c3e0ceeb4f3fab53612e54dfd0f56d320cf0a64bf3c270526'
             '34b90b6033d8c6196600aa820f8d5038ef506f07a6c8b90bc1b5691c47172df8778757aa9db68116bef9ced2d5592320e6d7a47cfb20cf133ba5757739d9968d'
             'e3e095eaa6427d1f8a392b16789ba51c1f13ec8a26f9128eada7fbf190ca8a47c92453e6cfd89676138869e7fdac765ff83cde01cc8b02d1de914c7eb4b1b22e')
-b2sums=('cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38'
+b2sums=('f0caff349ffc28d10f3094957cb93d54ed4bac4a19532353dd4f09314435227af55264715d4d2cedfa01882d779ca92f9e3f600cea664e45972a544445075a23'
         'SKIP'
-        'cfd09442eb344fb80b2233da86a101082926b9942849d988d0e43cac4cb6c15690dc8eae42514e114260b712c206cacd81f773e401cf8f861ee4b805fb872643'
-        '2aea90a0ca5e6b65abe413a9691b0287f2251830ec1a3a7896997f73c0613d0828a67836a6c5c6b8181f99c0e4fb15db1b31672a8c038002e24daff7aa09b1e3'
+        'b9d57be48fcbddcaf55b01648987102ba0242905eb576aa7e85ee15e4bcb9666255fc258348c82ec321e70f7ce3e466c95faa41defb386b9dae74673a7117d43'
+        'b66218c1388f5cb549f4084273f56cca53311bff948c041ccb09745cf483a66973b5419950d9a9df7c9813005842300e05358f4004978f3bdabecc82b946809f'
         '1c3af4cc5199cf7b9f3aad9ceab98b3e8a3dc0d38f50896ed2f32ac648f1e904a1cdda5da559964885989edbfab4c4bf65448e9a0f71d946c77ec0ab5a6aff4c'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
-        '645e9438585624c5ae20cd5fd8e59c912734ea6e5bbfb33ddeb226f3b88e1b443c334684b0445b748f6cbe64506acf8710f265b87efa6bfc2f0aa5623680aed0'
+        '89b36fd35b0bf1fc672f60801ce77800ec7247b058b96d5a120e9035703b1a962967f287e3fd5336c0a901b5ca809c0c342cd6d648c1e20fa4b840ff96383cb7'
         '0f8e203bda791428acf526481959978d26e988d34b5f0490c2f9ac3307feefaf7ec7511ba4647c3f254c86288a7265476df860dee38ae5a7aaba9e264b1fe4bc'
         '1dce1277c0c8b83089551057ed61c8794aa65242d0c19573dab96081f00b1042af73fbc0a40ba49dfa31eff46f4636ffd985cf8e6bd28db614a639ca6c11c74e'
         '379adf3726664668f6167eaeab35dec40342d9288ff081d22a8363f163ab0945b17ce69e7d4276a31e99e56f690afa070c410c51a5060ed835356fd216256e7b')
@@ -92,11 +93,11 @@ prepare() {
   mkdir mozbuild
   cd ${_pkgname}-${pkgver}
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
-  patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
+  # Unbreak build with cbindgen 0.24.0
+  patch -Np1 -i ../cbindgen-0.24.0.diff
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
-  patch -Np1 -i ../0002-fix-ftbfs-newer-cbindgen.patch
+  # Unbreak build with python-zstandard 0.18.0
+  patch -Np1 -i ../zstandard-0.18.0.diff
 
   if [ "${_modpgo}" == "1" ]; then
     # Add the custom mozconfig for clang pgo
@@ -141,7 +142,7 @@ build() {
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
-  export MACH_USE_SYSTEM_PYTHON=1
+  export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 
   # firefox is prone to OOM, use 1 thread per 2GB ram
   #export MOZ_MAKE_FLAGS="${MAKEFLAGS}"
diff --git a/cbindgen-0.24.0.diff b/cbindgen-0.24.0.diff
new file mode 100644
index 0000000..3011e8a
--- /dev/null
+++ b/cbindgen-0.24.0.diff
@@ -0,0 +1,17 @@
+Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places.
+Author: Olivier Tilloy <olivier.tilloy@canonical.com>
+Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
+Forwarded: not-needed
+
+--- a/gfx/webrender_bindings/webrender_ffi.h
++++ b/gfx/webrender_bindings/webrender_ffi.h
+@@ -73,8 +73,6 @@ struct WrPipelineInfo;
+ struct WrPipelineIdAndEpoch;
+ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
+ 
+-const uint64_t ROOT_CLIP_CHAIN = ~0;
+-
+ }  // namespace wr
+ }  // namespace mozilla
+ 
+
diff --git a/mozconfig.in.clang b/mozconfig.in.clang
index a58b2bd..66b3786 100644
--- a/mozconfig.in.clang
+++ b/mozconfig.in.clang
@@ -47,6 +47,7 @@ ac_add_options --with-system-png
 ac_add_options --enable-system-sqlite
 ac_add_options --with-system-webp
 ac_add_options --with-system-zlib
+ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
 
 # Features
 ac_add_options --enable-alsa
diff --git a/zstandard-0.18.0.diff b/zstandard-0.18.0.diff
new file mode 100644
index 0000000..5dfa305
--- /dev/null
+++ b/zstandard-0.18.0.diff
@@ -0,0 +1,10 @@
+diff --git i/python/sites/mach.txt w/python/sites/mach.txt
+index 01f4f8c23da3b..85cfaf2b273ac 100644
+--- i/python/sites/mach.txt
++++ w/python/sites/mach.txt
+@@ -134,4 +134,4 @@ pypi-optional:glean-sdk==50.1.0:telemetry will not be collected
+ # We aren't (yet) able to pin packages in automation, so we have to
+ # support down to the oldest locally-installed version (5.4.2).
+ pypi-optional:psutil>=5.4.2,<=5.8.0:telemetry will be missing some data
+-pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract
++pypi-optional:zstandard>=0.11.1,<=0.18.0:zstd archives will not be possible to extract