diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..a2eef563ff0ce71c4f136afa1c25504f8cc2b988 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/pygobject3 diff --git a/0001-revert-override-of-connection.register_object.patch b/0001-revert-override-of-connection.register_object.patch deleted file mode 100644 index d80c18c58d865e77625de65dfa69a0e317fdc93b..0000000000000000000000000000000000000000 --- a/0001-revert-override-of-connection.register_object.patch +++ /dev/null @@ -1,140 +0,0 @@ -From e86c32092e693ecffcec211133fd1929603948d1 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Sat, 30 Nov 2024 14:59:49 -0800 -Subject: [PATCH] revert override of connection.register_object - -This seems to break the exit handler of anaconda (Fedora/RHEL -installer), such that it often fails to exit properly. - -Signed-off-by: Adam Williamson ---- - gi/overrides/Gio.py | 31 ------------------- - tests/test_gdbus.py | 73 --------------------------------------------- - 2 files changed, 104 deletions(-) - -diff --git a/gi/overrides/Gio.py b/gi/overrides/Gio.py -index 48c3737a..45256385 100644 ---- a/gi/overrides/Gio.py -+++ b/gi/overrides/Gio.py -@@ -89,37 +89,6 @@ class DBusArgInfo(Gio.DBusArgInfo): - __all__.append('DBusArgInfo') - - --@override --class DBusConnection(Gio.DBusConnection): -- __init__ = _warn_init(Gio.DBusConnection) -- -- def register_object(self, -- object_path, -- interface_info, -- method_call_closure=None, -- get_property_closure=None, -- set_property_closure=None): -- if method_call_closure is not None: -- def wrapped_method_call_closure(connection, sender, object_path, -- interface_name, method_name, parameters, -- invocation): -- method_call_closure(connection, sender, object_path, -- interface_name, method_name, parameters, -- invocation) -- invocation._unref() -- else: -- wrapped_method_call_closure = None -- -- return super().register_object(object_path, -- interface_info, -- wrapped_method_call_closure, -- get_property_closure, -- set_property_closure) -- -- --__all__.append('DBusConnection') -- -- - @override - class DBusMethodInfo(Gio.DBusMethodInfo): - __init__ = _warn_init(Gio.DBusMethodInfo) -diff --git a/tests/test_gdbus.py b/tests/test_gdbus.py -index afbf94cb..18fd0e41 100644 ---- a/tests/test_gdbus.py -+++ b/tests/test_gdbus.py -@@ -284,76 +284,3 @@ class TestDBusConnection: - ): - reg_id = bus.register_object(**kwargs) - bus.unregister_object(reg_id) -- -- @unittest.skipUnless(has_dbus, "no dbus running") -- def test_connection_invocation_ref_count(self): -- """Invocation object should not leak a reference.""" -- invocation, errors = self.run_server(self.client_call) -- -- assert not errors -- assert invocation -- assert invocation.ref_count == 1 -- -- def run_server(self, client_callback): -- self.invocation = None -- self.errors = [] -- self.loop = GLib.MainLoop() -- -- def on_name_acquired(bus, name): -- client_callback(bus) -- -- self.reg_id = None -- bus = Gio.bus_get_sync(Gio.BusType.SESSION) -- owner_id = Gio.bus_own_name(Gio.BusType.SESSION, -- "org.pygobject.Test", -- Gio.BusNameOwnerFlags.NONE, -- self.on_bus_acquired, -- on_name_acquired, -- self.on_name_lost) -- try: -- self.loop.run() -- finally: -- Gio.bus_unown_name(owner_id) -- if self.reg_id: -- bus.unregister_object(self.reg_id) -- -- return (self.invocation, self.errors) -- -- def on_name_lost(self, _bus, name): -- self.errors.append(f"Name {name} lost") -- self.loop.quit() -- -- def on_bus_acquired(self, bus, name): -- interface_xml = """ -- -- -- -- -- """ -- self.reg_id = bus.register_object("/pygobject/Test", -- Gio.DBusNodeInfo.new_for_xml(interface_xml).interfaces[0], -- self.on_incoming_method_call, -- None, -- None) -- -- def on_incoming_method_call(self, bus, sender, object_path, interface_name, method_name, parameters, invocation): -- invocation.return_value(GLib.Variant("()", ())) -- self.invocation = invocation -- -- def client_call(self, bus): -- -- def call_done(obj, result): -- try: -- obj.call_finish(result) -- finally: -- self.loop.quit() -- -- bus.call("org.pygobject.Test", -- "/pygobject/Test", -- "org.pygobject.Test", -- "test", -- parameters=None, -- reply_type=None, -- flags=Gio.DBusCallFlags.NONE, -- timeout_msec=5000, -- callback=call_done) --- -2.47.0 - diff --git a/pygobject-3.50.0.tar.xz b/pygobject-3.50.0.tar.xz deleted file mode 100644 index 1d41b064ba21f16cc78a94c1a91cf1cdba5bd589..0000000000000000000000000000000000000000 Binary files a/pygobject-3.50.0.tar.xz and /dev/null differ diff --git a/pygobject-3.52.3.tar.gz b/pygobject-3.52.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..80d9170181096a335c8783d2c0a1072fed07e19f --- /dev/null +++ b/pygobject-3.52.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00e427d291e957462a8fad659a9f9c8be776ff82a8b76bdf402f1eaeec086d82 +size 1235825 diff --git a/pygobject-do-not-install-GIMarshallingTests.patch b/pygobject-do-not-install-GIMarshallingTests.patch index 698facd4427c8d9cc529e2d1711e7853b2704713..11d309a54bcd5cf8fb2c4c450d4e5e52a63c427c 100644 --- a/pygobject-do-not-install-GIMarshallingTests.patch +++ b/pygobject-do-not-install-GIMarshallingTests.patch @@ -1,10 +1,10 @@ ---- pygobject-3.46.0/gi/overrides/meson.build.orig 2024-10-19 11:56:33.161139900 +0800 -+++ pygobject-3.46.0/gi/overrides/meson.build 2024-10-19 11:56:37.632926300 +0800 +--- pygobject-3.52.3/gi/overrides/meson.build.orig 2025-06-14 18:36:25.753888000 +0800 ++++ pygobject-3.52.3/gi/overrides/meson.build 2025-06-14 18:36:35.598221400 +0800 @@ -5,7 +5,6 @@ 'GdkPixbuf.py', 'GObject.py', 'Gio.py', - 'GIMarshallingTests.py', 'Pango.py', - 'keysyms.py', '__init__.py'] + diff --git a/pygobject3.spec b/pygobject3.spec index c13837343d639a7a85e01cf1fdefbb2b17dff679..42968ab3b35305802fa90d50a9728ae4b93c68bc 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -2,29 +2,25 @@ %global __requires_exclude_from ^%{python3_sitearch}/pygtkcompat/.*$ Name: pygobject3 -Version: 3.50.0 +Version: 3.52.3 Release: 1 Summary: Provides bindings for GObject based libraries License: LGPL-2.1-or-later and MIT URL: https://pygobject.gnome.org/ -Source0: https://download.gnome.org/sources/pygobject/3.50/pygobject-%{version}.tar.xz +Source0: https://download.gnome.org/sources/pygobject/3.52/pygobject-%{version}.tar.gz # Drop GIMarshallingTests - It's test suite remainders that should not be installed Patch0: pygobject-do-not-install-GIMarshallingTests.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2329587 -# https://gitlab.gnome.org/GNOME/pygobject/-/issues/658 -# Revert override of connection.register_object to avoid breaking anaconda -Patch1: 0001-revert-override-of-connection.register_object.patch - BuildRequires: meson >= 0.64.0 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo-gobject) -BuildRequires: pkgconfig(gio-2.0) >= 2.64.0 -BuildRequires: pkgconfig(glib-2.0) >= 2.64.0 -BuildRequires: pkgconfig(gmodule-2.0) >= 2.64.0 -BuildRequires: pkgconfig(gobject-2.0) >= 2.64.0 -BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.64.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.80.0 +BuildRequires: pkgconfig(girepository-2.0) >= 2.80.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.80.0 +BuildRequires: pkgconfig(gmodule-2.0) >= 2.80.0 +BuildRequires: pkgconfig(gobject-2.0) >= 2.80.0 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.81.0 BuildRequires: pkgconfig(libffi) >= 3.0 BuildRequires: python3-devel >= 3.9 BuildRequires: python3-cairo-devel >= 1.16.0 @@ -100,6 +96,9 @@ export TEST_GTK_VERSION=3.0 %{_libdir}/pkgconfig/pygobject-3.0.pc %changelog +* Sat Jun 14 2025 Funda Wang - 3.52.3-1 +- update to 3.52.3 + * Tue Feb 04 2025 Funda Wang - 3.50.0-1 - update to 3.50.0