Apply more fixes for python < 3.12 and fix actin

Author: oddbookworm

.github/workflows/build-ubuntu-debug-python.yml

@@ -19,10 +19,8 @@ on:
       - '*.rst'
       - '*.md'
       - '.github/workflows/*.yml'
-      # gcov/lcov only gets C coverage
-      - 'src_py/**'
       # re-include current file to not be excluded
-      - '!.github/workflows/build-ubuntu-coverage.yml'
+      - '!.github/workflows/build-ubuntu-debug-python.yml'
 
   pull_request:
     branches: main
@@ -47,7 +45,7 @@ jobs:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
         os: [ ubuntu-24.04 ]
-        python: [ 3.12.8 ]
+        python: [ 3.11.11, 3.12.8 ]
 
     env:
       # Pip now forces us to either make a venv or set this flag, so we will do
@@ -87,7 +85,7 @@ jobs:
         pyenv install ${{ matrix.python }} --debug --keep
         pyenv global ${{ matrix.python }}-debug
         echo $(python -VV)
-        python dev.py build --lax
+        python dev.py build
 
     - name: Run tests
       env:

src_c/include/_pygame.h

@@ -54,6 +54,9 @@
 #include "pgplatform.h"
 #include <Python.h>
 
+static void
+shim_to_ignore_unused(void);
+
 /* version macros (defined since version 1.9.5) */
 #ifndef PG_MAJOR_VERSION
 #error PG_MAJOR_VERSION must be defined
@@ -620,6 +623,9 @@ PYGAMEAPI_EXTERN_SLOTS(geometry);
 static PG_INLINE PyObject *
 pg_tuple_couple_from_values_int(int val1, int val2)
 {
+    // I'm sorry for putting this here, but it just needs a place to go
+    shim_to_ignore_unused();
+
     /* This function turns two input integers into a python tuple object.
      * Currently, 5th November 2022, this is faster than using Py_BuildValue
      * to do the same thing.
@@ -742,6 +748,14 @@ pg_PointList_FromArrayDouble(double const *array, int arr_length)
 #if PY_MINOR_VERSION >= 13
 static PyObject *__cached_exception = NULL;
 
+// this thing only exists because of the unused values that erroneously get
+// spit out by the compiler
+static void
+shim_to_ignore_unused(void)
+{
+    (void)__cached_exception;
+}
+
 #define CACHE_EXCEPTION __cached_exception = PyErr_GetRaisedException();
 #define RESTORE_EXCEPTION                             \
     {                                                 \
@@ -754,6 +768,16 @@ static PyObject *__cached_type = NULL;
 static PyObject *__cached_value = NULL;
 static PyObject *__cached_traceback = NULL;
 
+// this thing only exists because of the unused values that erroneously get
+// spit out by the compiler
+static void
+shim_to_ignore_unused(void)
+{
+    (void)__cached_type;
+    (void)__cached_value;
+    (void)__cached_traceback;
+}
+
 #define CACHE_EXCEPTION \
     PyErr_Fetch(&__cached_type, &__cached_value, &__cached_traceback);
 #define RESTORE_EXCEPTION                                                 \

src_c/mixer.c

@@ -1200,9 +1200,6 @@ chan_set_volume(PyObject *self, PyObject *args)
 {
     int channelnum = pgChannel_AsInt(self);
     float volume, stereovolume = -1.11f;
-#ifdef Py_DEBUG
-    int result;
-#endif
     Uint8 left, right;
     PyThreadState *_save;
 
@@ -1245,10 +1242,7 @@ chan_set_volume(PyObject *self, PyObject *args)
         volume = 1.0f;
     }
 
-#ifdef Py_DEBUG
-    result =
-#endif
-        Mix_Volume(channelnum, (int)(volume * 128));
+    Mix_Volume(channelnum, (int)(volume * 128));
     Py_RETURN_NONE;
 }