From 6a7c92303ce0a63056efbbe85c2cc85c7583bfe0 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Thu, 30 Jan 2025 14:47:15 +0100 Subject: [PATCH] Emscripten 3.1.67 (#5333) --- Makefile.envs | 2 +- ...1-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch | 2 +- .../0002-Add-useful-error-when-symbol-resolution-fails.patch | 2 +- emsdk/patches/0003-Changes-for-JSPI.patch | 2 +- emsdk/patches/0004-Raise-when-no-argument-is-given.patch | 2 +- emsdk/patches/0005-Make-seek-work-on-dev-null-22886.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.envs b/Makefile.envs index 01ee8cd9524..cc47b4a8839 100644 --- a/Makefile.envs +++ b/Makefile.envs @@ -1,5 +1,5 @@ export PYVERSION ?= 3.12.7 -export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.66 +export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.67 export PYODIDE_VERSION ?= 0.28.0.dev0 export PYODIDE_ABI_VERSION ?= 2025_0 diff --git a/emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch b/emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch index 1e9d6125442..bd537287f25 100644 --- a/emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch +++ b/emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch @@ -1,4 +1,4 @@ -From 24f7e1b67c1aa80d4c28e2543b72d06983999149 Mon Sep 17 00:00:00 2001 +From b2cb343f843580827b4bbed9ab2d3141ac19fa68 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Fri, 2 Jun 2023 11:59:32 -0700 Subject: [PATCH 1/6] Add back fs.findObject and fs.readFile in loadLibData diff --git a/emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch b/emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch index fe98ef3928c..148e417f75b 100644 --- a/emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch +++ b/emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch @@ -1,4 +1,4 @@ -From 74b1f9348576e1f7c0262593efff608fd4984c55 Mon Sep 17 00:00:00 2001 +From c745ab7eb3160b8701ad718b95ebbab19eadc024 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Fri, 19 May 2023 12:19:00 -0700 Subject: [PATCH 2/6] Add useful error when symbol resolution fails diff --git a/emsdk/patches/0003-Changes-for-JSPI.patch b/emsdk/patches/0003-Changes-for-JSPI.patch index 442406272e8..458773f8cee 100644 --- a/emsdk/patches/0003-Changes-for-JSPI.patch +++ b/emsdk/patches/0003-Changes-for-JSPI.patch @@ -1,4 +1,4 @@ -From dcb4a60a8c65659d5feece392480dff2dfa60c65 Mon Sep 17 00:00:00 2001 +From 894469c2833cdfe429f249f97cecf9b3fcd0c661 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Thu, 22 Jun 2023 18:53:22 -0700 Subject: [PATCH 3/6] Changes for JSPI diff --git a/emsdk/patches/0004-Raise-when-no-argument-is-given.patch b/emsdk/patches/0004-Raise-when-no-argument-is-given.patch index 98cf6eb266e..3f49c8cad17 100644 --- a/emsdk/patches/0004-Raise-when-no-argument-is-given.patch +++ b/emsdk/patches/0004-Raise-when-no-argument-is-given.patch @@ -1,4 +1,4 @@ -From a55cd2d9b0d19843414b3279b153ab1e4dfce6be Mon Sep 17 00:00:00 2001 +From 8401900a8e0d3c6f9ac6e00257784668ebf4d555 Mon Sep 17 00:00:00 2001 From: ryanking13 Date: Sat, 20 Jan 2024 19:02:32 +0900 Subject: [PATCH 4/6] Raise when no argument is given diff --git a/emsdk/patches/0005-Make-seek-work-on-dev-null-22886.patch b/emsdk/patches/0005-Make-seek-work-on-dev-null-22886.patch index 822360b2eb0..1585ce1384d 100644 --- a/emsdk/patches/0005-Make-seek-work-on-dev-null-22886.patch +++ b/emsdk/patches/0005-Make-seek-work-on-dev-null-22886.patch @@ -1,4 +1,4 @@ -From 1629c3b0af6dba5fdb68ccc73f7c20e734b7b058 Mon Sep 17 00:00:00 2001 +From b14d86eb6014ced11fd64cfe9b156c316246006c Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Mon, 18 Nov 2024 20:55:25 +0100 Subject: [PATCH 5/6] Make seek work on `/dev/null` (#22886)