From 3692ff8b22ceb3542e2a32a16cb0757230a77f2e Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Mon, 14 Nov 2022 13:44:29 -0800
Subject: [PATCH] Emscripten 3.1.25 (#3239)

Co-authored-by: Gyeongjae Choi <def6488@gmail.com>

Adds a patch reverting an Emscripten commit that dropped a freetype patch.
---
 Makefile.envs                                 |  2 +-
 docs/project/changelog.md                     |  4 +-
 ...itch-to-upstream-freetype-repo-18095.patch | 41 +++++++++++++++++++
 packages/boost-cpp/meta.yaml                  |  8 ++--
 .../patches/0001-config-libcpp15.patch        | 30 ++++++++++++++
 5 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 emsdk/patches/0001-Revert-Switch-to-upstream-freetype-repo-18095.patch
 create mode 100644 packages/boost-cpp/patches/0001-config-libcpp15.patch

diff --git a/Makefile.envs b/Makefile.envs
index 53f827613..6bdd3f779 100644
--- a/Makefile.envs
+++ b/Makefile.envs
@@ -1,5 +1,5 @@
 export PYVERSION ?= 3.10.2
-export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.24
+export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.25
 
 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 f6d759992..642be4d21 100644
--- a/docs/project/changelog.md
+++ b/docs/project/changelog.md
@@ -28,8 +28,8 @@ substitutions:
   module-type service workers.
   {pr}`3070`
 
-- {{ Enhancement }} Emscripten was updated to Version 3.1.24
-  {pr}`2958`, {pr}`2950`, {pr}`3027`, {pr}`3107`, {pr}`3148`, {pr}`3236`
+- {{ Enhancement }} Emscripten was updated to Version 3.1.25
+  {pr}`2958`, {pr}`2950`, {pr}`3027`, {pr}`3107`, {pr}`3148`, {pr}`3236`, {pr}`3239`
 
 - {{ 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
new file mode 100644
index 000000000..5f7faccff
--- /dev/null
+++ b/emsdk/patches/0001-Revert-Switch-to-upstream-freetype-repo-18095.patch
@@ -0,0 +1,41 @@
+From 11eb87229addb5e504c287f7d9749b630014f272 Mon Sep 17 00:00:00 2001
+From: Hood Chatham <roberthoodchatham@gmail.com>
+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
+
diff --git a/packages/boost-cpp/meta.yaml b/packages/boost-cpp/meta.yaml
index 6e575a1ce..bc9169541 100644
--- a/packages/boost-cpp/meta.yaml
+++ b/packages/boost-cpp/meta.yaml
@@ -1,9 +1,11 @@
 package:
   name: boost-cpp
-  version: 1.79.0
+  version: 1.80.0
 source:
-  url: https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.gz
-  sha256: 273f1be93238a068aba4f9735a4a2b003019af067b9c183ed227780b8f36062c
+  url: https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz
+  sha256: 4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847
+  patches:
+    - patches/0001-config-libcpp15.patch
 
 build:
   type: static_library
diff --git a/packages/boost-cpp/patches/0001-config-libcpp15.patch b/packages/boost-cpp/patches/0001-config-libcpp15.patch
new file mode 100644
index 000000000..7e4abc75c
--- /dev/null
+++ b/packages/boost-cpp/patches/0001-config-libcpp15.patch
@@ -0,0 +1,30 @@
+From de5ce13c939ef8fd581470eb712fd659475a9155 Mon Sep 17 00:00:00 2001
+From: ryanking13 <def6488@gmail.com>
+Date: Fri, 11 Nov 2022 11:50:42 +0900
+Subject: [PATCH 1/1] 0005-config-libcpp15
+
+---
+ include/boost/config/stdlib/libcpp.hpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/boost/config/stdlib/libcpp.hpp b/boost/config/stdlib/libcpp.hpp
+index bc8536ea..0e9f2445 100644
+--- a/boost/config/stdlib/libcpp.hpp
++++ b/boost/config/stdlib/libcpp.hpp
+@@ -168,4 +168,13 @@
+ #  define BOOST_NO_CXX14_HDR_SHARED_MUTEX
+ #endif
+ 
++#if _LIBCPP_VERSION >= 15000
++//
++// Unary function is now deprecated in C++11 and later:
++//
++#if __cplusplus >= 201103L
++#define BOOST_NO_CXX98_FUNCTION_BASE
++#endif
++#endif
++
+ //  --- end ---
+-- 
+2.29.2.windows.2
+