Update dependencies

kleisauke · Aug 11, 2024 · e60fc54 · e60fc54
1 parent 934de04
commit e60fc54
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,7 @@ RUN \
     --no-modify-path \
     --profile minimal \
     --target wasm32-unknown-emscripten \
-    --default-toolchain nightly-2024-08-02 \
+    --default-toolchain nightly-2024-08-11 \
     --component rust-src
 
 # Cache settings

diff --git a/build.sh b/build.sh
@@ -164,7 +164,7 @@ export RUSTFLAGS+=" --remap-path-prefix=$DEPS/="
 # Dependency version numbers
 VERSION_ZLIB_NG=2.2.1       # https://github.com/zlib-ng/zlib-ng
 VERSION_FFI=3.4.6           # https://github.com/libffi/libffi
-VERSION_GLIB=2.81.0         # https://gitlab.gnome.org/GNOME/glib
+VERSION_GLIB=2.81.1         # https://gitlab.gnome.org/GNOME/glib
 VERSION_EXPAT=2.6.2         # https://github.com/libexpat/libexpat
 VERSION_EXIF=0.6.24         # https://github.com/libexif/libexif
 VERSION_LCMS2=2.16          # https://github.com/mm2/Little-CMS
@@ -177,9 +177,9 @@ VERSION_IMAGEQUANT=2.4.1    # https://github.com/lovell/libimagequant
 VERSION_CGIF=0.4.1          # https://github.com/dloebl/cgif
 VERSION_WEBP=1.4.0          # https://chromium.googlesource.com/webm/libwebp
 VERSION_TIFF=4.6.0          # https://gitlab.com/libtiff/libtiff
-VERSION_RESVG=0.42.0        # https://github.com/RazrFalcon/resvg
+VERSION_RESVG=0.43.0        # https://github.com/RazrFalcon/resvg
 VERSION_AOM=3.9.1           # https://aomedia.googlesource.com/aom
-VERSION_HEIF=1.18.1         # https://github.com/strukturag/libheif
+VERSION_HEIF=1.18.2         # https://github.com/strukturag/libheif
 VERSION_VIPS=8.15.2         # https://github.com/libvips/libvips
 
 VERSION_EMSCRIPTEN="$(emcc -dumpversion)"
@@ -431,6 +431,15 @@ node --version
   # Vendor dir doesn't work with -Zbuild-std due to https://github.com/rust-lang/wg-cargo-std-aware/issues/23
   # Just delete the config so that all deps are downloaded from the internet
   rm .cargo/config
+  # 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 <<EOL
+[patch.crates-io]
+zune-jpeg = { git = "https://github.com/ironpeak/zune-image.git", rev = "eebb01b" }
+EOL
+  # Regenerate the lockfile after making the above changes
+  cargo generate-lockfile
   # We don't want to build the shared library
   sed -i '/^crate-type =/s/"cdylib", //' crates/c-api/Cargo.toml
   cargo build --manifest-path=crates/c-api/Cargo.toml --release --target wasm32-unknown-emscripten --locked \

diff --git a/test/unit/index.html b/test/unit/index.html
@@ -5,7 +5,7 @@
   <title>wasm-vips testsuite</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <!-- FIXME(kleisauke): https://github.com/cdnjs/tools/issues/285 -->
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.7.0/mocha.css" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.7.3/mocha.css" crossorigin="anonymous">
   <style>
     html,
     body {
@@ -64,7 +64,7 @@
 </head>
 <body>
 <div id="mocha"></div>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.7.0/mocha.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.7.3/mocha.min.js" crossorigin="anonymous"></script>
 <script class="mocha-init">
   mocha.setup({
     ui: 'bdd',

diff --git a/test/unit/package.json b/test/unit/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "chai": "^5.1.1",
-    "mocha": "^10.7.0"
+    "mocha": "^10.7.3"
   },
   "engines": {
     "node": ">=16.4.0"