mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
92 lines
3.3 KiB
Diff
92 lines
3.3 KiB
Diff
commit ce5835fb59d8d52354875d73f103527d704b93cd
|
|
Author: Jakub Panek <me@panekj.dev>
|
|
Date: Sun Jun 26 16:27:19 2022 +0200
|
|
Author: Jakub Jirutka <jakub@jirutka.cz>
|
|
Date: Mon Jul 25 01:56:21 2022 +0200
|
|
|
|
fix: link against system libraries
|
|
|
|
diff --git a/codec/Cargo.toml b/codec/Cargo.toml
|
|
index 6ba4a6d80..2c1fe9b76 100644
|
|
--- a/codec/Cargo.toml
|
|
+++ b/codec/Cargo.toml
|
|
@@ -21,7 +21,7 @@ termwiz = { path = "../termwiz" }
|
|
thiserror = "1.0"
|
|
varbincode = "0.1"
|
|
wezterm-term = { path = "../term", features=["use_serde"] }
|
|
-zstd = "0.11"
|
|
+zstd = { version = "0.11", features = ["pkg-config"] }
|
|
|
|
[dev-dependencies]
|
|
base91 = { path = "../base91" }
|
|
diff --git a/config/Cargo.toml b/config/Cargo.toml
|
|
index 310a98e52..94efda35d 100644
|
|
--- a/config/Cargo.toml
|
|
+++ b/config/Cargo.toml
|
|
@@ -27,7 +27,7 @@ lazy_static = "1.4"
|
|
libc = "0.2"
|
|
log = "0.4"
|
|
luahelper = { path = "../luahelper" }
|
|
-mlua = {version="0.8.3", features=["vendored", "lua54", "async", "send"]}
|
|
+mlua = { version="0.8.3", features = ["lua54", "async", "send"] }
|
|
# file change notification
|
|
notify = "5.0.0"
|
|
ordered-float = { version = "3.0", features = ["serde"] }
|
|
diff --git a/deps/freetype/build.rs b/deps/freetype/build.rs
|
|
index d701272cc..af0274603 100644
|
|
--- a/deps/freetype/build.rs
|
|
+++ b/deps/freetype/build.rs
|
|
@@ -233,9 +233,9 @@ fn git_submodule_update() {
|
|
}
|
|
|
|
fn main() {
|
|
- zlib();
|
|
- libpng();
|
|
- freetype();
|
|
+ println!("cargo:rustc-link-lib=z");
|
|
+ println!("cargo:rustc-link-lib=png");
|
|
+ println!("cargo:rustc-link-lib=freetype");
|
|
let out_dir = env::var("OUT_DIR").unwrap();
|
|
println!("cargo:outdir={}", out_dir);
|
|
println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
|
|
diff --git a/deps/harfbuzz/build.rs b/deps/harfbuzz/build.rs
|
|
index e5ad24cbd..af0af28e1 100644
|
|
--- a/deps/harfbuzz/build.rs
|
|
+++ b/deps/harfbuzz/build.rs
|
|
@@ -64,7 +64,7 @@ fn git_submodule_update() {
|
|
}
|
|
|
|
fn main() {
|
|
- harfbuzz();
|
|
+ println!("cargo:rustc-link-lib=harfbuzz");
|
|
let out_dir = env::var("OUT_DIR").unwrap();
|
|
println!("cargo:outdir={}", out_dir);
|
|
println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
|
|
diff --git a/wezterm-ssh/Cargo.toml b/wezterm-ssh/Cargo.toml
|
|
index 039562458..e57415418 100644
|
|
--- a/wezterm-ssh/Cargo.toml
|
|
+++ b/wezterm-ssh/Cargo.toml
|
|
@@ -31,7 +31,7 @@ portable-pty = { version="0.8", path = "../pty" }
|
|
regex = "1"
|
|
smol = "1.2"
|
|
ssh2 = {version="0.9.3", features=["openssl-on-win32"], optional = true}
|
|
-libssh-rs = {version="0.1.8", features=["vendored"], optional = true}
|
|
+libssh-rs = {version="0.1.8", optional = true}
|
|
#libssh-rs = {path="../../libssh-rs/libssh-rs", features=["vendored"], optional = true}
|
|
thiserror = "1.0"
|
|
socket2 = "0.5"
|
|
diff --git a/window/Cargo.toml b/window/Cargo.toml
|
|
index 792319852..4670f3ac1 100644
|
|
--- a/window/Cargo.toml
|
|
+++ b/window/Cargo.toml
|
|
@@ -78,7 +78,7 @@ smithay-client-toolkit = {version = "0.16", default-features=false, optional=tru
|
|
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.2", git="https://github.com/wez/xcb-imdkit-rs.git", branch="hangfix", features = ["use-system-lib"] }
|
|
zbus = "3.0"
|
|
zvariant = "3.6"
|
|
futures-util = "0.3
|
|
|