diff --git a/greeter-crash.patch b/greeter-crash.patch new file mode 100644 index 0000000..89e3dc0 --- /dev/null +++ b/greeter-crash.patch @@ -0,0 +1,21 @@ +diff -up gtk+-2.14.0/modules/other/gail/gailtreeview.c.greeter-crash gtk+-2.14.0/modules/other/gail/gailtreeview.c +--- gtk+-2.14.0/modules/other/gail/gailtreeview.c.greeter-crash 2008-09-05 00:24:19.000000000 -0400 ++++ gtk+-2.14.0/modules/other/gail/gailtreeview.c 2008-09-05 00:24:27.000000000 -0400 +@@ -2959,17 +2959,6 @@ model_row_deleted (GtkTreeModel *tree_mo + g_signal_emit_by_name (atk_obj, "row_deleted", row, + gailview->n_children_deleted + 1); + gailview->n_children_deleted = 0; +- +- /* Generate children-changed signals */ +- n_cols = get_n_actual_columns (tree_view); +- for (col = 0; col < n_cols; col++) +- { +- /* +- * Pass NULL as the child object, 4th argument. +- */ +- g_signal_emit_by_name (atk_obj, "children_changed::remove", +- ((row * n_cols) + col), NULL, NULL); +- } + } + + /* diff --git a/gtk2.spec b/gtk2.spec index a8ed8c6..3b36f33 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2 @@ -32,6 +32,8 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch Patch2: workaround.patch # fixed upstream Patch3: init-deadlock.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=548782 +Patch4: greeter-crash.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -118,6 +120,7 @@ docs for the GTK+ widget toolkit. %patch1 -p1 -b .set-invisible-char-to-bullet %patch2 -p1 -b .workaround %patch3 -p0 -b .init-deadlock +%patch4 -p1 -b .greeter-crash for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -301,6 +304,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-2.0 %changelog +* Fri Sep 5 2008 Matthias Clasen - 2.14.0-3 +- Fix a greeter crash + * Thu Sep 4 2008 Matthias Clasen - 2.14.0-2 - Fix a deadlock in pixbuf loader initialization