Revert "Update emscripten (emscripten-forge#1241)" (emscripten-forge#…

…1248)

This reverts commit 58d834b.

recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch

@@ -1,7 +1,7 @@
-From 137dae4dbdf9a192551582cdae827b085510956f Mon Sep 17 00:00:00 2001
+From 0170462a78e86de9ee95017bfa7e4a3dd620a375 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 2 Jun 2023 11:59:32 -0700
-Subject: [PATCH 1/6] Add back fs.findObject and fs.readFile in loadLibData
+Subject: [PATCH] Add back fs.findObject and fs.readFile in loadLibData
 
 See upstream PR:
 https://github.com/emscripten-core/emscripten/pull/19513
@@ -10,10 +10,10 @@ https://github.com/emscripten-core/emscripten/pull/19513
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/src/library_dylink.js b/src/library_dylink.js
-index aa90bea2b..1e67818a1 100644
+index d7676cdc2..f616d230d 100644
 --- a/src/library_dylink.js
 +++ b/src/library_dylink.js
-@@ -994,14 +994,23 @@ var LibraryDylink = {
+@@ -993,14 +993,23 @@ var LibraryDylink = {
  #endif
 
        // for wasm, we can use fetch for async, but for fs mode we can only imitate it
@@ -40,5 +40,5 @@ index aa90bea2b..1e67818a1 100644
        var libFile = locateFile(libName);
        if (flags.loadAsync) {
 -- 
-2.34.1
+2.25.1
 

recipes/recipes/emscripten_emscripten-wasm32/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch → recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch

@@ -1,7 +1,7 @@
-From e0cb884277200310eba263dcce5a7b1c4567bae6 Mon Sep 17 00:00:00 2001
+From a8bdb50a29062ee70c8667e4fd94dde47917f8fa Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 19 May 2023 12:19:00 -0700
-Subject: [PATCH 2/6] Add useful error when symbol resolution fails
+Subject: [PATCH] Add useful error when symbol resolution fails
 
 Currently if symbol resolution fails, we get:
 ```js
@@ -19,19 +19,19 @@ symbol.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/library_dylink.js b/src/library_dylink.js
-index 1e67818a1..cea3ce05d 100644
+index d96e6b425..7f63b5c5e 100644
 --- a/src/library_dylink.js
 +++ b/src/library_dylink.js
-@@ -709,6 +709,9 @@ var LibraryDylink = {
+@@ -727,6 +727,9 @@ var LibraryDylink = {
              var resolved;
-             stubs[prop] = (...args) => {
-               resolved ||= resolveSymbol(prop);
+             stubs[prop] = function() {
+               if (!resolved) resolved = resolveSymbol(prop);
 +              if (!resolved) {
 +                throw new Error(`Dynamic linking error: cannot resolve symbol ${prop}`);
 +              }
-               return resolved(...args);
+               return resolved.apply(null, arguments);
              };
            }
 -- 
-2.34.1
+2.25.1
 

recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml

@@ -1,9 +1,9 @@
 context:
   name: emscripten_emscripten-wasm32
-  version: 3.1.58
+  version: 3.1.45
 
 build:
-  number: 0
+  number: 29
 
 outputs:
   - package: