chore: sync tauri-runtime-cef from upstream feat/cef

Cargo.toml

@@ -1,21 +1,27 @@
 [package]
 name = "tauri-runtime-cef"
 version = "0.1.0"
-description = "CEF runtime for Tauri, ported from tauri feat/cef branch onto published crates."
-authors = ["Tauri Programme within The Commons Conservancy", "byeongsu-hong"]
-homepage = "https://github.com/SableClient/tauri-runtime-cef"
-repository = "https://github.com/SableClient/tauri-runtime-cef"
-categories = ["gui"]
-license = "Apache-2.0 OR MIT"
-edition = "2024"
-rust-version = "1.88"
+# lets `tauri-build` detect the CEF runtime through the `DEP_TAURI_RUNTIME_CEF_RUNTIME` env var
+links = "tauri_runtime_cef"
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+categories.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
+[[test]]
+name = "macos-application-bootstrap"
+harness = false
 
 [dependencies]
+tauri = { workspace = true, features = ["gtk4"] }
+tauri-macros = { workspace = true }
 base64 = "0.22"
+cef = { version = "=151.8.1", features = ["build-util", "linux-x11"] }
 # Not actually used directly, just locking it.
-cef = { version = "=150.2.1", features = ["build-util", "linux-x11"] }
-# Not actually used directly, just locking it.
-cef-dll-sys = { version = "=150.2.1", default-features = false }
+cef-dll-sys = { version = "=151.8.1", default-features = false }
 dirs = "6"
 dioxus-debug-cell = "0.1"
 http = "1"
@@ -26,12 +32,14 @@ raw-window-handle = "0.6"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sha2 = "0.10"
-tauri-runtime = "2.11.2"
-tauri-utils = { version = "2.9.2", features = [
+tauri-runtime = { version = "2.11.2", path = "../tauri-runtime" }
+tauri-utils = { version = "2.9.2", path = "../tauri-utils", features = [
   "html-manipulation",
 ] }
 url = "2"
-winit = "0.31.0-beta.2"
+winit = { version = "0.31.0-beta.2", git = "https://github.com/tauri-apps/winit-gtk4", branch = "master", default-features = false, features = [
+  "gtk4",
+] }
 
 [target."cfg(windows)".dependencies]
 softbuffer = { version = "0.4", default-features = false }
@@ -40,14 +48,14 @@ windows = { version = "0.61", features = [
   "Win32_Graphics_Dwm",
   "Win32_Graphics_Gdi",
   "Win32_System_Com",
+  "Win32_Globalization",
   "Win32_System_LibraryLoader",
   "Win32_UI_Input_KeyboardAndMouse",
   "Win32_UI_Shell",
   "Win32_UI_WindowsAndMessaging",
 ] }
 
 [target."cfg(target_os = \"macos\")".dependencies]
-dispatch2 = "0.3"
 objc2 = "0.6"
 objc2-application-services = { version = "0.3", default-features = false, features = [
   "HIServices",
@@ -78,6 +86,13 @@ objc2-quartz-core = { version = "0.3", default-features = false, features = [
 ] }
 objc2-foundation = { version = "0.3", default-features = false, features = [
   "NSArray",
+  # NSDate gates the performSelector:withObject:afterDelay: binding used to
+  # restore the traffic light position after an appearance change.
+  "NSDate",
+  # NSLocale gives the user's preferred languages, which become the
+  # Accept-Language list; without it every user would report en-US.
+  "NSLocale",
+  "NSNotification",
   "NSObject",
   "NSValue",
   "NSRunLoop",
@@ -89,16 +104,18 @@ objc2-foundation = { version = "0.3", default-features = false, features = [
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 dlopen2 = { version = "0.8", features = ["derive"] }
-gtk = { version = "0.18", features = ["v3_24"] }
+gtk = { package = "gtk4", version = "0.11.4" }
 libc = "0.2"
 x11-dl = "2.21"
 
 [features]
-default = ["sandbox"]
-devtools = []
-macos-private-api = ["tauri-runtime/macos-private-api"]
-sandbox = ["cef/sandbox"]
-
-[dev-dependencies]
-tauri = { version = "2", default-features = false, features = ["test"] }
-tempfile = "3"
+default = []
+# also enables devtools on `tauri` so the feature only needs to be enabled on this crate
+devtools = ["tauri-runtime/devtools", "tauri/devtools"]
+# also enables macos-private-api on `tauri` so the feature only needs to be enabled on this crate
+macos-private-api = [
+  "tauri-runtime/macos-private-api",
+  "tauri/macos-private-api",
+]
+# exposes the extension traits for `tauri::webview::WebviewBuilder`
+unstable = ["tauri/unstable"]

build.rs

@@ -0,0 +1,10 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+fn main() {
+  println!("cargo:rerun-if-changed=build.rs");
+  // exposed to the build scripts of crates depending on this one as `DEP_TAURI_RUNTIME_CEF_RUNTIME`,
+  // which is how `tauri-build` detects that the application uses the CEF runtime.
+  println!("cargo:runtime=cef");
+}