129.0a1+20240618.1+h5dabfab7d5a5-1: Drop upstreamed patch

3 files changed, 2 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5635eb4bd29..66b5e777f991 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly
 	pkgdesc = Fast, Private & Safe Web Browser (Nightly version)
-	pkgver = 129.0a1+20240616.2+h1ddf59a206f4
+	pkgver = 129.0a1+20240618.1+h5dabfab7d5a5
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/channel/desktop/#nightly
 	arch = x86_64
@@ -71,20 +71,17 @@ pkgbase = firefox-nightly
 	source = firefox-nightly-symbolic.svg
 	source = firefox-nightly.desktop
 	source = org.mozilla.firefox-nightly.metainfo.xml
-	source = 0001-Bug-1902824-Make-MicroGeckoProfiler.h-compatible-wit.patch
 	source = firefox-install-dir.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = SKIP
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = 781896224710e0b6eb262cbfb27a48d2b2c2ff95e4f307792eddc379c98c559d
 	sha256sums = 41f24752cf1a1d2f757cb14aa0fab34453470386800360c7689825f925c2ba91
-	sha256sums = 171167448c5c9bd2df26941aad910648933c32421eb4943fb5e8443ee76d29f7
 	sha256sums = c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f
 	b2sums = SKIP
 	b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
 	b2sums = fd23653ae8c758ef0351a8b5ff98dfa438cd8a83e9bc56d8103161a940276ee828f4856fec56e29f3c158caf75a4968bc80e5891633cb9435f92fe73faf77456
 	b2sums = 10329d1988275cbbe20edc8fa764e7743b75797132f222ccff68b3a3ecd45de3e63689e487afd8284a14226fe1827281717eb1b559896b7d5a3e6414c050243a
-	b2sums = 313dacdc8c34540b525725a15511cd6f315ba2dec791814bc4d61d60b168dad3d722db4fabfdd4f346b458a45d9daeb2608e3561d3eddf9095a762a3056554fe
 	b2sums = f76eb72c326f347991133c004b252ed2e037e72a7a436012fb1495668d2b9194d836765b58b01ba0bd9f5c4b888ee5ee715bdb458823a2a7822f1b299f4d1948
 
 pkgname = firefox-nightly
diff --git a/0001-Bug-1902824-Make-MicroGeckoProfiler.h-compatible-wit.patch b/0001-Bug-1902824-Make-MicroGeckoProfiler.h-compatible-wit.patch
deleted file mode 100644
index 204112ca4ff8..000000000000
--- a/0001-Bug-1902824-Make-MicroGeckoProfiler.h-compatible-wit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Mon, 17 Jun 2024 01:08:12 +0200
-Subject: [PATCH] Bug 1902824 - Make MicroGeckoProfiler.h compatible with C
- again. r?gerard-majax
-
----
- tools/profiler/public/MicroGeckoProfiler.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tools/profiler/public/MicroGeckoProfiler.h b/tools/profiler/public/MicroGeckoProfiler.h
-index 5a40d124f7ab..b3be883d2e7b 100644
---- a/tools/profiler/public/MicroGeckoProfiler.h
-+++ b/tools/profiler/public/MicroGeckoProfiler.h
-@@ -52,11 +52,11 @@ extern MOZ_EXPORT void uprofiler_simple_event_marker_with_stack(
-     const char** arg_names, const unsigned char* arg_types,
-     const unsigned long long* arg_values, void* provided_stack);
- 
--extern MOZ_EXPORT bool uprofiler_backtrace_into_buffer(NativeStack* stack,
--                                                       void* aBuffer);
-+extern MOZ_EXPORT bool uprofiler_backtrace_into_buffer(
-+    struct NativeStack* stack, void* aBuffer);
- 
- extern MOZ_EXPORT void uprofiler_native_backtrace(const void* top,
--                                                  NativeStack* stack);
-+                                                  struct NativeStack* stack);
- 
- extern MOZ_EXPORT bool uprofiler_is_active();
- 
-@@ -103,8 +103,8 @@ struct UprofilerFuncPtrs {
-                                          const unsigned char* arg_types,
-                                          const unsigned long long* arg_values,
-                                          void* provided_stack);
--  bool (*backtrace_into_buffer)(NativeStack* stack, void* aBuffer);
--  void (*native_backtrace)(const void* top, NativeStack* stack);
-+  bool (*backtrace_into_buffer)(struct NativeStack* stack, void* aBuffer);
-+  void (*native_backtrace)(const void* top, struct NativeStack* stack);
-   bool (*is_active)();
- };
- 
-@@ -137,13 +137,13 @@ static void simple_event_marker_with_stack_noop(
-   /* no-op */
- }
- 
--static bool backtrace_into_buffer_noop(NativeStack* stack,
-+static bool backtrace_into_buffer_noop(struct NativeStack* stack,
-                                        void* aBuffer) { /* no-op */
-   return false;
- }
- 
- static void native_backtrace_noop(const void* top,
--                                  NativeStack* stack) { /* no-op */ }
-+                                  struct NativeStack* stack) { /* no-op */ }
- 
- static bool is_active_noop() { /* no-op */ return false; }
- 
diff --git a/PKGBUILD b/PKGBUILD
index f454051162a2..8f9783e6760f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox-nightly
-pkgver=129.0a1+20240616.2+h1ddf59a206f4
+pkgver=129.0a1+20240618.1+h5dabfab7d5a5
 pkgrel=1
 pkgdesc="Fast, Private & Safe Web Browser (Nightly version)"
 url="https://www.mozilla.org/firefox/channel/desktop/#nightly"
@@ -85,7 +85,6 @@ source=(
   $pkgname-symbolic.svg
   $pkgname.desktop
   org.mozilla.$pkgname.metainfo.xml
-  0001-Bug-1902824-Make-MicroGeckoProfiler.h-compatible-wit.patch
   firefox-install-dir.patch
 )
 validpgpkeys=(
@@ -97,13 +96,11 @@ sha256sums=('SKIP'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
             '781896224710e0b6eb262cbfb27a48d2b2c2ff95e4f307792eddc379c98c559d'
             '41f24752cf1a1d2f757cb14aa0fab34453470386800360c7689825f925c2ba91'
-            '171167448c5c9bd2df26941aad910648933c32421eb4943fb5e8443ee76d29f7'
             'c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f')
 b2sums=('SKIP'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
         'fd23653ae8c758ef0351a8b5ff98dfa438cd8a83e9bc56d8103161a940276ee828f4856fec56e29f3c158caf75a4968bc80e5891633cb9435f92fe73faf77456'
         '10329d1988275cbbe20edc8fa764e7743b75797132f222ccff68b3a3ecd45de3e63689e487afd8284a14226fe1827281717eb1b559896b7d5a3e6414c050243a'
-        '313dacdc8c34540b525725a15511cd6f315ba2dec791814bc4d61d60b168dad3d722db4fabfdd4f346b458a45d9daeb2608e3561d3eddf9095a762a3056554fe'
         'f76eb72c326f347991133c004b252ed2e037e72a7a436012fb1495668d2b9194d836765b58b01ba0bd9f5c4b888ee5ee715bdb458823a2a7822f1b299f4d1948')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -143,9 +140,6 @@ prepare() {
   mkdir mozbuild
   cd mozilla-central
 
-  # Fix build
-  patch -Np1 -i ../0001-Bug-1902824-Make-MicroGeckoProfiler.h-compatible-wit.patch
-
   # Change install dir from 'firefox' to 'firefox-nightly'
   patch -Np1 -i ../firefox-install-dir.patch