105.0a1+20220811.1+hd9acc6dde178-1: Drop unneeded patch

3 files changed, 3 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57fb2eb3935b..c6945e7230d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly
 	pkgdesc = Development version of the popular Firefox web browser
-	pkgver = 105.0a1+20220804.1+h23d50b5617de
+	pkgver = 105.0a1+20220811.1+hd9acc6dde178
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/channel/#nightly
 	arch = x86_64
@@ -54,14 +54,12 @@ pkgbase = firefox-nightly
 	source = hg+https://hg.mozilla.org/mozilla-central
 	source = firefox-install-dir.patch
 	source = zstandard-0.18.0.diff
-	source = arc4random.diff
 	source = firefox-nightly.desktop
 	source = identity-icons-brand.svg
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = SKIP
 	sha256sums = c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f
 	sha256sums = a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be
-	sha256sums = 714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4
 	sha256sums = 7d90a9abacb5cc9870a31323ef31e361f620538c56609001d6d9e789b99b5e97
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 
diff --git a/PKGBUILD b/PKGBUILD
index 3489f4d6c760..4daade821daf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox-nightly
-pkgver=105.0a1+20220804.1+h23d50b5617de
+pkgver=105.0a1+20220811.1+hd9acc6dde178
 pkgrel=1
 pkgdesc="Development version of the popular Firefox web browser"
 arch=(x86_64)
@@ -25,12 +25,11 @@ options=(!emptydirs !makeflags !strip !lto !debug)
 _repo=https://hg.mozilla.org/mozilla-central
 source=("hg+$_repo"
         firefox-install-dir.patch
-        zstandard-0.18.0.diff arc4random.diff
+        zstandard-0.18.0.diff
         $pkgname.desktop identity-icons-brand.svg)
 sha256sums=('SKIP'
             'c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f'
             'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'
-            '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4'
             '7d90a9abacb5cc9870a31323ef31e361f620538c56609001d6d9e789b99b5e97'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
@@ -76,9 +75,6 @@ prepare() {
   # Unbreak build with python-zstandard 0.18.0
   patch -Np1 -i ../zstandard-0.18.0.diff
 
-  # Unbreak build with glibc 2.36
-  patch -Np1 -i ../arc4random.diff
-
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
diff --git a/arc4random.diff b/arc4random.diff
deleted file mode 100644
index c877d54c1685..000000000000
--- 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);
-