diff --git a/0001-Remove-deprecated-sink-functions.patch b/0001-Remove-deprecated-sink-functions.patch new file mode 100644 index 0000000..8b23e05 --- /dev/null +++ b/0001-Remove-deprecated-sink-functions.patch @@ -0,0 +1,30 @@ +From f19a28420f9132e0e0cac6a2747a63c473052489 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Tue, 20 Jul 2010 10:06:05 -0400 +Subject: [PATCH] Remove deprecated sink functions + +This is handled automatically now; see commit 00a85f6a844714d1 in pygobject. + +https://bugzilla.gnome.org/show_bug.cgi?id=624834 +--- + gtk/gtkmodule.c | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c +index ff6420c..1672bf9 100644 +--- a/gtk/gtkmodule.c ++++ b/gtk/gtkmodule.c +@@ -204,10 +204,6 @@ init_gtk(void) + /* initialise pygtk */ + gtk_type_init(0); + +- pygobject_register_sinkfunc(GTK_TYPE_WINDOW, sink_gtkwindow); +- pygobject_register_sinkfunc(GTK_TYPE_INVISIBLE, sink_gtkinvisible); +- pygobject_register_sinkfunc(GTK_TYPE_OBJECT, sink_gtkobject); +- + m = Py_InitModule("gtk._gtk", pygtk_functions); + d = PyModule_GetDict(m); + +-- +1.7.1.1 + diff --git a/pygtk2.spec b/pygtk2.spec index 773cd36..6f5410f 100644 --- a/pygtk2.spec +++ b/pygtk2.spec @@ -15,7 +15,7 @@ Name: pygtk2 Version: 2.17.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GTK+ @@ -28,6 +28,9 @@ Source: http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.17/pygtk-%{version}.tar.b # RH bug #208608 Patch0: pygtk-nodisplay-exception.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=624834 +Patch1: 0001-Remove-deprecated-sink-functions.patch + ### Dependencies ### # Leave these requirements alone! RPM isn't smart enough @@ -98,6 +101,7 @@ This package contains documentation files for %{name}. %prep %setup -q -n pygtk-%{version} %patch0 -p1 +%patch1 -p1 %build %configure --enable-thread --enable-numpy @@ -159,6 +163,9 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/pygtk %changelog +* Tue Jul 20 2010 Colin Walters - 2.17.0-5 +- Add patch to remove use of deprecated pygobject API + * Mon Jul 12 2010 Colin Walters - 2.17.0-4 - Rebuild against new pygobject2