From ac92f251bcf090d3108000fc8c7b520c46f6547b Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Mon, 15 Jul 2024 01:29:40 +0200
Subject: [PATCH] chore: Enable LTO and remove unused options in mozconfig

---
 configs/common/mozconfig                      |  1 -
 .../protocol/http/nsHttpHandler-cpp.patch     | 32 +++++++------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 06d448981..661868f63 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -46,7 +46,6 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-profiling
   ac_add_options --disable-tests
 
-  ac_add_options --enable-clang-plugin
   ac_add_options --enable-lto
 
   mk_add_options MOZILLA_OFFICIAL=1
diff --git a/src/netwerk/protocol/http/nsHttpHandler-cpp.patch b/src/netwerk/protocol/http/nsHttpHandler-cpp.patch
index 45a6548b8..dda79243c 100644
--- a/src/netwerk/protocol/http/nsHttpHandler-cpp.patch
+++ b/src/netwerk/protocol/http/nsHttpHandler-cpp.patch
@@ -1,27 +1,19 @@
 diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
-index 0ddb378e2b2ca20edc9cf7494d80d308d8cf51eb..79d8797fe31f678d7a712ddcd11eb90a727319a6 100644
+index 0ddb378e2b2ca20edc9cf7494d80d308d8cf51eb..f311cf92a16d652e24d479038f2ccad5f19b27d4 100644
 --- a/netwerk/protocol/http/nsHttpHandler.cpp
 +++ b/netwerk/protocol/http/nsHttpHandler.cpp
-@@ -860,19 +860,9 @@ void nsHttpHandler::BuildUserAgent() {
-   mUserAgent += '/';
+@@ -861,12 +861,12 @@ void nsHttpHandler::BuildUserAgent() {
    mUserAgent += mProductSub;
  
--  bool isFirefox = mAppName.EqualsLiteral("Firefox");
+   bool isFirefox = mAppName.EqualsLiteral("Firefox");
 -  if (isFirefox || mCompatFirefoxEnabled) {
--    // "Firefox/x.y" (compatibility) app token
--    mUserAgent += ' ';
--    mUserAgent += mCompatFirefox;
--  }
++  if (isFirefox || mCompatFirefoxEnabled || true) {
+     // "Firefox/x.y" (compatibility) app token
+     mUserAgent += ' ';
+     mUserAgent += mCompatFirefox;
+   }
 -  if (!isFirefox) {
--    // App portion
--    mUserAgent += ' ';
--    mUserAgent += mAppName;
--    mUserAgent += '/';
--    mUserAgent += mAppVersion;
--  }
-+
-+  mUserAgent += ' ';
-+  mUserAgent += mCompatFirefox;
- }
- 
- #ifdef XP_WIN
++  if (!isFirefox && false) {
+     // App portion
+     mUserAgent += ' ';
+     mUserAgent += mAppName;