From 348409a29e9f589e0d66c1d6cd7ed7f6fd05c4fc Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Sun, 16 Apr 2023 14:19:12 +0200
Subject: [PATCH] svg-flatten: Bump WASI SDK to v20 and fix build

---
 svg-flatten/Makefile        | 4 ++--
 svg-flatten/src/main.cpp    | 2 ++
 svg-flatten/src/svg_doc.cpp | 1 +
 svg-flatten/src/util.cpp    | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/svg-flatten/Makefile b/svg-flatten/Makefile
index 7dab263..7e9fad5 100644
--- a/svg-flatten/Makefile
+++ b/svg-flatten/Makefile
@@ -10,8 +10,8 @@ CACHEDIR ?= cache
 PREFIX ?= /usr/local
 UPSTREAM_DIR ?= upstream
 
-WASI_SDK ?= wasi-sdk-11.0
-WASI_SDK_URL ?= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz
+WASI_SDK ?= wasi-sdk-20.0
+WASI_SDK_URL ?= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz
 WASI_SDK_PATH ?= $(CACHEDIR)/$(WASI_SDK)
 WASI_CXX ?= $(WASI_SDK_PATH)/bin/clang++ --sysroot=$(WASI_SDK_PATH)/share/wasi-sysroot
 
diff --git a/svg-flatten/src/main.cpp b/svg-flatten/src/main.cpp
index b684ce4..179e0ab 100644
--- a/svg-flatten/src/main.cpp
+++ b/svg-flatten/src/main.cpp
@@ -1,7 +1,9 @@
 
 #include <cstdlib>
 #include <cstdio>
+#ifndef WASI
 #include <filesystem>
+#endif
 #include <iostream>
 #include <iomanip>
 #include <fstream>
diff --git a/svg-flatten/src/svg_doc.cpp b/svg-flatten/src/svg_doc.cpp
index d61027b..163402e 100644
--- a/svg-flatten/src/svg_doc.cpp
+++ b/svg-flatten/src/svg_doc.cpp
@@ -19,6 +19,7 @@
 #include <iostream>
 #include <fstream>
 #include <cmath>
+#include <numbers>
 
 #include <gerbolyze.hpp>
 #include "svg_import_defs.h"
diff --git a/svg-flatten/src/util.cpp b/svg-flatten/src/util.cpp
index 1af5fb6..c242e1b 100644
--- a/svg-flatten/src/util.cpp
+++ b/svg-flatten/src/util.cpp
@@ -7,8 +7,8 @@
 #ifndef NOFORK
 #include <pwd.h>
 #include <subprocess.h>
-#endif
 #include <filesystem>
+#endif
 
 #include "util.h"