Browse Source

rebase after pushes

Frank-Rainer Grahl 2 years ago
parent
commit
fe7f4ccb87

+ 0 - 27
comm-central/patches/9999999-port1738277-95a1.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1635504578 0
-Bug 9999999 - Port bug 1738277 to suite.
-Bug 1738277 - Remove packaged pinning/pins.json.
-
-diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
---- a/suite/installer/package-manifest.in
-+++ b/suite/installer/package-manifest.in
-@@ -298,17 +298,16 @@
- ; [Default Preferences]
- ; All the browser/general pref files must be part of base to prevent migration bugs
- @RESPATH@/@PREF_DIR@/suite-prefs.js
- @RESPATH@/@PREF_DIR@/composer.js
- @RESPATH@/greprefs.js
- @RESPATH@/defaults/autoconfig/prefcalls.js
- @RESPATH@/defaults/permissions
- @RESPATH@/defaults/settings/blocklists
--@RESPATH@/defaults/settings/pinning
- @RESPATH@/defaults/settings/main
- ; Warning: changing the path to channel-prefs.js can cause bugs. (Bug 756325)
- @RESPATH@/defaults/pref/channel-prefs.js
- 
- ; [Layout Engine Resources]
- ; Layout debug extension.
- #ifdef ENABLE_TESTS
- #ifdef MOZ_DEBUG

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

@@ -3,7 +3,7 @@
 # Date 1634635740 14400
 #      Tue Oct 19 05:29:00 2021 -0400
 # Node ID 025b72ba95482db056873cecbe61dc9beefa7131
-# Parent  4e86c921cad29cd62e51f9415b118f7a4d9b19a9
+# Parent  9df5512ebd32723afbb3319bc4d35f50757db7bc
 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
@@ -5153,7 +5153,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
 -    window.openDialog("chrome://messenger/content/virtualFolderProperties.xul",
 +    window.openDialog("chrome://messenger/content/virtualFolderProperties.xhtml",
                        "", "chrome,modal,centerscreen",
-                       {folder: folder, searchTerms: aSearchTems,
+                       {folder: folder, searchTerms: aSearchTerms,
                         newFolderName: name});
    },
  

+ 0 - 1
comm-central/patches/series

@@ -1,6 +1,5 @@
 9999999-port1712633-suite-90a1.patch
 9999999-port1646560-suite-91a1.patch
-9999999-port1738277-95a1.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch