diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch deleted file mode 100644 index fe2a60421..000000000 --- a/src/Cargo-lock.patch +++ /dev/null @@ -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", diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch deleted file mode 100644 index 298cb4263..000000000 --- a/src/Cargo-toml.patch +++ /dev/null @@ -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" } diff --git a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch index 23c564fa0..19b4f1ce8 100644 --- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch +++ b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch @@ -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 { @@ -95,7 +95,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..6021901b427d426078d9bf713d6995ad + const placeholders = workspacesToRemove.map(() => '?').join(','); + await db.execute(` + DELETE FROM zen_bookmarks_workspaces -+ WHERE bookmark_guid = :bookmark_guid ++ WHERE bookmark_guid = :bookmark_guid + AND workspace_uuid IN (${placeholders}) + `, [bookmarkGuid, ...workspacesToRemove]); + @@ -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();