From ebba41c7352f4be04a0a9a39b48c14b09992f873 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Sat, 24 Aug 2024 14:39:19 +0200
Subject: [PATCH] chore: Remove MOZ_CRASHREPORTER option from mozconfig

---
 configs/common/mozconfig                      |  1 -
 .../installer/package-manifest-in.patch       | 24 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 6851bdaa9..ce942bd32 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -92,7 +92,6 @@ ac_add_options --enable-eme=widevine
 ac_add_options --allow-addon-sideload
 ac_add_options --with-unsigned-addon-scopes=app,system
 
-mk_add_options MOZ_CRASHREPORTER=0
 mk_add_options MOZ_DATA_REPORTING=0
 mk_add_options MOZ_SERVICES_HEALTHREPORT=0
 mk_add_options MOZ_TELEMETRY_REPORTING=0
diff --git a/src/browser/installer/package-manifest-in.patch b/src/browser/installer/package-manifest-in.patch
index 33f846d38..095eaad40 100644
--- a/src/browser/installer/package-manifest-in.patch
+++ b/src/browser/installer/package-manifest-in.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e1d90c5ea 100644
+index da760e143740a166df14d055cf3ec7b095b93d10..093dacee4356d4084432d53639873e3da006dd94 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -370,8 +370,8 @@ bin/libfreebl_64int_3.so
+@@ -377,17 +377,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
@@ -13,3 +13,23 @@ index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e
  #endif
  
  ; [Crash Reporter]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+ #ifdef XP_MACOSX
+-@BINPATH@/crashreporter.app/
++;@BINPATH@/crashreporter.app/
+ #else
+-@BINPATH@/crashreporter@BIN_SUFFIX@
++;@BINPATH@/crashreporter@BIN_SUFFIX@
+ #if defined(XP_WIN)
+ @BINPATH@/@DLL_PREFIX@mozwer@DLL_SUFFIX@
+ #endif
+@@ -397,7 +397,7 @@ bin/libfreebl_64int_3.so
+ ; [ minidump-analyzer ]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+-@BINPATH@/minidump-analyzer@BIN_SUFFIX@
++;@BINPATH@/minidump-analyzer@BIN_SUFFIX@
+ #endif
+ 
+ ; [ Ping Sender ]