rpms/gtk2/F-12 stackoverflow.patch,NONE,1.1 gtk2.spec,1.443,1.444

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32746

Modified Files:
	gtk2.spec 
Added Files:
	stackoverflow.patch 
Log Message:
Fix an infinite recursion


stackoverflow.patch:
 gdkwindow.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE stackoverflow.patch ---
diff -up gtk+-2.18.5/gdk/gdkwindow.c.stackoverflow gtk+-2.18.5/gdk/gdkwindow.c
--- gtk+-2.18.5/gdk/gdkwindow.c.stackoverflow	2009-12-21 19:27:58.326795233 -0500
+++ gtk+-2.18.5/gdk/gdkwindow.c	2009-12-21 19:28:14.602795116 -0500
@@ -1754,7 +1754,7 @@ temporary_disable_extension_events (GdkW
       child = l->data;
 
       if (window->impl_window == child->impl_window)
-	res |= temporary_disable_extension_events (window);
+	res |= temporary_disable_extension_events (child);
     }
 
   return res;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -p -r1.443 -r1.444
--- gtk2.spec	8 Dec 2009 16:49:31 -0000	1.443
+++ gtk2.spec	22 Dec 2009 00:33:52 -0000	1.444
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -48,6 +48,8 @@ Patch15: filesystemref.patch
 Patch16: o-minus.patch
 # from upstream
 Patch17: strftime-format.patch
+# from upstream
+Patch18: stackoverflow.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -171,6 +173,7 @@ This package contains developer document
 %patch15 -p1 -b .filesystemref
 %patch16 -p1 -b .o-minus
 %patch17 -p1 -b .strftime-format
+%patch18 -p1 -b .stackoverflow
 
 %build
 %configure --with-xinput=xfree 		\
@@ -398,6 +401,9 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.5-4
+- Fix an infinite recursion (#548849)
+
 * Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.5-1
 - Update to 2.18.5