From 473aebe4e85d5a1d825b649efcd92d90218a4b5f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 18 Mar 2025 09:42:19 +1000
Subject: [PATCH] waterfox: cleanup patchset
---
.../waterfox/patches/waterfox-6.5.5.patchset | 49 -------------------
1 file changed, 49 deletions(-)
diff --git a/www-client/waterfox/patches/waterfox-6.5.5.patchset b/www-client/waterfox/patches/waterfox-6.5.5.patchset
index 2f289c986..9dd282669 100644
--- a/www-client/waterfox/patches/waterfox-6.5.5.patchset
+++ b/www-client/waterfox/patches/waterfox-6.5.5.patchset
@@ -143,42 +143,6 @@ index 89d56dad95..80a23ea132 100644
#expand
#expand
-diff --git a/browser/branding/unofficial/locales/en-US/brand.ftl b/browser/branding/unofficial/locales/en-US/brand.ftl
-index 5eaea9a7c4..cd1d079260 100644
---- a/browser/branding/unofficial/locales/en-US/brand.ftl
-+++ b/browser/branding/unofficial/locales/en-US/brand.ftl
-@@ -16,12 +16,12 @@
- ## For further details, consult:
- ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
-
---brand-shorter-name = Nightly
---brand-short-name = Nightly
---brand-shortcut-name = Nightly
---brand-full-name = Nightly
-+-brand-shorter-name = Iceweasel
-+-brand-short-name = Iceweasel
-+-brand-shortcut-name = Iceweasel
-+-brand-full-name = Iceweasel
- # This brand name can be used in messages where the product name needs to
- # remain unchanged across different versions (Nightly, Beta, etc.).
---brand-product-name = Firefox
-+-brand-product-name = Iceweasel
- -vendor-short-name = Mozilla
- trademarkInfo = { " " }
-diff --git a/browser/branding/unofficial/locales/en-US/brand.properties b/browser/branding/unofficial/locales/en-US/brand.properties
-index 346c3bdb50..2b2cd1a715 100644
---- a/browser/branding/unofficial/locales/en-US/brand.properties
-+++ b/browser/branding/unofficial/locales/en-US/brand.properties
-@@ -2,6 +2,6 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--brandShorterName=Nightly
--brandShortName=Nightly
--brandFullName=Nightly
-+brandShorterName=Iceweasel
-+brandShortName=Iceweasel
-+brandFullName=Iceweasel
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
index 8b5a810632..cc81d718c3 100644
--- a/browser/config/version_display.txt
@@ -910,19 +874,6 @@ index 25f43bb9f8..967aee7ca3 100644
"kFreeBSD": "__FreeBSD_kernel__",
"Linux": "__linux__",
"NetBSD": "__NetBSD__",
-diff --git a/python/mozbuild/mozbuild/frontend/sandbox.py b/python/mozbuild/mozbuild/frontend/sandbox.py
-index dfc23ce112..fd81d2becd 100644
---- a/python/mozbuild/mozbuild/frontend/sandbox.py
-+++ b/python/mozbuild/mozbuild/frontend/sandbox.py
-@@ -151,6 +151,8 @@ class Sandbox(dict):
- """
- assert os.path.isabs(path)
-
-+ print(path)
-+
- try:
- source = six.ensure_text(self._finder.get(path).read())
- except Exception:
diff --git a/security/certverifier/ExtendedValidation.cpp b/security/certverifier/ExtendedValidation.cpp
index 29c2f0036f..13ade1946a 100644
--- a/security/certverifier/ExtendedValidation.cpp