Browse Source

rebase after pushes

Frank-Rainer Grahl 1 year ago
parent
commit
c23bfb5b41

+ 0 - 27
comm-central/patches/9999999-windows-suite-bustage.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1683925137 0
-Bug 9999999 - Remove refernce to PERL environment variable.
-
-diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
---- a/suite/app/Makefile.in
-+++ b/suite/app/Makefile.in
-@@ -40,17 +40,17 @@ include $(topsrcdir)/config/rules.mk
- # channel-prefs.js is handled separate from other prefs due to bug 756325.
- libs:: $(srcdir)/profile/channel-prefs.js
- 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
- 	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
- 
- libs:: $(LICENSE_TXT_FILE)
- ifeq ($(OS_ARCH),WINNT)
- 	$(EXIT_ON_ERROR) \
--	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $^ > $(DIST)/bin/license.txt
-+	perl -pe 's/(?<!\r)\n/\r\n/g;' < $^ > $(DIST)/bin/license.txt
- 
- else
- 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/
- endif
- 
- ifneq ($(OS_ARCH),WINNT)
- 
- ifdef COMPILE_ENVIRONMENT

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

@@ -3,7 +3,7 @@
 # Date 1672741663 18000
 #      Tue Jan 03 05:27:43 2023 -0500
 # Node ID 9fb33109ad37355c3e06e5a564e79f9354666f1e
-# Parent  62778a0f989a1bdb51cd2c93f4d56419f2105f66
+# Parent  5a34e3118f58afb2a6b9dd146a67ff192cbef7b7
 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
@@ -30,7 +30,7 @@ diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
  pref("general.startup.mail",                false);
  pref("general.startup.news",                false);
  pref("general.startup.editor",              false);
-@@ -746,18 +746,18 @@ pref("privacy.clearOnShutdown.siteSettin
+@@ -743,18 +743,18 @@ pref("privacy.clearOnShutdown.siteSettin
  pref("privacy.warn_tracking_content", true);
  
  // Switching this on will also spoof our user agent and other potentially
@@ -260,7 +260,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
  
  const kProxyManual = ["network.proxy.ftp",
                        "network.proxy.http",
-@@ -225,27 +225,27 @@ function setOfflineUI(offline)
+@@ -220,27 +220,27 @@ function setOfflineUI(offline)
  function getBrowserURL() {
  
    try {
@@ -290,7 +290,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
  {
    var toolbar = document.getElementById(id);
    if (!toolbar)
-@@ -284,17 +284,17 @@ function SuiteCustomizeToolbar(aMenuItem
+@@ -279,17 +279,17 @@ function SuiteCustomizeToolbar(aMenuItem
  function goCustomizeToolbar(toolbox)
  {
    /* If the toolbox has a method "customizeInit" then call it first.
@@ -309,7 +309,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
      var sheetFrame = document.getElementById("customizeToolbarSheetIFrame");
      var panel = document.getElementById("customizeToolbarSheetPopup");
      sheetFrame.hidden = false;
-@@ -1067,17 +1067,17 @@ function BrowserOnCommand(event)
+@@ -1090,17 +1090,17 @@ function BrowserOnCommand(event)
        switch (Services.prefs.getIntPref("browser.ssl_override_behavior", 2)) {
          case 2 : // Pre-fetch & pre-populate.
            params.prefetchCert = true;
@@ -328,7 +328,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
      }
      else if (buttonID == "getMeOutOfHereButton") {
        // Redirect them to a known-functioning page, default start page
-@@ -1787,17 +1787,17 @@ function subscribeToFeedMiddleClick(href
+@@ -1810,17 +1810,17 @@ function subscribeToFeedMiddleClick(href
  }
  
  function OpenSearchEngineManager() {

+ 0 - 1
comm-central/patches/series

@@ -1,4 +1,3 @@
-9999999-windows-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch