Updated to 102.8.0

3 files changed, 7 insertions, 68 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 58db099..8987a07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
-# Maintainer (AUR): Figue <ffigue@gmail.com>
-# Maintainer (AUR): Luna Jernberg <droidbittin@gmail.com>
+# Maintainer (Artix): Dudemanguy <dudemanguy@artixlinux.org>
+# Contributor (AUR): Luna Jernberg <droidbittin@gmail.com>
+# Contributor (AUR): Figue <ffigue@gmail.com>
 # Contributor: Aqua-sama <aqua@iserlohn-fortress.net>
 # Contributor (AUR): Jonathon Fernyhough <jonathon+m2x+dev>
-# Contributor (Arch: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Contributor (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 
@@ -22,7 +23,7 @@ _modpgo=0
 
 _pkgname=firefox
 pkgname=${_pkgname}-esr
-pkgver=102.5.0
+pkgver=102.8.0
 _pkgver=${pkgver}esr
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
@@ -94,9 +95,7 @@ conflicts=(firefox)
 provides=(firefox)
 source=(
         "https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc}
-        cbindgen-0.24.0.diff
         zstandard-0.18.0.diff
-        arc4random.diff
         $pkgname.desktop
         identity-icons-brand.svg
         distribution.ini
@@ -110,11 +109,9 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-sha512sums=('f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13'
+sha512sums=('93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275'
             'SKIP'
-            '3526402ccae1f0428f2e45bae8d0b2cb909ac2698bc3508b692b827839ccb21203ce414206039776f6ce946fc53e636290b7870e9886284d5e9d1e8ad050aac9'
             'c949cf492bc93b6f3f1f827744e0f39e555c518434c8e73e27143a769b0d123fe4ba2cae07b7b7e7b594f8da43383d4fb4cd28b6b52e0d3e7a985afbadfb3d04'
-            '9cbc214c3ae7b93ef6c0573194dc7600dd0b4bb6f2653693d75b08475b7c3d65f6a181055060848143b488207c39af3fdb7382bb45de5264b2daedcb62bf97f2'
             '46b76cc688099bbd4124c0b94eea45c1c43a95e1aab9ea8ff6b9c29cdefe383f7a4885f09ceef34e5e6ee2f1f589024b575352b26512feca703c68a48dc5818f'
             'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17'
             'b075df0ddbcbc5eed5ef9d02d859da8f104fe507808050e9a990c8f3aeb01645b77972a3af07bd2427680449104af623065d97fbbc40fc42aea0b5ba931e8324'
@@ -122,11 +119,9 @@ sha512sums=('f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc
             '6c933ebfd683b955a3deb2f47b13f582ccd40f57e1164a0c821a65c4bc6040a1e0baf3a4aab1354c3e0ceeb4f3fab53612e54dfd0f56d320cf0a64bf3c270526'
             '34b90b6033d8c6196600aa820f8d5038ef506f07a6c8b90bc1b5691c47172df8778757aa9db68116bef9ced2d5592320e6d7a47cfb20cf133ba5757739d9968d'
             'e3e095eaa6427d1f8a392b16789ba51c1f13ec8a26f9128eada7fbf190ca8a47c92453e6cfd89676138869e7fdac765ff83cde01cc8b02d1de914c7eb4b1b22e')
-b2sums=('ee005b0e75151e39a9f34ab38a7a704a1f2efd4fe33bacb6a604a8a6ce8727210d0794b81e03e448d5baa2be264a7150728aac4f5b86d0a5154d549abf0c75ac'
+b2sums=('0b4cbf11028abc73a8479fb94670e98f0a293fc12381b1eccbadd64a33db068ab7434357abbe3ce0773382c7c90b8fe4d2258cc55abe8bdc2f551bba1dc2b797'
         'SKIP'
-        'b9d57be48fcbddcaf55b01648987102ba0242905eb576aa7e85ee15e4bcb9666255fc258348c82ec321e70f7ce3e466c95faa41defb386b9dae74673a7117d43'
         'b66218c1388f5cb549f4084273f56cca53311bff948c041ccb09745cf483a66973b5419950d9a9df7c9813005842300e05358f4004978f3bdabecc82b946809f'
-        '8a8d084b33f884fbff779479348457394fa89c21c544532be46b4e0c78e01d570d2b8f00ba48504a193bf70000cace4edf454792f4e73432fc7f2de5c212d835'
         '1c3af4cc5199cf7b9f3aad9ceab98b3e8a3dc0d38f50896ed2f32ac648f1e904a1cdda5da559964885989edbfab4c4bf65448e9a0f71d946c77ec0ab5a6aff4c'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
@@ -140,15 +135,9 @@ prepare() {
   mkdir -p mozbuild
   cd ${_pkgname}-${pkgver}
 
-  # Unbreak build with cbindgen 0.24.0
-  patch -Np1 -i ../cbindgen-0.24.0.diff
-
   # Unbreak build with python-zstandard 0.18.0
   patch -Np1 -i ../zstandard-0.18.0.diff
 
-  # Fix arc4random
-  patch -Np1 -i ../arc4random.diff
-
   if [ "${_modpgo}" == "1" ]; then
     # Add the custom mozconfig for clang pgo
     cp $srcdir/mozconfig.in.clang $srcdir/${_pkgname}-${pkgver}/.mozconfig
diff --git a/arc4random.diff b/arc4random.diff
deleted file mode 100644
index c877d54..0000000
--- a/arc4random.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-index 101d39d455107..3764806240f9f 100644
---- i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-+++ w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
-@@ -30,13 +30,13 @@
- /* #undef EVENT__HAVE_AFUNIX_H 1 */
- 
- /* Define to 1 if you have the `arc4random' function. */
--/* #undef EVENT__HAVE_ARC4RANDOM */
-+#define EVENT__HAVE_ARC4RANDOM 1
- 
- /* Define to 1 if you have the `arc4random_addrandom' function. */
- /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */
- 
- /* Define to 1 if you have the `arc4random_buf' function. */
--/* #undef EVENT__HAVE_ARC4RANDOM_BUF */
-+#define EVENT__HAVE_ARC4RANDOM_BUF 1
- 
- /* Define to 1 if you have the <arpa/inet.h> header file. */
- #define EVENT__HAVE_ARPA_INET_H 1
-diff --git i/toolkit/crashreporter/client/ping.cpp w/toolkit/crashreporter/client/ping.cpp
-index 57cf85de80b79..93a2f6e80ad0b 100644
---- i/toolkit/crashreporter/client/ping.cpp
-+++ w/toolkit/crashreporter/client/ping.cpp
-@@ -53,7 +53,7 @@ static string GenerateUUID() {
- 
-   CFRelease(uuid);
- #elif defined(HAVE_ARC4RANDOM_BUF)  // Android, BSD, ...
--  arc4random_buf(id, sizeof(UUID));
-+  arc4random_buf(&id, sizeof(UUID));
- #else                               // Linux
-   int fd = open("/dev/urandom", O_RDONLY);
- 
diff --git a/cbindgen-0.24.0.diff b/cbindgen-0.24.0.diff
deleted file mode 100644
index 3011e8a..0000000
--- a/cbindgen-0.24.0.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-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
- 
-