diff options
Diffstat (limited to 'x11-terms/wezterm/files')
5 files changed, 19 insertions, 87 deletions
diff --git a/x11-terms/wezterm/files/wezterm-20230320-124340-image.patch b/x11-terms/wezterm/files/wezterm-20230320-124340-image.patch deleted file mode 100644 index 12090c9512bd..000000000000 --- a/x11-terms/wezterm/files/wezterm-20230320-124340-image.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- wezterm-20230320-124340-559cb7b0-orig/termwiz/Cargo.toml 2023-03-21 06:43:40.000000000 +1100 -+++ wezterm-20230320-124340-559cb7b0/termwiz/Cargo.toml 2023-03-25 16:56:20.193628496 +1100 -@@ -22,7 +22,7 @@ - fnv = {version="1.0", optional=true} - hex = "0.4" - # we want image 0.24.6 or later. see https://github.com/wez/wezterm/issues/3250 --image = {version="0.24", git="https://github.com/image-rs/image.git", rev="fe069785ae245a2c510fd724ef96da283b05a236", optional=true} -+image = {version="0.24.6", optional=true} - lazy_static = "1.4" - libc = "0.2" - log = "0.4" ---- wezterm-20230320-124340-559cb7b0-orig/lua-api-crates/color-funcs/Cargo.toml 2023-03-21 06:43:40.000000000 +1100 -+++ wezterm-20230320-124340-559cb7b0/lua-api-crates/color-funcs/Cargo.toml 2023-03-25 18:10:12.806185917 +1100 -@@ -11,7 +11,7 @@ - csscolorparser = {version="0.6", features=["lab"]} - deltae = "0.3" - # we want image 0.24.6 or later. see https://github.com/wez/wezterm/issues/3250 --image = {version="0.24", git="https://github.com/image-rs/image.git", rev="fe069785ae245a2c510fd724ef96da283b05a236"} -+image = {version="0.24.6"} - lazy_static = "1.4" - log = "0.4" - lru = "0.7" ---- wezterm-20230320-124340-559cb7b0-orig/term/Cargo.toml 2023-03-21 06:43:40.000000000 +1100 -+++ wezterm-20230320-124340-559cb7b0/term/Cargo.toml 2023-03-25 18:11:54.504212757 +1100 -@@ -22,7 +22,7 @@ - finl_unicode = "1.2" - hex = "0.4" - # we want image 0.24.6 or later. see https://github.com/wez/wezterm/issues/3250 --image = {version="0.24", git="https://github.com/image-rs/image.git", rev="fe069785ae245a2c510fd724ef96da283b05a236"} -+image = {version="0.24.6"} - lazy_static = "1.4" - log = "0.4" - lru = "0.7" ---- wezterm-20230320-124340-559cb7b0-orig/wezterm-gui/Cargo.toml 2023-03-21 06:43:40.000000000 +1100 -+++ wezterm-20230320-124340-559cb7b0/wezterm-gui/Cargo.toml 2023-03-25 18:10:05.233481770 +1100 -@@ -56,7 +56,7 @@ - hdrhistogram = "7.1" - http_req = "0.9" - # we want image 0.24.6 or later. see https://github.com/wez/wezterm/issues/3250 --image = {version="0.24", git="https://github.com/image-rs/image.git", rev="fe069785ae245a2c510fd724ef96da283b05a236"} -+image = {version="0.24.6"} - lazy_static = "1.4" - libc = "0.2" - lfucache = { path = "../lfucache" } diff --git a/x11-terms/wezterm/files/wezterm-20230712-072601-xcb-imdkit.patch b/x11-terms/wezterm/files/wezterm-20230712-072601-xcb-imdkit.patch deleted file mode 100644 index 0fa98b4ca443..000000000000 --- a/x11-terms/wezterm/files/wezterm-20230712-072601-xcb-imdkit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wezterm-20230712-072601-f4abf8fd-orig/window/Cargo.toml 2023-08-13 12:55:23.164018642 +1000 -+++ wezterm-20230712-072601-f4abf8fd/window/Cargo.toml 2023-08-20 10:37:20.004164820 +1000 -@@ -78,7 +78,7 @@ - wayland-protocols = {version="0.29", optional=true} - wayland-client = {version="0.29", optional=true} - wayland-egl = {version="0.29", optional=true} --xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", branch="hangfix"} -+xcb-imdkit = {version="0.1.2"} - zbus = "3.13" - zvariant = "3.14" - futures-util = "0.3" diff --git a/x11-terms/wezterm/files/wezterm-20230712-072601-xcb.patch b/x11-terms/wezterm/files/wezterm-20230712-072601-xcb.patch deleted file mode 100644 index 76c206f421fa..000000000000 --- a/x11-terms/wezterm/files/wezterm-20230712-072601-xcb.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- wezterm-20230712-072601-f4abf8fd-orig/Cargo.toml 2023-08-13 12:54:56.151071659 +1000 -+++ wezterm-20230712-072601-f4abf8fd/Cargo.toml 2023-08-20 11:21:13.448921558 +1000 -@@ -26,6 +26,3 @@ - # Disabled because it breaks builds on Windows - #split-debuginfo = "unpacked" - --[patch.crates-io] --xcb = {git="https://github.com/rust-x-bindings/rust-xcb", rev="dbdaa01c178c6fbe68bd51b7ad44c08172181083"} # waiting on a release with https://github.com/rust-x-bindings/rust-xcb/pull/230 -- ---- wezterm-20230712-072601-f4abf8fd-orig/window/Cargo.toml 2023-08-20 10:37:20.004164820 +1000 -+++ wezterm-20230712-072601-f4abf8fd/window/Cargo.toml 2023-08-20 11:37:25.547418580 +1000 -@@ -70,7 +70,7 @@ - dirs-next = "2.0" - filedescriptor = { version="0.8", path = "../filedescriptor" } - x11 = {version ="2.19", features = ["xlib_xcb", "xlib"]} --xcb = {version="1.2", features=["render", "randr", "dri2", "xkb", "xlib_xcb", "present"]} -+xcb = {version="1.2.2", features=["render", "randr", "dri2", "xkb", "xlib_xcb", "present"]} - xkbcommon = { version = "0.5.0", features = ["x11", "wayland"] } - mio = {version="0.8", features=["os-ext"]} - libc = "0.2" diff --git a/x11-terms/wezterm/files/wezterm-20240203-110809-cairo.patch b/x11-terms/wezterm/files/wezterm-20240203-110809-cairo.patch new file mode 100644 index 000000000000..a92cd33e7369 --- /dev/null +++ b/x11-terms/wezterm/files/wezterm-20240203-110809-cairo.patch @@ -0,0 +1,19 @@ +--- wezterm-20240203-110809-5046fc22-orig/Cargo.toml 2024-02-04 05:08:09.000000000 +1100 ++++ wezterm-20240203-110809-5046fc22/Cargo.toml 2024-05-12 19:13:53.372080150 +1000 +@@ -4,7 +4,6 @@ + "bidi/generate", + "strip-ansi-escapes", + "sync-color-schemes", +- "deps/cairo", + "wezterm", + "wezterm-blob-leases", + "wezterm-dynamic", +@@ -26,8 +25,3 @@ + # https://jakedeichert.com/blog/reducing-rust-incremental-compilation-times-on-macos-by-70-percent/ + # Disabled because it breaks builds on Windows + #split-debuginfo = "unpacked" +- +-[patch.crates-io] +-# We use our own vendored cairo, which has minimal deps and should just +-# build via cargo. +-cairo-sys-rs = {path="deps/cairo", version="0.18.0"} diff --git a/x11-terms/wezterm/files/xcb-imdkit-0.1.2-p3-xcb-1.2.2.patch b/x11-terms/wezterm/files/xcb-imdkit-0.1.2-p3-xcb-1.2.2.patch deleted file mode 100644 index 36be6c74f3cf..000000000000 --- a/x11-terms/wezterm/files/xcb-imdkit-0.1.2-p3-xcb-1.2.2.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xcb-imdkit-0.1.2-orig/Cargo.toml 1970-01-01 10:00:01.000000000 +1000 -+++ xcb-imdkit-0.1.2/Cargo.toml 2023-08-20 13:53:28.213048611 +1000 -@@ -36,7 +36,8 @@ - version = "1.4.0" - - [dependencies.xcb] --version = "0.9.0" -+version = "1.2.2" -+features = ["xkb"] - [build-dependencies.cc] - version = "1.0" - |