fix xul2xhtml.sh

comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1611747982 18000
-#      Wed Jan 27 06:46:22 2021 -0500
-# Node ID 43ed533272bc55c513b6f0c1a7c6916be730de5a
-# Parent  aafbdda5d7b2b1122682ae57e07aff5dfdb51d8c
+# Date 1611750578 18000
+#      Wed Jan 27 07:29:38 2021 -0500
+# Node ID fc7a77295a073995a0629b188e38a2eac264091d
+# Parent  17203d1100b29cda879ab2aba67a805388cf908b
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
@@ -587,22 +587,6 @@ diff --git a/suite/base/jar.mn b/suite/base/jar.mn
 +   content/communicator/viewSourceOverlay.xhtml                     (content/viewSourceOverlay.xhtml)
 +   content/communicator/viewZoomOverlay.xhtml                       (content/viewZoomOverlay.xhtml)
     content/communicator/viewZoomOverlay.js                          (content/viewZoomOverlay.js)
-diff --git a/suite/browser/SuiteBrowser.manifest b/suite/browser/SuiteBrowser.manifest
---- a/suite/browser/SuiteBrowser.manifest
-+++ b/suite/browser/SuiteBrowser.manifest
-@@ -1,11 +1,11 @@
- component {c2343730-dc2c-11d3-98b3-001083010e9b} nsBrowserContentHandler.js
- contract @mozilla.org/uriloader/content-handler;1?type=text/html {c2343730-dc2c-11d3-98b3-001083010e9b}
--contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.mozilla.xul+xml {c2343730-dc2c-11d3-98b3-001083010e9b}
-+contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.mozilla.xhtml+xml {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=image/svg+xml {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=text/rdf {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=text/xml {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=application/xhtml+xml {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=text/css {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=text/plain {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=image/gif {c2343730-dc2c-11d3-98b3-001083010e9b}
- contract @mozilla.org/uriloader/content-handler;1?type=image/jpeg {c2343730-dc2c-11d3-98b3-001083010e9b}
 diff --git a/suite/browser/browser-places.js b/suite/browser/browser-places.js
 --- a/suite/browser/browser-places.js
 +++ b/suite/browser/browser-places.js
@@ -3188,28 +3172,6 @@ diff --git a/suite/components/tests/chrome/test_idcheck.xhtml b/suite/components
  
        // run test
        for (var uri in uriList)
-diff --git a/suite/editor/base/content/ComposerCommands.js b/suite/editor/base/content/ComposerCommands.js
---- a/suite/editor/base/content/ComposerCommands.js
-+++ b/suite/editor/base/content/ComposerCommands.js
-@@ -1777,17 +1777,17 @@ const kSupportedTextMimeTypes = [
-   "text/rdf",
-   "text/xsl",
-   "text/javascript",
-   "text/ecmascript",
-   "application/javascript",
-   "application/ecmascript",
-   "application/x-javascript",
-   "text/xul",
--  "application/vnd.mozilla.xul+xml",
-+  "application/vnd.mozilla.xhtml+xml",
- ];
- 
- function IsSupportedTextMimeType(aMimeType) {
-   for (var i = 0; i < kSupportedTextMimeTypes.length; i++) {
-     if (kSupportedTextMimeTypes[i] == aMimeType) {
-       return true;
-     }
-   }
 diff --git a/suite/extensions/debugQA/content/debugQAEditorOverlay.js b/suite/extensions/debugQA/content/debugQAEditorOverlay.js
 --- a/suite/extensions/debugQA/content/debugQAEditorOverlay.js
 +++ b/suite/extensions/debugQA/content/debugQAEditorOverlay.js

scripts/xul2xhtml.sh

@@ -55,7 +55,7 @@ find suite -type f -exec grep '\.xul\b' {} \; -a -print > /tmp/filelist$$
 for i in `grep '^suite' /tmp/filelist$$`
 do
   sed -e 's@\.xul   @.xhtml @g' -e 's@\.xul\.   @.xhtml. @g' -e 's@\.xul\b@.xhtml@g' < $i > $i.$$
-  sed -e 's@there\.is\.only\.xhtml@there.is.only.xul@' < $i.$$ > $i
+  sed -e 's@there\.is\.only\.xhtml@there.is.only.xul@' -e 's@vnd\.mozilla\.xhtml+xml@vnd.mozilla.xul+xml@' < $i.$$ > $i
   rm $i.$$
 done
 rm /tmp/filelist$$