From 9ee9f8c469e57701f25a35851fe6a515b8ae4f29 Mon Sep 17 00:00:00 2001
From: adamp01 <adamwoodce@gmail.com>
Date: Thu, 28 Jul 2022 15:09:56 +0100
Subject: [PATCH] fix: fix packaging of overlay manifests

(cherry picked from commit 2915f5cb30d9ed897ed026b69a475af1c6278b57)
---
 waterfox/browser/components/WaterfoxGlue.jsm              | 8 ++++----
 .../components/{chrome.manifest => chrome.overlay}        | 0
 waterfox/browser/components/jar.mn                        | 2 +-
 waterfox/browser/components/preferences/jar.mn            | 4 ++--
 ...ences-general.manifest => preferences-general.overlay} | 0
 ...ences-privacy.manifest => preferences-privacy.overlay} | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename waterfox/browser/components/{chrome.manifest => chrome.overlay} (100%)
 rename waterfox/browser/components/preferences/{preferences-general.manifest => preferences-general.overlay} (100%)
 rename waterfox/browser/components/preferences/{preferences-privacy.manifest => preferences-privacy.overlay} (100%)

diff --git a/waterfox/browser/components/WaterfoxGlue.jsm b/waterfox/browser/components/WaterfoxGlue.jsm
index 026b042805fd..d583919d7b12 100644
--- a/waterfox/browser/components/WaterfoxGlue.jsm
+++ b/waterfox/browser/components/WaterfoxGlue.jsm
@@ -50,17 +50,17 @@ const WaterfoxGlue = {
     let privateWindow = false;
     switch (manifest) {
       case "startup":
-        uri = "resource://waterfox/overlays/chrome.manifest";
+        uri = "resource://waterfox/overlays/chrome.overlay";
         break;
       case "private":
-        uri = "resource://waterfox/overlays/chrome.manifest";
+        uri = "resource://waterfox/overlays/chrome.overlay";
         privateWindow = true;
         break;
       case "preferences-general":
-        uri = "resource://waterfox/overlays/preferences-general.manifest";
+        uri = "resource://waterfox/overlays/preferences-general.overlay";
         break;
       case "preferences-privacy":
-        uri = "resource://waterfox/overlays/preferences-privacy.manifest";
+        uri = "resource://waterfox/overlays/preferences-privacy.overlay";
         break;
     }
     let chromeManifest = new ChromeManifest(async () => {
diff --git a/waterfox/browser/components/chrome.manifest b/waterfox/browser/components/chrome.overlay
similarity index 100%
rename from waterfox/browser/components/chrome.manifest
rename to waterfox/browser/components/chrome.overlay
diff --git a/waterfox/browser/components/jar.mn b/waterfox/browser/components/jar.mn
index dd63b1842319..3968295ec324 100644
--- a/waterfox/browser/components/jar.mn
+++ b/waterfox/browser/components/jar.mn
@@ -1,3 +1,3 @@
 browser.jar:
 %   resource waterfox %waterfox/ contentaccessible=yes
-    waterfox/overlays/chrome.manifest                      (chrome.manifest)
+    waterfox/overlays/chrome.overlay                      (chrome.overlay)
diff --git a/waterfox/browser/components/preferences/jar.mn b/waterfox/browser/components/preferences/jar.mn
index c4af68243619..1f48c9377885 100644
--- a/waterfox/browser/components/preferences/jar.mn
+++ b/waterfox/browser/components/preferences/jar.mn
@@ -6,5 +6,5 @@ browser.jar:
      content/browser/overlays/privacy.js                           (content/privacy.js)
 
 %   resource waterfox %waterfox/ contentaccessible=yes
-    waterfox/overlays/preferences-general.manifest                 (preferences-general.manifest)
-    waterfox/overlays/preferences-privacy.manifest                 (preferences-privacy.manifest)
\ No newline at end of file
+    waterfox/overlays/preferences-general.overlay                  (preferences-general.overlay)
+    waterfox/overlays/preferences-privacy.overlay                  (preferences-privacy.overlay)
\ No newline at end of file
diff --git a/waterfox/browser/components/preferences/preferences-general.manifest b/waterfox/browser/components/preferences/preferences-general.overlay
similarity index 100%
rename from waterfox/browser/components/preferences/preferences-general.manifest
rename to waterfox/browser/components/preferences/preferences-general.overlay
diff --git a/waterfox/browser/components/preferences/preferences-privacy.manifest b/waterfox/browser/components/preferences/preferences-privacy.overlay
similarity index 100%
rename from waterfox/browser/components/preferences/preferences-privacy.manifest
rename to waterfox/browser/components/preferences/preferences-privacy.overlay