From 2dc28a0aeea99efd047d5b2db4a7bb4bf5a43b4b Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 19 Mar 2024 17:53:56 +0100 Subject: [PATCH] Fix FTBFS with GCC 14 due to incompatible pointers - Fixes: rhbz#2261539 --- 010-fix-pointers.patch | 25 +++++++++++++++++++++++++ pypy3.10.spec | 6 ++++++ 2 files changed, 31 insertions(+) create mode 100644 010-fix-pointers.patch diff --git a/010-fix-pointers.patch b/010-fix-pointers.patch new file mode 100644 index 0000000..0f6c30f --- /dev/null +++ b/010-fix-pointers.patch @@ -0,0 +1,25 @@ +From 2d689b133337084a6f00982462b58486bf6bd3a4 Mon Sep 17 00:00:00 2001 +From: mattip +Date: Tue, 19 Mar 2024 08:45:03 +0200 +Subject: [PATCH] fix 'const' in signature of Tcl_Merge (issue 4926) + +--- + lib_pypy/_tkinter/tklib_build.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib_pypy/_tkinter/tklib_build.py b/lib_pypy/_tkinter/tklib_build.py +index 0e4e93c..44c1d10 100644 +--- a/lib_pypy/_tkinter/tklib_build.py ++++ b/lib_pypy/_tkinter/tklib_build.py +@@ -171,7 +171,7 @@ int Tcl_ListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr, int *objcPtr, T + int Tcl_ListObjLength(Tcl_Interp* interp, Tcl_Obj* listPtr, int* intPtr); + int Tcl_ListObjIndex(Tcl_Interp* interp, Tcl_Obj* listPtr, int index, Tcl_Obj** objPtrPtr); + int Tcl_SplitList(Tcl_Interp* interp, char* list, int* argcPtr, const char*** argvPtr); +-char* Tcl_Merge(int argc, char** argv); ++char* Tcl_Merge(int argc, const char * const* argv); + + int Tcl_Eval(Tcl_Interp* interp, const char* script); + int Tcl_EvalFile(Tcl_Interp* interp, const char* filename); +-- +2.43.2 + diff --git a/pypy3.10.spec b/pypy3.10.spec index 6c2be7a..f1effa9 100644 --- a/pypy3.10.spec +++ b/pypy3.10.spec @@ -113,6 +113,12 @@ Patch7: 007-remove-startup-message.patch # https://fedoraproject.org/wiki/Changes/Replace_glibc_libcrypt_with_libxcrypt Patch9: 009-add-libxcrypt-support.patch +# Fix function signatures uncovered by GCC 14 enforcement of +# -Wincompatible-pointer-types +# Resolved upstream: +# https://github.com/pypy/pypy/commit/8831ebf1cd4af225c2212dbade45624f9305a8f0 +Patch10: 010-fix-pointers.patch + # Build-time requirements: # pypy's can be rebuilt using pypy2, rather than with CPython 2; doing so