From 9da860014124f34781cced35c5b22f247509d36c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 18 Sep 2023 12:01:42 +0200 Subject: [PATCH] Update to 3.46.0 --- .gitignore | 1 + fe6aedd.patch | 48 ------------------------------------------------ pygobject3.spec | 18 +++++++++--------- sources | 2 +- 4 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 fe6aedd.patch diff --git a/.gitignore b/.gitignore index 842d0df..eb645ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pygobject-3.44.1.tar.xz +/pygobject-3.46.0.tar.xz diff --git a/fe6aedd.patch b/fe6aedd.patch deleted file mode 100644 index 331e3bc..0000000 --- a/fe6aedd.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fe6aedd8eebd92844b873f72e99dc4023316c6f3 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Wed, 7 Jun 2023 22:27:55 +0200 -Subject: [PATCH] tests: fix test_gvalue_flat_array_in_item_marshal_failure for - Python 3.12 - -See https://gitlab.gnome.org/GNOME/pygobject/-/issues/582 - -_PyGI_ERROR_PREFIX() no longer works with 3.12 since we only get normalized -exceptions in there and can't add a prefix like "Item X: " to the message. - -Until we figure out how to add this back for 3.12, align the tests with the -new behaviour (the new exception notes API would be an option, see the -linked issue) ---- - tests/test_gi.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/tests/test_gi.py b/tests/test_gi.py -index 25a3b659..261d8b2b 100644 ---- a/tests/test_gi.py -+++ b/tests/test_gi.py -@@ -1573,9 +1573,12 @@ class TestGValue(unittest.TestCase): - self.assertRaises(OverflowError, GIMarshallingTests.gvalue_flat_array, - [GLib.MININT - 1, "42", True]) - -+ # FIXME: https://gitlab.gnome.org/GNOME/pygobject/-/issues/582#note_1764164 -+ exc_prefix = "Item 0: " if sys.version_info[:2] < (3, 12) else "" -+ - with pytest.raises( - OverflowError, -- match='Item 0: %d not in range %d to %d' % ( -+ match=exc_prefix + '%d not in range %d to %d' % ( - GLib.MAXINT + 1, GLib.MININT, GLib.MAXINT)): - GIMarshallingTests.gvalue_flat_array([GLib.MAXINT + 1, "42", True]) - -@@ -1583,7 +1586,7 @@ class TestGValue(unittest.TestCase): - - with pytest.raises( - OverflowError, -- match='Item 0: %d not in range %d to %d' % ( -+ match=exc_prefix + '%d not in range %d to %d' % ( - GLib.MAXUINT64 * 2, min_, max_)): - GIMarshallingTests.gvalue_flat_array([GLib.MAXUINT64 * 2, "42", True]) - --- -GitLab - diff --git a/pygobject3.spec b/pygobject3.spec index 68221af..7f91a0f 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -1,19 +1,16 @@ -%define glib2_version 2.56.0 -%define gobject_introspection_version 1.56.0 +%define glib2_version 2.64.0 +%define gobject_introspection_version 1.64.0 %define pycairo_version 1.16.0 -%define python3_version 3.7 +%define python3_version 3.8 Name: pygobject3 -Version: 3.44.1 -Release: 3%{?dist} +Version: 3.46.0 +Release: 1%{?dist} Summary: Python bindings for GObject Introspection License: LGPL-2.1-or-later URL: https://wiki.gnome.org/Projects/PyGObject -Source0: https://download.gnome.org/sources/pygobject/3.44/pygobject-%{version}.tar.xz - -# Compatibility with Python 3.12 -Patch: https://gitlab.gnome.org/GNOME/pygobject/-/commit/fe6aedd.patch +Source0: https://download.gnome.org/sources/pygobject/3.46/pygobject-%{version}.tar.xz BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -113,6 +110,9 @@ This package contains files required to embed PyGObject %{_libdir}/pkgconfig/pygobject-3.0.pc %changelog +* Mon Sep 18 2023 Kalev Lember - 3.46.0-1 +- Update to 3.46.0 + * Fri Jul 21 2023 Fedora Release Engineering - 3.44.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index e54de06..2918651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pygobject-3.44.1.tar.xz) = 5f2ff4a068e7e24dcc32f8c43ba58660c85a0fabdd9ff0bac4ddf1ca82bd0fc962ce5cb3ab25b991c212d45e5e89dac67c3259c5423a7d7fd70b2ac1f56e5327 +SHA512 (pygobject-3.46.0.tar.xz) = 48293c193ba5aece38d99f45d325d0329ac33e88442bf00848fe818a7c838977b8d2cf50a404c30e8852ccc0b4a44dfda07751d51acc21f740aa2ab6aa3ce661