fix 3.12 wasi build

Author: pmp-p

scripts/cpython-build-emsdk-deps.sh

@@ -39,6 +39,8 @@ cd $ROOT/src
 
 TIFF_VER="4.6.0"
 WEBP_VER="1.3.2"
+SDL_IMG="2.8.2"
+
 
 # AVIF : OFF
 # JXL : OFF
@@ -103,13 +105,12 @@ else
             * build SDL2_image from release
 "  1>&2
     else
-        #bad png+grayscale https://github.com/libsdl-org/SDL_image/releases/download/candidate-2.5.1/SDL2_image-2.5.1.tar.gz
-        wget -c -q https://github.com/libsdl-org/SDL_image/releases/download/release-2.6.3/SDL2_image-2.6.3.tar.gz
+        wget -c -q https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL_IMG}/SDL2_image-${SDL_IMG}.tar.gz
 
-        tar xfz SDL2_image-2.6.3.tar.gz
+        tar xfz SDL2_image-${SDL_IMG}.tar.gz
     fi
 
-    pushd SDL2_image-2.6.3
+    pushd SDL2_image-${SDL_IMG}
     CFLAGS=$CPOPTS EMCC_CFLAGS="$ALL" CC=emcc  $CNF \
      --disable-sdltest --disable-jpg-shared --disable-png-shared
     #--disable-tif-shared

scripts/wasisdk-fetch.sh

@@ -24,7 +24,7 @@ then
     else
         export LC_ALL=C
         pushd wasisdk
-        WASI_SDK=21
+        WASI_SDK=20
         wget -c https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK}/wasi-sdk-${WASI_SDK}.0-linux.tar.gz
         tar xfz wasi-sdk-${WASI_SDK}.0-linux.tar.gz
         mv wasi-sdk-${WASI_SDK}.0 upstream && rm wasi-sdk-${WASI_SDK}.0-linux.tar.gz

support/__EMSCRIPTEN__.embed/browsermodule.c

@@ -666,7 +666,7 @@ Function_call(Function *self, PyObject *args, PyObject *kwargs) {
         try {
           var arg_values = [];
           for (var i = 0; i < $2; ++i) {
-            var arg_handle = getValue($3+i*4, 'i32');
+            var arg_handle = getValue($3+i*4, "i32");
             arg_handles.push(arg_handle);
             arg_values.push(Emval.toValue(arg_handle));
           }
@@ -893,7 +893,7 @@ static EM_VAL py_to_emval(PyObject *val) {
           }
           var argv = _malloc(argc * 4);
           for (var i = 0; i < argc; ++i) {
-            setValue(argv+i*4, Emval.toHandle(arguments[i]), 'i32');
+            setValue(argv+i*4, Emval.toHandle(arguments[i]), "i32");
           }
           var result = __py_call($1, $2, Emval.toHandle(this), argc, argv);
           return Emval.toValue(result);
@@ -1078,6 +1078,35 @@ browser_getattr(PyObject *self, PyObject *arg) {
   return emval_to_py(result);
 }
 
+/**
+ * excute javascript code and returns the value.
+ */
+static PyObject *
+browser_eval(PyObject *self, PyObject *arg) {
+  EM_VAL key_handle = py_to_emval(arg);
+  if (key_handle == NULL) {
+    return NULL;
+  }
+
+  EM_VAL result = (EM_VAL)EM_ASM_INT({
+    try {
+      return Emval.toHandle(eval(Emval.toValue($0)));
+    }
+    catch (ex) {
+      return -Emval.toHandle(ex);
+    }
+    finally {
+      __emval_decref($0);
+    }
+  }, key_handle);
+
+  if (result == (EM_VAL)_EMVAL_UNDEFINED) {
+    PyErr_SetObject(PyExc_AttributeError, arg);
+    return NULL;
+  }
+  return emval_to_py(result);}
+
+
 /**
  * Opens an alert window to print the given message.
  */
@@ -1143,6 +1172,7 @@ browser_prompt(PyObject *self, PyObject *args) {
 static PyMethodDef browser_functions[] = {
   { "__getattr__", &browser_getattr, METH_O },
   { "alert", &browser_alert, METH_O },
+  { "eval", &browser_eval, METH_O },
   { "confirm", &browser_confirm, METH_O },
   { "prompt", &browser_prompt, METH_VARARGS },
   { NULL, NULL }

wasisdk/wasisdk_env.sh

@@ -24,7 +24,7 @@ then
     else
         export LC_ALL=C
         pushd wasisdk
-        WASI_SDK=21
+        WASI_SDK=20
         wget -c https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK}/wasi-sdk-${WASI_SDK}.0-linux.tar.gz
         tar xfz wasi-sdk-${WASI_SDK}.0-linux.tar.gz
         mv wasi-sdk-${WASI_SDK}.0 upstream && rm wasi-sdk-${WASI_SDK}.0-linux.tar.gz