diff --git a/Makefile.envs b/Makefile.envs index 6bdd3f779..3de58b0f3 100644 --- a/Makefile.envs +++ b/Makefile.envs @@ -1,5 +1,5 @@ export PYVERSION ?= 3.10.2 -export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.25 +export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.26 export PLATFORM_TRIPLET=wasm32-emscripten export SYSCONFIG_NAME=_sysconfigdata__emscripten_$(PLATFORM_TRIPLET) diff --git a/docs/project/changelog.md b/docs/project/changelog.md index 30ca898a8..f79065a3c 100644 --- a/docs/project/changelog.md +++ b/docs/project/changelog.md @@ -28,8 +28,9 @@ substitutions: module-type service workers. {pr}`3070` -- {{ Enhancement }} Emscripten was updated to Version 3.1.25 - {pr}`2958`, {pr}`2950`, {pr}`3027`, {pr}`3107`, {pr}`3148`, {pr}`3236`, {pr}`3239` +- {{ Enhancement }} Emscripten was updated to Version 3.1.26 + {pr}`2958`, {pr}`2950`, {pr}`3027`, {pr}`3107`, {pr}`3148`, {pr}`3236`, + {pr}`3239`, {pr}`3280` - {{ Enhancement }} Added a new API {any}`pyodide.mountNativeFS` which mounts [FileSystemDirectoryHandle](https://developer.mozilla.org/en-US/docs/Web/API/FileSystemDirectoryHandle) diff --git a/emsdk/patches/0001-Revert-Switch-to-upstream-freetype-repo-18095.patch b/emsdk/patches/0001-Revert-Switch-to-upstream-freetype-repo-18095.patch deleted file mode 100644 index 5f7faccff..000000000 --- a/emsdk/patches/0001-Revert-Switch-to-upstream-freetype-repo-18095.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 11eb87229addb5e504c287f7d9749b630014f272 Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Sat, 12 Nov 2022 22:51:39 -0800 -Subject: [PATCH] Revert "Switch to upstream freetype repo (#18095)" - -This reverts commit ba3c10bd4d4f39c59a21a8a36f3751ae11cf4107. ---- - tools/ports/freetype.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/ports/freetype.py b/tools/ports/freetype.py -index 0d7566060..2f9d26602 100644 ---- a/tools/ports/freetype.py -+++ b/tools/ports/freetype.py -@@ -5,8 +5,8 @@ - - import os - --TAG = 'VER-2-6' --HASH = '24c1706045209a3fac64f423116318f3f97892b984e89f05600c71ac356d48d78d642d18b739f26d51d7b7723821becb991a90175accfe7a91ca16a3c759e4f8' -+TAG = 'version_1' -+HASH = '0d0b1280ba0501ad0a23cf1daa1f86821c722218b59432734d3087a89acd22aabd5c3e5e1269700dcd41e87073046e906060f167c032eb91a3ac8c5808a02783' - - - def needed(settings): -@@ -14,10 +14,10 @@ def needed(settings): - - - def get(ports, settings, shared): -- ports.fetch_project('freetype', f'https://github.com/freetype/freetype/archive/{TAG}.zip', sha512hash=HASH) -+ ports.fetch_project('freetype', 'https://github.com/emscripten-ports/FreeType/archive/' + TAG + '.zip', sha512hash=HASH) - - def create(final): -- source_path = os.path.join(ports.get_dir(), 'freetype', 'freetype-' + TAG) -+ source_path = os.path.join(ports.get_dir(), 'freetype', 'FreeType-' + TAG) - ports.write_file(os.path.join(source_path, 'include/ftconfig.h'), ftconf_h) - ports.install_header_dir(os.path.join(source_path, 'include'), - target=os.path.join('freetype2')) --- -2.25.1 -