From b490308c8897b893292951754607c2253abbc6e1 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Mon, 28 Nov 2022 12:39:19 +0100 Subject: [PATCH] fix(core): compilation error on older Linux versions, fixes #5684 (#5697) --- .changes/linux-webkitgtk-version.md | 6 ++++++ core/tauri-runtime-wry/Cargo.toml | 4 ++-- core/tauri/Cargo.toml | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .changes/linux-webkitgtk-version.md diff --git a/.changes/linux-webkitgtk-version.md b/.changes/linux-webkitgtk-version.md new file mode 100644 index 000000000..8406d303f --- /dev/null +++ b/.changes/linux-webkitgtk-version.md @@ -0,0 +1,6 @@ +--- +'tauri': 'patch' +'tauri-runtime-wry': 'patch' +--- + +Fix compatibility with older Linux distributions. diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index c6b11d530..7afedb64b 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -29,7 +29,7 @@ webview2-com = "0.19.1" [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] gtk = { version = "0.15", features = [ "v3_20" ] } -webkit2gtk = { version = "0.18.2", features = [ "v2_36" ] } +webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] } percent-encoding = "2.1" [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies] @@ -47,4 +47,4 @@ macos-private-api = [ objc-exception = [ "wry/objc-exception" ] global-shortcut = [ "tauri-runtime/global-shortcut" ] clipboard = [ "tauri-runtime/clipboard" ] -linux-headers = [ "wry/linux-headers" ] +linux-headers = [ "wry/linux-headers", "webkit2gtk/v2_36" ] diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index ec9ced769..d86303ccc 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -93,7 +93,7 @@ notify-rust = { version = "4.5", default-features = false, features = [ "d" ], o [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] gtk = { version = "0.15", features = [ "v3_20" ] } glib = "0.15" -webkit2gtk = { version = "0.18.2", features = [ "v2_36" ] } +webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -129,7 +129,7 @@ default = [ "wry", "compression", "objc-exception" ] compression = [ "tauri-macros/compression", "tauri-utils/compression" ] wry = [ "tauri-runtime-wry" ] objc-exception = [ "tauri-runtime-wry/objc-exception" ] -linux-protocol-headers = [ "tauri-runtime-wry/linux-headers" ] +linux-protocol-headers = [ "tauri-runtime-wry/linux-headers", "webkit2gtk/v2_36" ] isolation = [ "tauri-utils/isolation", "tauri-macros/isolation" ] custom-protocol = [ "tauri-macros/custom-protocol" ] updater = [