From 141b99a0a771539054bb54741201cdd286493864 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 1 Aug 2023 15:33:52 +0200 Subject: [PATCH] Update to version 0.19.2; Fixes RHBZ#2228010 --- .gitignore | 1 + Add-PyType_GetDict-for-Python-3.12.patch | 26 ------------------------ pyo3-ffi-fix-metadata.diff | 4 ++-- rust-pyo3-ffi.spec | 6 +----- sources | 2 +- 5 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 Add-PyType_GetDict-for-Python-3.12.patch diff --git a/.gitignore b/.gitignore index 50bae4e..4f644f1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pyo3-ffi-0.18.2.crate /pyo3-ffi-0.18.3.crate /pyo3-ffi-0.19.1.crate +/pyo3-ffi-0.19.2.crate diff --git a/Add-PyType_GetDict-for-Python-3.12.patch b/Add-PyType_GetDict-for-Python-3.12.patch deleted file mode 100644 index 190ec7d..0000000 --- a/Add-PyType_GetDict-for-Python-3.12.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e07ffa586cf905f2c49eff3aea1b7fada38d5437 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= -Date: Tue, 25 Jul 2023 08:56:05 +0200 -Subject: [PATCH] Add PyType_GetDict for Python 3.12 - ---- - src/cpython/object.rs | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/cpython/object.rs b/src/cpython/object.rs -index 76ab074..8209524 100644 ---- a/src/cpython/object.rs -+++ b/src/cpython/object.rs -@@ -349,6 +349,9 @@ pub unsafe fn PyHeapType_GET_MEMBERS( - // skipped _PyType_GetModuleByDef - - extern "C" { -+ #[cfg(Py_3_12)] -+ pub fn PyType_GetDict(o: *mut PyTypeObject) -> *mut PyObject; -+ - #[cfg_attr(PyPy, link_name = "PyPyObject_Print")] - pub fn PyObject_Print(o: *mut PyObject, fp: *mut ::libc::FILE, flags: c_int) -> c_int; - --- -2.40.1 - diff --git a/pyo3-ffi-fix-metadata.diff b/pyo3-ffi-fix-metadata.diff index 15794c9..9f47974 100644 --- a/pyo3-ffi-fix-metadata.diff +++ b/pyo3-ffi-fix-metadata.diff @@ -1,5 +1,5 @@ ---- pyo3-ffi-0.19.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ pyo3-ffi-0.19.1/Cargo.toml 2023-07-05T16:53:34.873895+00:00 +--- pyo3-ffi-0.19.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ pyo3-ffi-0.19.2/Cargo.toml 2023-08-01T13:21:17.556533+00:00 @@ -62,4 +62,3 @@ ] default = [] diff --git a/rust-pyo3-ffi.spec b/rust-pyo3-ffi.spec index c7d3f61..dc51a8a 100644 --- a/rust-pyo3-ffi.spec +++ b/rust-pyo3-ffi.spec @@ -5,7 +5,7 @@ %global crate pyo3-ffi Name: rust-pyo3-ffi -Version: 0.19.1 +Version: 0.19.2 Release: %autorelease Summary: Python-API bindings for the PyO3 ecosystem @@ -16,10 +16,6 @@ Source: %{crates_source} # * drop MSVC- and MinGW-only features Patch: pyo3-ffi-fix-metadata.diff -# Add PyType_GetDict for Python 3.12 -# https://github.com/PyO3/pyo3/commit/8c393dd.patch -Patch: Add-PyType_GetDict-for-Python-3.12.patch - BuildRequires: rust-packaging >= 21 %global _description %{expand: diff --git a/sources b/sources index 933aabc..c166557 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyo3-ffi-0.19.1.crate) = 6293d75c71ebe80c320f0a240716a2e0c62f66aecc58320f2f40a81f85390c7d9174b4888ead89818b73fdc8d3d21df12adc6625087f0c9ebb82767d4a7c5adc +SHA512 (pyo3-ffi-0.19.2.crate) = 789191bca537998dd23d72dce4f185b84bbe700f4171c47de35b9bbca15a180ad214392b4f465cc1ecb0be955ebec1cf5a3c497815073be18035bd8bf8c51a32