Use a more robust method to improve our ModuleNotFound errors

cpython/patches/0001-Patch-in-call-trampolines-to-handle-fpcast-troubles.patch

@@ -1,7 +1,7 @@
 From 321c69e607de23e0f9e2ce12e0e849280d8338a9 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <roberthoodchatham@gmail.com>
 Date: Mon, 28 Feb 2022 00:44:13 -0500
-Subject: [PATCH 01/13] Patch in call trampolines to handle fpcast troubles
+Subject: [PATCH 01/14] Patch in call trampolines to handle fpcast troubles
 
 The wasm call_indirect instruction takes a function signature as an immediate
 argument (an immediate argument is one which is determined statically at compile

cpython/patches/0002-add-emscripten-host.patch

@@ -1,7 +1,7 @@
 From 045da1c7c16376333685c90b48abd19307972da2 Mon Sep 17 00:00:00 2001
 From: Michael Droettboom <mdboom@gmail.com>
 Date: Mon, 28 Feb 2022 00:50:54 -0500
-Subject: [PATCH 02/13] add emscripten host
+Subject: [PATCH 02/14] add emscripten host
 
 ---
  config.sub   | 7 ++++++-

cpython/patches/0003-fix-Py_Sigset_Converter.patch

@@ -1,7 +1,7 @@
 From 18d17c29f28ff61f9707ee150721d9452fa2e654 Mon Sep 17 00:00:00 2001
 From: Roman Yurchak <rth.yurchak@gmail.com>
 Date: Mon, 28 Feb 2022 00:53:53 -0500
-Subject: [PATCH 03/13] fix Py_Sigset_Converter
+Subject: [PATCH 03/14] fix Py_Sigset_Converter
 
 ---
  Modules/posixmodule.c | 7 +++++++

cpython/patches/0004-testing.patch

@@ -1,7 +1,7 @@
 From 697ca6e1c24d817bb8cfb473a8da2fd670abf243 Mon Sep 17 00:00:00 2001
 From: Michael Droettboom <mdboom@gmail.com>
 Date: Mon, 28 Feb 2022 00:54:33 -0500
-Subject: [PATCH 04/13] testing
+Subject: [PATCH 04/14] testing
 
 ---
  Lib/platform.py                   | 2 +-

cpython/patches/0005-Drop-pwd-built-in-module.patch

@@ -1,7 +1,7 @@
 From 5fffd52bf03abbade147f77a06f58b5a6736c255 Mon Sep 17 00:00:00 2001
 From: ryanking13 <def6488@gmail.com>
 Date: Wed, 6 Oct 2021 22:16:32 +0900
-Subject: [PATCH 05/13] Drop pwd built-in module
+Subject: [PATCH 05/14] Drop pwd built-in module
 
 This patch drops pwd module support from Cpython.
 pwd module provides access to the Unix user account and password database,

cpython/patches/0006-Remove-duplicate-symbols-from-cfield.c.patch

@@ -1,7 +1,7 @@
 From 02dae7ce1505a00dcd0e5a74ca07f584f5225c5a Mon Sep 17 00:00:00 2001
 From: Hood <hood@mit.edu>
 Date: Tue, 22 Jun 2021 20:12:45 -0700
-Subject: [PATCH 06/13] Remove duplicate symbols from cfield.c
+Subject: [PATCH 06/14] Remove duplicate symbols from cfield.c
 
 These symbols are already defined by libffi.
 ---

cpython/patches/0007-xfail-core-ctypes-tests-that-don-t-work.patch

@@ -1,7 +1,7 @@
 From 9b255e03e2798b3ac235c8d191ed1de27aae1bdc Mon Sep 17 00:00:00 2001
 From: Hood <hood@mit.edu>
 Date: Thu, 24 Jun 2021 14:55:10 -0700
-Subject: [PATCH 07/13] xfail core ctypes tests that don't work
+Subject: [PATCH 07/14] xfail core ctypes tests that don't work
 
 PyCode_SetExtra doesn't work and ctypes doesn't seem to work with variadic functions including PyUnicode_FromFormat/
 ---

cpython/patches/0008-Fix-_PyImport_LoadDynamicModuleWithSpec-fpcast.patch

@@ -1,7 +1,7 @@
 From 504d76a1ce3b05dbc406d6e5998d9fa68a0ee6aa Mon Sep 17 00:00:00 2001
 From: Hood Chatham <roberthoodchatham@gmail.com>
 Date: Tue, 1 Mar 2022 17:06:53 -0800
-Subject: [PATCH 08/13] Fix _PyImport_LoadDynamicModuleWithSpec fpcast
+Subject: [PATCH 08/14] Fix _PyImport_LoadDynamicModuleWithSpec fpcast
 
 ---
  Python/importdl.c | 11 ++++++++++-

cpython/patches/0009-Add-one-more-trampoline-in-cfunction_vectorcall_O.patch

@@ -1,7 +1,7 @@
 From 9d0c813518fbdaa9963e46362608dd6d3e391799 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <roberthoodchatham@gmail.com>
 Date: Mon, 2 May 2022 17:31:07 -0700
-Subject: [PATCH 09/13] Add one more trampoline in cfunction_vectorcall_O
+Subject: [PATCH 09/14] Add one more trampoline in cfunction_vectorcall_O
 
 Christian already added this upstream in 3.11a7 so we can remove
 this when we update to 3.11

cpython/patches/0010-bpo-23325-Fix-SIG_IGN-and-SIG_DFL-int-comparison-in-.patch

@@ -1,7 +1,7 @@
 From 54d724f1227edfd0bf4198c52c3302f128063b5c Mon Sep 17 00:00:00 2001
 From: Christian Heimes <christian@python.org>
 Date: Tue, 8 Mar 2022 20:22:32 +0200
-Subject: [PATCH 10/13] bpo-23325: Fix SIG_IGN and SIG_DFL int comparison in
+Subject: [PATCH 10/14] bpo-23325: Fix SIG_IGN and SIG_DFL int comparison in
  signal module (GH-31759)
 
 ---

cpython/patches/0011-bpo-47197-Fix-void-return-type-handling-in-ctypes.patch

@@ -1,7 +1,7 @@
 From 74dfc730d7a146b9d20ba7b3309aacf179016215 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <roberthoodchatham@gmail.com>
 Date: Fri, 1 Apr 2022 18:55:11 -0700
-Subject: [PATCH 11/13] bpo-47197: Fix void return type handling in ctypes
+Subject: [PATCH 11/14] bpo-47197: Fix void return type handling in ctypes
 
 _ctypes_get_ffi_type never returns ffi_type_void. If the
 return type is specified as None, we need set the libffi

cpython/patches/0012-Interrupt-handling.patch

@@ -1,7 +1,7 @@
 From 8e20fedad850985b0789bc3aa06281e6b1ef9528 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <roberthoodchatham@gmail.com>
 Date: Wed, 30 Mar 2022 14:50:30 -0700
-Subject: [PATCH 12/13] Interrupt handling
+Subject: [PATCH 12/14] Interrupt handling
 
 ---
  Modules/signalmodule.c | 38 ++++++++++++++++++++++++++++++++++++++

cpython/patches/0013-Public-pymain_run_python.patch

@@ -1,7 +1,7 @@
-From 4f1b155ea0121c62facfeb6241f542565630cfc0 Mon Sep 17 00:00:00 2001
+From 3f67ed75d007f3b5917c0d0da6ba83f6d2ef9258 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <roberthoodchatham@gmail.com>
 Date: Sun, 17 Jul 2022 14:40:39 +0100
-Subject: [PATCH 13/13] Public pymain_run_python
+Subject: [PATCH 13/14] Public pymain_run_python
 
 ---
  Modules/main.c | 2 +-