diff --git a/.gitignore b/.gitignore index ad8bec0..a3bbff0 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /gobject-introspection-1.64.1.tar.xz /gobject-introspection-1.66.0.tar.xz /gobject-introspection-1.66.1.tar.xz +/gobject-introspection-1.67.1.tar.xz diff --git a/243.patch b/243.patch deleted file mode 100644 index 13791fc..0000000 --- a/243.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 89e0c07e4aa991af307b113afa474fcdfffe0859 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Tue, 6 Oct 2020 14:21:33 +0200 -Subject: [PATCH] Don't assume Py_TYPE being a macro - -It got changed to a function in Python 3.10. Use the Py_SET_TYPE macro -suggested at https://docs.python.org/3.10/whatsnew/3.10.html instead. - -Fixes #358 ---- - giscanner/giscannermodule.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c -index 43f8bdea2..46bfd105e 100644 ---- a/giscanner/giscannermodule.c -+++ b/giscanner/giscannermodule.c -@@ -27,10 +27,6 @@ - - #include - --#ifndef Py_TYPE -- #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) --#endif -- - #if PY_MAJOR_VERSION >= 3 - #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void) - #define MOD_ERROR_RETURN NULL -@@ -52,8 +48,12 @@ PyTypeObject Py##cname##_Type = { \ - 0 \ - } - -+#if PY_VERSION_HEX < 0x030900A4 -+# define Py_SET_TYPE(obj, type) ((Py_TYPE(obj) = (type)), (void)0) -+#endif -+ - #define REGISTER_TYPE(d, name, type) \ -- Py_TYPE(&type) = &PyType_Type; \ -+ Py_SET_TYPE(&type, &PyType_Type); \ - type.tp_alloc = PyType_GenericAlloc; \ - type.tp_new = PyType_GenericNew; \ - type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; \ --- -GitLab - diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 86701c8..627b2ae 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -3,16 +3,13 @@ %global __python %{__python3} Name: gobject-introspection -Version: 1.66.1 -Release: 3%{?dist} +Version: 1.67.1 +Release: 1%{?dist} Summary: Introspection system for GObject-based libraries License: GPLv2+, LGPLv2+, MIT URL: https://wiki.gnome.org/Projects/GObjectIntrospection -Source0: https://download.gnome.org/sources/gobject-introspection/1.66/%{name}-%{version}.tar.xz - -# Fix the build with Python 3.10 -Patch0: 243.patch +Source0: https://download.gnome.org/sources/gobject-introspection/1.67/%{name}-%{version}.tar.xz BuildRequires: gcc BuildRequires: bison @@ -89,6 +86,9 @@ Libraries and headers for gobject-introspection %{_mandir}/man1/g-ir-scanner.1* %changelog +* Mon Mar 15 2021 Kalev Lember - 1.67.1-1 +- Update to 1.67.1 + * Tue Jan 26 2021 Fedora Release Engineering - 1.66.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 0ddcd0d..376a6e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gobject-introspection-1.66.1.tar.xz) = ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d +SHA512 (gobject-introspection-1.67.1.tar.xz) = bd75388e69c4e37dbea155a3beb7c207c10abff56da58b93d1d196a948fb8beaabfb24b2186b3fa3a8c3a52f5f838ef428c333f4741111000e82c4dce28a0086