Skip to content

Commit 9ea3ead

Browse files
authored
Bump dep: rsvg (#265)
1 parent 0fa07ac commit 9ea3ead

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

build/lin.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ VERSION_PIXMAN=0.44.2
124124
VERSION_CAIRO=1.18.2
125125
VERSION_FRIBIDI=1.0.16
126126
VERSION_PANGO=1.56.1
127-
VERSION_RSVG=2.59.2
127+
VERSION_RSVG=2.59.90
128128
VERSION_AOM=3.12.0
129129
VERSION_HEIF=1.19.5
130130
VERSION_CGIF=0.5.0
@@ -173,7 +173,7 @@ version_latest "pixman" "$VERSION_PIXMAN" "3648"
173173
version_latest "cairo" "$VERSION_CAIRO" "247"
174174
version_latest "fribidi" "$VERSION_FRIBIDI" "857"
175175
version_latest "pango" "$VERSION_PANGO" "11783" "unstable"
176-
version_latest "rsvg" "$VERSION_RSVG" "5420"
176+
version_latest "rsvg" "$VERSION_RSVG" "5420" "unstable"
177177
version_latest "aom" "$VERSION_AOM" "17628"
178178
version_latest "heif" "$VERSION_HEIF" "64439"
179179
version_latest "cgif" "$VERSION_CGIF" "dloebl/cgif"
@@ -417,9 +417,10 @@ sed -i'.bak' "/image = /s/, \"gif\", \"webp\"//" rsvg/Cargo.toml
417417
sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml
418418
# Skip build of rsvg-convert
419419
sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build
420-
# Update and regenerate the lockfile for zune-jpeg
421-
# https://github.com/etemesi254/zune-image/pull/242
422-
cargo update zune-jpeg
420+
# https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1066#note_2356762
421+
sed -i'.bak' "/^if host_system in \['windows'/s/, 'linux'//" meson.build
422+
# Regenerate the lockfile after making the above changes
423+
cargo update --workspace
423424
# Remove the --static flag from the PKG_CONFIG env since Rust does not
424425
# parse that correctly.
425426
PKG_CONFIG=${PKG_CONFIG/ --static/} meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \

0 commit comments

Comments
 (0)