#16 Update to 7.3.15 and fix of FTBFS
Merged 3 months ago by churchyard. Opened 3 months ago by cstratak.
rpms/ cstratak/pypy3.10 7.3.15  into  rawhide

file modified
+1
@@ -25,3 +25,4 @@ 

  /pypy3.9-v7.3.12-src.tar.bz2

  /pypy3.10-v7.3.12-src.tar.bz2

  /pypy3.10-v7.3.13-src.tar.bz2

+ /pypy3.10-v7.3.15-src.tar.bz2

@@ -0,0 +1,25 @@ 

+ From 2d689b133337084a6f00982462b58486bf6bd3a4 Mon Sep 17 00:00:00 2001

+ From: mattip <matti.picus@gmail.com>

+ 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

+ 

file modified
+11 -5
@@ -1,5 +1,5 @@ 

  %global basever 7.3

- %global micro 13

+ %global micro 15

  #global pre ...

  %global pyversion 3.10

  Name:           pypy%{pyversion}
@@ -113,6 +113,12 @@ 

  # 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
@@ -252,8 +258,8 @@ 

  Provides: bundled(libmpdec) = %{libmpdec_version}

  }

  

- # Find the version in lib_pypy/cffi.dist-info/METADATA

- Provides: bundled(python3dist(cffi)) = 1.15.1

+ # Find the version in lib_pypy/cffi-XXX.dist-info/METADATA

+ Provides: bundled(python3dist(cffi)) = 1.16.0

  

  # Find the version in lib_pypy/cffi/_pycparser/__init__.py

  Provides: bundled(python3dist(pycparser)) = 2.21
@@ -265,7 +271,7 @@ 

  Provides: bundled(python3dist(cryptography)) = 2.7

  

  # Find the version in lib_pypy/hpy-XXX.dist-info/METADATA

- Provides: bundled(python3dist(hpy)) = 0.0.4~~dev179+g9b5d200

+ Provides: bundled(python3dist(hpy)) = 0.9.0

  

  %description libs

  Libraries required by the various PyPy implementations of Python %{pyversion}.
@@ -765,7 +771,7 @@ 

  %doc README.rst

  %license %{pypylibdir}/LICENSE

  %license %{pypylibdir}/_cffi_ssl/LICENSE

- %license %{pypylibdir}/cffi.dist-info/LICENSE

+ %license %{pypylibdir}/cffi-*.dist-info/LICENSE

  %license %{pypylibdir}/cffi/_pycparser/ply/LICENSE

  %license %{pypylibdir}/hpy-*.dist-info/LICENSE

  %{pypylibdir}/

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (pypy3.10-v7.3.13-src.tar.bz2) = 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43

+ SHA512 (pypy3.10-v7.3.15-src.tar.bz2) = 84f9a30484cf0b0bcf3ef1f71ce2ecae02a51b6609acc4f6edd4096302c9940541dc947f3f0767216d83d261f8db85ea43760af8ce3c9137c70aabe5571d1249

no initial comment
File not found: /builddir/build/BUILDROOT/pypy3.10-7.3.15-1.3.10.fc41.x86_64/usr/lib64/pypy3.10/cffi.dist-info/LICENSE

rebased onto 4c43456

3 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/18307725eb5c40a4b21d7fbca60ea82a

rebased onto 1888e0b

3 months ago

rebased onto cb01eac

3 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/1c4e8da6185a4ae09f4f8b4544f7a93d

Pull-Request has been merged by churchyard

3 months ago