From 389a96089a7ba5c1b2583c0254cca1560d709b63 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 14 Dec 2024 10:11:42 +0000
Subject: [PATCH] Python3: update to 3.12.8

ref: https://docs.python.org/release/3.12.8/whatsnew/changelog.html#python-3-12-8
---
 packages/lang/Python3/package.mk                          | 4 ++--
 .../0008-Add-an-option-to-disable-the-tk-module.patch     | 2 +-
 packages/lang/Python3/patches/py312-cpython118618-1.patch | 7 ++++---
 packages/lang/Python3/patches/py312-cpython118618-2.patch | 8 ++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk
index 6e9155737d..22e0933bdc 100644
--- a/packages/lang/Python3/package.mk
+++ b/packages/lang/Python3/package.mk
@@ -3,8 +3,8 @@
 
 PKG_NAME="Python3"
 # When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION!
-PKG_VERSION="3.12.7"
-PKG_SHA256="24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550"
+PKG_VERSION="3.12.8"
+PKG_SHA256="c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.python.org/"
 PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"
diff --git a/packages/lang/Python3/patches/0008-Add-an-option-to-disable-the-tk-module.patch b/packages/lang/Python3/patches/0008-Add-an-option-to-disable-the-tk-module.patch
index 97ee2d717c..e58186f6ef 100644
--- a/packages/lang/Python3/patches/0008-Add-an-option-to-disable-the-tk-module.patch
+++ b/packages/lang/Python3/patches/0008-Add-an-option-to-disable-the-tk-module.patch
@@ -39,9 +39,9 @@ index 7b6c9811a6..6d9527ddd0 100644
  		test/test_tomllib/data \
  		test/test_tomllib/data/invalid \
 @@ -2232,7 +2230,6 @@ TESTSUBDIRS=	idlelib/idle_test \
- 		test/test_tomllib/data/valid/dates-and-times \
  		test/test_tomllib/data/valid/multiline-basic-str \
  		test/test_tools \
+ 		test/test_tools/i18n_data \
 -		test/test_ttk \
  		test/test_unittest \
  		test/test_unittest/testmock \
diff --git a/packages/lang/Python3/patches/py312-cpython118618-1.patch b/packages/lang/Python3/patches/py312-cpython118618-1.patch
index 5055a39779..446d754dc8 100644
--- a/packages/lang/Python3/patches/py312-cpython118618-1.patch
+++ b/packages/lang/Python3/patches/py312-cpython118618-1.patch
@@ -339,7 +339,7 @@ index 1337516aa59cbc..a25c3dcf9d09ea 100644
          PyMem_RawFree(interp);
      }
  }
-@@ -679,13 +685,6 @@ init_interpreter(PyInterpreterState *interp,
+@@ -679,14 +685,6 @@ init_interpreter(PyInterpreterState *interp,
      assert(next != NULL || (interp == runtime->interpreters.main));
      interp->next = next;
  
@@ -350,9 +350,10 @@ index 1337516aa59cbc..a25c3dcf9d09ea 100644
 -                _obmalloc_pools_INIT(interp->obmalloc.pools);
 -        memcpy(&interp->obmalloc.pools.used, temp, sizeof(temp));
 -    }
-     _PyObject_InitState(interp);
+-
+     // We would call _PyObject_InitState() at this point
+     // if interp->feature_flags were alredy set.
  
-     _PyEval_InitState(interp, pending_lock);
 diff --git a/Tools/c-analyzer/cpython/ignored.tsv b/Tools/c-analyzer/cpython/ignored.tsv
 index 9f36c47ca7ea03..7bcca27ecc32f6 100644
 --- a/Tools/c-analyzer/cpython/ignored.tsv
diff --git a/packages/lang/Python3/patches/py312-cpython118618-2.patch b/packages/lang/Python3/patches/py312-cpython118618-2.patch
index bbd7a5e0d1..f6f73d42a4 100644
--- a/packages/lang/Python3/patches/py312-cpython118618-2.patch
+++ b/packages/lang/Python3/patches/py312-cpython118618-2.patch
@@ -25,9 +25,9 @@ index fb833ba61cbd9b..31a24d4a65aebf 100644
      /* Auto-thread-state API */
      status = _PyGILState_Init(interp);
      if (_PyStatus_EXCEPTION(status)) {
-@@ -658,6 +651,13 @@ pycore_create_interpreter(_PyRuntimeState *runtime,
-         return status;
-     }
+@@ -662,6 +655,13 @@ pycore_create_interpreter(_PyRuntimeState *runtime,
+     // didn't depend on interp->feature_flags being set already.
+     _PyObject_InitState(interp);
  
 +    // initialize the interp->obmalloc state.  This must be done after
 +    // the settings are loaded (so that feature_flags are set) but before
@@ -39,7 +39,7 @@ index fb833ba61cbd9b..31a24d4a65aebf 100644
      PyThreadState *tstate = _PyThreadState_New(interp);
      if (tstate == NULL) {
          return _PyStatus_ERR("can't make first thread");
-@@ -2059,14 +2059,6 @@ new_interpreter(PyThreadState **tstate_p, const PyInterpreterConfig *config)
+@@ -2072,14 +2072,6 @@ new_interpreter(PyThreadState **tstate_p, const PyInterpreterConfig *config)
          return _PyStatus_OK();
      }