From e2d84650f12b9d12805d9b3bffe0794305f2bb72 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 12 Aug 2024 10:09:32 +0200 Subject: [PATCH] rsvg: workaround zune-jpeg issue (#244) See: https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/967#note_2088834 --- build/lin.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 9710d265..49dd4281 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -85,12 +85,6 @@ export CARGO_PROFILE_RELEASE_PANIC=abort # https://reproducible-builds.org/docs/build-path/ export RUSTFLAGS+=" --remap-path-prefix=$CARGO_HOME/registry/=" -# Ensure Cargo uses correct linker when cross-compiling -if [ "$LINUX" = true ] && [ -n "$CHOST" ]; then - echo "[target.${RUST_TARGET}]" >> "$CARGO_HOME/config" - echo "linker = \"${CHOST}-gcc\"" >> "$CARGO_HOME/config" -fi - # We don't want to use any native libraries, so unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH @@ -427,6 +421,13 @@ sed -i'.bak' "/image = /s/, \"gif\", \"webp\"//" rsvg/Cargo.toml sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml # Skip build of rsvg-convert sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build +# https://github.com/etemesi254/zune-image/pull/187 +# https://github.com/bevyengine/bevy/issues/14117#issuecomment-2236518551 +# https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section +cat >> Cargo.toml <