Skip to content

Commit 648cf70

Browse files
committed
Merge branch 'master' into mimalloc-update
2 parents 94cc605 + acd7ec8 commit 648cf70

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [v0.0.12] - TBD
88

9-
Uses libvips v8.16.0, compiled with Emscripten v4.0.2.
9+
Uses libvips v8.16.0, compiled with Emscripten v4.0.3.
1010

1111
### Fixed
1212

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://github.com/emscripten-core/emsdk
2-
FROM docker.io/emscripten/emsdk:4.0.2
2+
FROM docker.io/emscripten/emsdk:4.0.3
33

44
# Path settings
55
ENV \
@@ -24,7 +24,7 @@ RUN \
2424

2525
# Emscripten patches
2626
RUN \
27-
curl -Ls https://github.com/emscripten-core/emscripten/compare/4.0.2...kleisauke:wasm-vips-4.0.2.patch | patch -p1 -d $EMSDK/upstream/emscripten && \
27+
curl -Ls https://github.com/emscripten-core/emscripten/compare/4.0.3...kleisauke:wasm-vips-4.0.3.patch | patch -p1 -d $EMSDK/upstream/emscripten && \
2828
curl -Ls https://github.com/emscripten-core/emscripten/compare/a9651ff...kleisauke:mimalloc-update-3.0.1.patch | patch -p1 -d $EMSDK/upstream/emscripten && \
2929
emcc --clear-cache && embuilder build sysroot --force
3030

src/vips-library.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
var LibraryVips = {
22
$VIPS__deps: [
3-
#if ENVIRONMENT_MAY_BE_WEB
43
'$ENV',
5-
#endif
64
'$ClassHandle',
75
'$Emval',
86
'$deletionQueue',
7+
'$addOnPreRun',
8+
'$addOnPostCtor',
99
],
1010
$VIPS__postset: 'VIPS.init();',
1111
$VIPS: {
@@ -27,7 +27,7 @@ var LibraryVips = {
2727
#endif
2828
});
2929

30-
addOnInit(() => {
30+
addOnPostCtor(() => {
3131
// SourceCustom.onRead marshaller
3232
const sourceCustom = Object.getOwnPropertyDescriptor(Module['SourceCustom'].prototype, 'onRead');
3333
Object.defineProperty(Module['SourceCustom'].prototype, 'onRead', {

0 commit comments

Comments
 (0)