diff --git a/user/wpaperd/patches/char.patch b/user/wpaperd/patches/char.patch new file mode 100644 index 0000000000..77bfda75ec --- /dev/null +++ b/user/wpaperd/patches/char.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/src/render/shader.rs b/daemon/src/render/shader.rs +index cc8e609..c2a0428 100644 +--- a/daemon/src/render/shader.rs ++++ b/daemon/src/render/shader.rs +@@ -12,7 +12,7 @@ use super::gl; + pub unsafe fn create_shader( + gl: &gl::Gl, + shader: gl::types::GLenum, +- sources: &[*const i8], ++ sources: &[*const std::ffi::c_char], + ) -> Result { + let shader = gl.CreateShader(shader); + gl_check!(gl, "calling CreateShader"); diff --git a/user/wpaperd/patches/no-jemalloc.patch b/user/wpaperd/patches/no-jemalloc.patch new file mode 100644 index 0000000000..6cf50d2719 --- /dev/null +++ b/user/wpaperd/patches/no-jemalloc.patch @@ -0,0 +1,67 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c709113..41445b1 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1822,26 +1822,6 @@ dependencies = [ + "weezl", + ] + +-[[package]] +-name = "tikv-jemalloc-sys" +-version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +-dependencies = [ +- "cc", +- "libc", +-] +- +-[[package]] +-name = "tikv-jemallocator" +-version = "0.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +-dependencies = [ +- "libc", +- "tikv-jemalloc-sys", +-] +- + [[package]] + name = "toml" + version = "0.8.19" +@@ -2328,7 +2308,6 @@ dependencies = [ + "serde", + "serde_json", + "smithay-client-toolkit", +- "tikv-jemallocator", + "toml", + "walkdir", + "wayland-egl", +diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml +index 96f7955..e244624 100644 +--- a/daemon/Cargo.toml ++++ b/daemon/Cargo.toml +@@ -36,7 +36,6 @@ serde_json = "1.0.133" + wayland-egl = "0.32.4" + khronos-egl = { version = "6.0.0", features = [ "static" ] } + format-bytes = "0.3.0" +-tikv-jemallocator = "0.6.0" + ctrlc = { version = "3.4.5", features = ["termination"] } + + [build-dependencies] +diff --git a/daemon/src/main.rs b/daemon/src/main.rs +index e26cdc6..5b60b11 100644 +--- a/daemon/src/main.rs ++++ b/daemon/src/main.rs +@@ -54,11 +54,6 @@ use xdg::BaseDirectories; + + use crate::wpaperd::Wpaperd; + +-use tikv_jemallocator::Jemalloc; +- +-#[global_allocator] +-static GLOBAL: Jemalloc = Jemalloc; +- + fn run(opts: Opts, xdg_dirs: BaseDirectories) -> Result<()> { + // Path passed from the CLI or the wpaperd.toml file has precedence + let config_file = if let Some(config) = opts.config { diff --git a/user/wpaperd/template.py b/user/wpaperd/template.py index e8a5e826b2..fb01dc18db 100644 --- a/user/wpaperd/template.py +++ b/user/wpaperd/template.py @@ -1,6 +1,6 @@ pkgname = "wpaperd" pkgver = "1.1.0" -pkgrel = 0 +pkgrel = 1 build_style = "cargo" make_build_args = ["--features", "avif"] make_check_args = [*make_build_args]