From d8418e39b0be14b6aa389677af92ec65d8a85adb Mon Sep 17 00:00:00 2001
From: Brett Jia <dev.bjia56@gmail.com>
Date: Thu, 12 Dec 2024 10:31:22 -0500
Subject: [PATCH] roll patches forward

---
 ...tch => 04-getpath_noop-missing-stub.patch} |  0
 patches/3.13/05-solaris-fcntlmodule.patch     | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 rename patches/3.13/{05-getpath_noop-missing-stub.patch => 04-getpath_noop-missing-stub.patch} (100%)
 create mode 100644 patches/3.13/05-solaris-fcntlmodule.patch

diff --git a/patches/3.13/05-getpath_noop-missing-stub.patch b/patches/3.13/04-getpath_noop-missing-stub.patch
similarity index 100%
rename from patches/3.13/05-getpath_noop-missing-stub.patch
rename to patches/3.13/04-getpath_noop-missing-stub.patch
diff --git a/patches/3.13/05-solaris-fcntlmodule.patch b/patches/3.13/05-solaris-fcntlmodule.patch
new file mode 100644
index 0000000..f0c2cff
--- /dev/null
+++ b/patches/3.13/05-solaris-fcntlmodule.patch
@@ -0,0 +1,20 @@
+diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
+index 2bca40213c6..59dab31bc40 100644
+--- a/Modules/fcntlmodule.c
++++ b/Modules/fcntlmodule.c
+@@ -628,6 +628,15 @@ all_ins(PyObject* m)
+ #endif
+ 
+ #ifdef HAVE_STROPTS_H
++
++#if defined(sun) || defined(__sun)
++  #ifndef STR
++    /* for some reason, the preprocessor does not resolve this symbol */
++    /* from /usr/include/sys/stropts.h on Solaris 11 */
++    #define STR ('S'<<8)
++  #endif
++#endif
++
+     /* Unix 98 guarantees that these are in stropts.h. */
+     if (PyModule_AddIntMacro(m, I_PUSH)) return -1;
+     if (PyModule_AddIntMacro(m, I_POP)) return -1;