From e9913d416f4b9efb24edba31e90e5df09d099823 Mon Sep 17 00:00:00 2001
From: Peter0x44 <peter0x44@disroot.org>
Date: Mon, 11 May 2026 01:03:37 +0100
Subject: [PATCH 1/2] change CRT to ucrt

---
 Dockerfile            | 8 ++++----
 src/variant-x86.patch | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b082c58..115ce9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -257,7 +257,7 @@ RUN printf '#include <crtdefs.h>\n#if __has_include_next(<stddef.h>)\n#include_n
  && /dl/mingw/mingw-w64-headers/configure \
         --prefix=/bootstrap \
         --host=$ARCH \
-        --with-default-msvcrt=msvcrt-os \
+        --with-default-msvcrt=ucrt \
  && make -j$(nproc) \
  && make install
 
@@ -309,7 +309,7 @@ RUN /dl/mingw/mingw-w64-crt/configure \
         --prefix=/bootstrap \
         --with-sysroot=/bootstrap \
         --host=$ARCH \
-        --with-default-msvcrt=msvcrt-os \
+        --with-default-msvcrt=ucrt \
         --disable-dependency-tracking \
         --disable-lib32 \
         --enable-lib64 \
@@ -404,7 +404,7 @@ RUN /dl/mingw/mingw-w64-headers/configure \
         --prefix=$PREFIX \
         --host=$ARCH \
         --enable-idl \
-        --with-default-msvcrt=msvcrt-os \
+        --with-default-msvcrt=ucrt \
  && make -j$(nproc) \
  && make install
 
@@ -413,7 +413,7 @@ RUN /dl/mingw/mingw-w64-crt/configure \
         --prefix=$PREFIX \
         --with-sysroot=$PREFIX \
         --host=$ARCH \
-        --with-default-msvcrt=msvcrt-os \
+        --with-default-msvcrt=ucrt \
         --disable-dependency-tracking \
         --disable-lib32 \
         --enable-lib64 \
diff --git a/src/variant-x86.patch b/src/variant-x86.patch
index fa3cbd8..cb6e700 100644
--- a/src/variant-x86.patch
+++ b/src/variant-x86.patch
@@ -6,7 +6,7 @@
 +ARG ARCH=i686-w64-mingw32
  ENV ARCH=$ARCH
 @@ -260,2 +260,3 @@
-         --with-default-msvcrt=msvcrt-os \
+         --with-default-msvcrt=ucrt \
 +        --with-default-win32-winnt=0x0501 \
   && make -j$(nproc) \
 @@ -272,2 +273,3 @@
@@ -21,7 +21,7 @@
 +        --disable-lib64 \
          CFLAGS="-O2" \
 @@ -399,2 +401,3 @@
-         --with-default-msvcrt=msvcrt-os \
+         --with-default-msvcrt=ucrt \
 +        --with-default-win32-winnt=0x0501 \
   && make -j$(nproc) \
 @@ -409,4 +412,4 @@

From c7ce7d175beec77bf8a77468e978f0dfd8ca738e Mon Sep 17 00:00:00 2001
From: Peter0x44 <peter0x44@disroot.org>
Date: Mon, 11 May 2026 01:05:18 +0100
Subject: [PATCH 2/2] Remove default win32 winnt hunks from x86 variant

UCRT doesn't work on windows XP anyway, unless you static link it. Only
MSVC is capable of this.
---
 src/variant-x86.patch | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/variant-x86.patch b/src/variant-x86.patch
index cb6e700..4e1e877 100644
--- a/src/variant-x86.patch
+++ b/src/variant-x86.patch
@@ -5,9 +5,6 @@
 -ARG ARCH=x86_64-w64-mingw32
 +ARG ARCH=i686-w64-mingw32
  ENV ARCH=$ARCH
-@@ -260,2 +260,3 @@
-         --with-default-msvcrt=ucrt \
-+        --with-default-win32-winnt=0x0501 \
   && make -j$(nproc) \
 @@ -272,2 +273,3 @@
          --with-sysroot=/bootstrap \
@@ -20,10 +17,6 @@
 +        --enable-lib32 \
 +        --disable-lib64 \
          CFLAGS="-O2" \
-@@ -399,2 +401,3 @@
-         --with-default-msvcrt=ucrt \
-+        --with-default-win32-winnt=0x0501 \
-  && make -j$(nproc) \
 @@ -409,4 +412,4 @@
          --disable-dependency-tracking \
 -        --disable-lib32 \