-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
96 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 0 additions & 25 deletions
25
srcpkgs/chromium/patches/chromium-114-maldoca-include.patch
This file was deleted.
Oops, something went wrong.
59 changes: 59 additions & 0 deletions
59
srcpkgs/chromium/patches/chromium-browser-ui-missing-deps.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
Source: Tom Briden <tom@decompile.me.uk> | ||
Upstream: No | ||
|
||
diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn | ||
index ea57f9b16f6b8..20d8681ee9af2 100644 | ||
--- a/chrome/browser/ui/views/side_panel/BUILD.gn | ||
+++ b/chrome/browser/ui/views/side_panel/BUILD.gn | ||
@@ -142,18 +142,30 @@ static_library("side_panel") { | ||
} | ||
public_deps = [ | ||
"//base", | ||
+ "//chrome/browser/cart:mojo_bindings", | ||
"//chrome/browser/companion/core/mojom:mojo_bindings", | ||
"//chrome/browser/profiles:profile", | ||
"//chrome/browser/ui/actions:actions_headers", | ||
"//chrome/browser/ui/color:color_headers", | ||
+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings", | ||
+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings", | ||
"//chrome/browser/ui/webui/side_panel/performance_controls:mojo_bindings", | ||
+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings", | ||
+ "//chrome/browser/ui:webui_name_variants", | ||
"//chrome/common", | ||
"//chrome/common/accessibility:mojo_bindings", | ||
+ "//chrome/common/companion:mojo_bindings", | ||
+ "//components/enterprise/buildflags:buildflags", | ||
+ "//components/enterprise/common/proto:connectors_proto", | ||
"//components/lens", | ||
"//components/lens:buildflags", | ||
"//components/omnibox/browser", | ||
+ "//components/page_image_service/mojom:mojo_bindings", | ||
+ "//components/paint_preview/buildflags:buildflags", | ||
"//components/prefs", | ||
"//components/search_engines", | ||
+ "//components/segmentation_platform/public/proto:proto", | ||
+ "//components/webapps/common:mojo_bindings", | ||
"//content/public/browser", | ||
"//extensions/browser", | ||
"//extensions/common", | ||
@@ -165,6 +177,8 @@ static_library("side_panel") { | ||
"//ui/gfx/geometry", | ||
"//ui/views", | ||
"//ui/views/controls/webview", | ||
+ "//ui/webui/resources/cr_components/commerce:mojo_bindings", | ||
+ "//ui/webui/resources/cr_components/help_bubble:mojo_bindings", | ||
"//url", | ||
] | ||
deps = [ | ||
diff --git a/chrome/browser/ui/webui/top_chrome/BUILD.gn b/chrome/browser/ui/webui/top_chrome/BUILD.gn | ||
index 5830f1f5e234a..6749b8fd0da56 100644 | ||
--- a/chrome/browser/ui/webui/top_chrome/BUILD.gn | ||
+++ b/chrome/browser/ui/webui/top_chrome/BUILD.gn | ||
@@ -19,6 +19,7 @@ source_set("top_chrome") { | ||
deps = [ | ||
"//base", | ||
"//chrome/browser/profiles:profile", | ||
+ "//chrome/browser/ui:webui_name_variants", | ||
"//components/site_engagement/content:content", | ||
"//content/public/browser", | ||
"//ui/webui", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,21 @@ | ||
--- a/third_party/node/node.py | ||
+++ b/third_party/node/node.py | ||
@@ -13,11 +13,12 @@ | ||
@@ -11,17 +11,7 @@ | ||
|
||
|
||
def GetBinaryPath(): | ||
darwin_name = ('node-darwin-arm64' if platform.machine() == 'arm64' else | ||
'node-darwin-x64') | ||
- if platform.machine() == 'arm64': | ||
- darwin_path = 'mac_arm64' | ||
- darwin_name = 'node-darwin-arm64' | ||
- else: | ||
- darwin_path = 'mac' | ||
- darwin_name = 'node-darwin-x64' | ||
- return os_path.join(os_path.dirname(__file__), *{ | ||
- 'Darwin': ('mac', darwin_name, 'bin', 'node'), | ||
- 'Darwin': (darwin_path, darwin_name, 'bin', 'node'), | ||
- 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), | ||
- 'Windows': ('win', 'node.exe'), | ||
- }[platform.system()]) | ||
+ #return os_path.join(os_path.dirname(__file__), *{ | ||
+ # 'Darwin': ('mac', darwin_name, 'bin', 'node'), | ||
+ # 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), | ||
+ # 'Windows': ('win', 'node.exe'), | ||
+ #}[platform.system()]) | ||
+ return "/usr/bin/node" | ||
+ return "/usr/bin/node" | ||
|
||
|
||
def RunNode(cmd_parts, stdout=None): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters