mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-05 09:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused Cargo.lock and Cargo.toml patches; update PlacesUIUtils.sys.mjs for improved bookmark workspace handling

Browse Source
This commit is contained in:
mr. M
2025-03-02 12:56:59 +01:00
parent 39f4f4f0ea
commit 3377885587
3 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Cargo-lock.patch
View File

@@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 0609d96f01ded85dccf2c931d3c553be61432e6a..8ce4374dd31b4ce818c8bb548fbfb2669014b05b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3919,8 +3919,6 @@ dependencies = [
[[package]]
name = "mime_guess"
version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
dependencies = [
"mime",
"unicase",

14
src/Cargo-toml.patch
View File

@@ -1,14 +0,0 @@
diff --git a/Cargo.toml b/Cargo.toml
index 29942b65f62497b80d63675501ae063c393943a7..a9aa4641421038fbe5b0ecd9b7353611eecefffe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -198,6 +198,9 @@ rure = { path = "third_party/rust/rure" }
# Patch `plist` to work with `indexmap` 2.*
plist = { path = "third_party/rust/plist" }
+# Patch mime_guess to add missing mime types
+mime_guess = { path = "third_party/rust/mime_guess" }
+
# To-be-published changes.
unicode-bidi = { git = "https://github.com/servo/unicode-bidi", rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c" }
nss-gk-api = { git = "https://github.com/beurdouche/nss-gk-api", rev = "e48a946811ffd64abc78de3ee284957d8d1c0d63" }

6
src/browser/components/places/PlacesUIUtils-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..6021901b427d426078d9bf713d6995ad6332dbfa 100644
index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658514db39f 100644
--- a/browser/components/places/PlacesUIUtils.sys.mjs
+++ b/browser/components/places/PlacesUIUtils.sys.mjs
@@ -58,6 +58,7 @@ class BookmarkState {
@@ -162,9 +162,9 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..6021901b427d426078d9bf713d6995ad
aWhere,
aWindow,
- { aPrivate = false, userContextId = 0 } = {}
+ { aPrivate = false, userContextId } = {}
+ { aPrivate = false, userContextId = undefined } = {}
) {
+ if (!userContextId) {
+ if (typeof userContextId == "undefined") {
+ try {
+ let browserWindow = getBrowserWindow(aWindow);
+ userContextId = browserWindow.ZenWorkspaces.getDefaultContainer();