Browse Source

rebase after pushes

Frank-Rainer Grahl 1 year ago
parent
commit
2634615b16

+ 0 - 27
comm-central/patches/9999999-port1819093-2-112a1-suite-bustage.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1678212183 0
-Bug 9999999 - Port bug 1819093 to suite.
-Bug 1819093 - Reduce unnecessary wake-ups caused by the SearchService's OpenSearch update mechanism.
-
-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
-@@ -159,17 +159,16 @@
- @BINPATH@/IA2Marshal.dll
- #endif
- #endif
- @RESPATH@/components/extensions.manifest
- @RESPATH@/components/SuiteBrowser.manifest
- @RESPATH@/components/SuiteComponents.manifest
- @RESPATH@/components/SuiteFeeds.manifest
- @RESPATH@/components/SuiteSidebar.manifest
--@RESPATH@/components/toolkitsearch.manifest
- ; JavaScript components
- @RESPATH@/components/cryptoComponents.manifest
- @RESPATH@/components/FeedConverter.js
- @RESPATH@/components/FeedWriter.js
- @RESPATH@/components/jsconsole-clhandler.js
- @RESPATH@/components/jsconsole-clhandler.manifest
- @RESPATH@/components/nsAbout.js
- @RESPATH@/components/nsBrowserContentHandler.js

+ 0 - 26
comm-central/patches/9999999-port1823686-113a1-suite-bustage.patch

@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1679562774 0
-Bug 9999999 - Port bug 1823686 to suite.
-
-diff --git a/suite/components/shell/nsMacShellService.cpp b/suite/components/shell/nsMacShellService.cpp
---- a/suite/components/shell/nsMacShellService.cpp
-+++ b/suite/components/shell/nsMacShellService.cpp
-@@ -20,16 +20,17 @@
- #include "nsIProperties.h"
- #include "nsServiceManagerUtils.h"
- #include "nsShellService.h"
- #include "nsString.h"
- #include "nsIDocShell.h"
- #include "nsILoadContext.h"
- #include "nsIPrefService.h"
- #include "mozilla/dom/Element.h"
-+#include "mozilla/dom/ReferrerInfo.h"
- 
- #include <ApplicationServices/ApplicationServices.h>
- 
- #define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari"
- 
- using mozilla::dom::Element;
- 
- NS_IMPL_ISUPPORTS(nsMacShellService, nsIShellService, nsIWebProgressListener)

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

@@ -3,7 +3,7 @@
 # Date 1672741663 18000
 # Date 1672741663 18000
 #      Tue Jan 03 05:27:43 2023 -0500
 #      Tue Jan 03 05:27:43 2023 -0500
 # Node ID 9fb33109ad37355c3e06e5a564e79f9354666f1e
 # Node ID 9fb33109ad37355c3e06e5a564e79f9354666f1e
-# Parent  26e0842912339b8be5a7e7c1ab4120c129721bb0
+# Parent  62778a0f989a1bdb51cd2c93f4d56419f2105f66
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 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
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
@@ -250,8 +250,8 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
  
  
  /*
  /*
    Note: All Editor/Composer-related methods have been moved to editorApplicationOverlay.js,
    Note: All Editor/Composer-related methods have been moved to editorApplicationOverlay.js,
--  so app windows that require those must include editorNavigatorOverlay.xul
-+  so app windows that require those must include editorNavigatorOverlay.xhtml
+-  so app windows that require those must include editorTasksOverlay.xul
++  so app windows that require those must include editorTasksOverlay.xhtml
  */
  */
  
  
  /**
  /**

+ 0 - 2
comm-central/patches/series

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

+ 33 - 0
mozilla-central/patches/TOP-NOBUG-gleanlint.patch

@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1683404738 -7200
+# Parent  ca770a49d132884d09eacf5ff496e2c33e1a889b
+No Bug - Remove glean lint for now.
+
+Temporary fix. Not for resale and checkin.
+
+diff --git a/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py b/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py
+--- a/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py
++++ b/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py
+@@ -70,21 +70,16 @@ def parse(args):
+ 
+     return parse_with_options(input_files, options)
+ 
+ 
+ def parse_with_options(input_files, options):
+     # Derived heavily from glean_parser.translate.translate.
+     # Adapted to how mozbuild sends us a fd, and to expire on versions not dates.
+ 
+-    # Lint the yaml first, then lint the metrics.
+-    if lint.lint_yaml_files(input_files, parser_config=options):
+-        # Warnings are Errors
+-        raise ParserError("linter found problems")
+-
+     all_objs = parser.parse_objects(input_files, options)
+     if util.report_validation_errors(all_objs):
+         raise ParserError("found validation errors during parse")
+ 
+     nits = lint.lint_metrics(all_objs.value, options)
+     if nits is not None and any(nit.check_name != "EXPIRED" for nit in nits):
+         # Treat Warnings as Errors in FOG.
+         # But don't fail the whole build on expired metrics (it blocks testing).

+ 1 - 0
mozilla-central/patches/series

@@ -2,3 +2,4 @@
 9999999-with-vs2019-vs2022.patch
 9999999-with-vs2019-vs2022.patch
 9999999-NSSgetentropy.patch
 9999999-NSSgetentropy.patch
 1807834-respect-dmg-hfs-env.patch
 1807834-respect-dmg-hfs-env.patch
+TOP-NOBUG-gleanlint.patch