rpms/gtk2/devel workaround.patch,NONE,1.1 gtk2.spec,1.253,1.254

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24806

Modified Files:
	gtk2.spec 
Added Files:
	workaround.patch 
Log Message:
Add a workaround for the flash backend


workaround.patch:

--- NEW FILE workaround.patch ---
Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
===================================================================
--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
+++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
@@ -287,6 +287,7 @@
 gtk_clipboard_get_for_display (GdkDisplay *display, 
 			       GdkAtom     selection)
 {
+  g_return_val_if_fail (display != NULL, NULL);
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
   g_return_val_if_fail (!display->closed, NULL);
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- gtk2.spec	7 Sep 2007 19:46:12 -0000	1.253
+++ gtk2.spec	7 Sep 2007 20:14:10 -0000	1.254
@@ -37,6 +37,9 @@
 Patch5: systray-tooltips.patch
 # fixed in upstream svn
 Patch6: tooltip-compat.patch
+# a workaround for some brokenness in the flash plugin
+# see http://bugzilla.gnome.org/show_bug.cgi?id=463773
+Patch7: workaround.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -127,6 +130,7 @@
 %patch4 -p1 -b .silence
 %patch5 -p1 -b .tooltips
 %patch6 -p1 -b .tooltip-compat
+%patch7 -p1 -b .workaround
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -310,7 +314,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
-* Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 2.11.6-8
+* Fri Sep  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-9
+- Add a workaround for the flash plugin
+
+* Fri Sep  7 2007 Ray Strode <rstrode at redhat.com> - 2.11.6-8
 - install dummy binary in libdir/gtk-2.0/immodules directory to
   aid rpm when doing ia64 multilib (bug 253726)