rpms/gtk2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add a workaround for the flash backend

Browse Source
This commit is contained in:
Matthias Clasen 2007-09-07 20:14:10 +00:00
parent c947bd94ef
commit 54f24a01b8
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2.spec
View File

@ -37,6 +37,9 @@ Patch4: silence-icon-cache-validator.patch
Patch5: systray-tooltips.patch Patch5: systray-tooltips.patch
# fixed in upstream svn # fixed in upstream svn
Patch6: tooltip-compat.patch 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: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -127,6 +130,7 @@ docs for the GTK+ widget toolkit.
%patch4 -p1 -b .silence %patch4 -p1 -b .silence
%patch5 -p1 -b .tooltips %patch5 -p1 -b .tooltips
%patch6 -p1 -b .tooltip-compat %patch6 -p1 -b .tooltip-compat
%patch7 -p1 -b .workaround
for i in config.guess config.sub ; do for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@ -310,7 +314,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%changelog %changelog
* Mon Aug 27 2007 Jens Petersen <petersen@redhat.com> - 2.11.6-8 * Fri Sep 7 2007 Matthias Clasen <mclasen@redhat.com> - 2.11.6-9
- Add a workaround for the flash plugin
* Fri Sep 7 2007 Ray Strode <rstrode@redhat.com> - 2.11.6-8
- install dummy binary in libdir/gtk-2.0/immodules directory to - install dummy binary in libdir/gtk-2.0/immodules directory to
aid rpm when doing ia64 multilib (bug 253726) aid rpm when doing ia64 multilib (bug 253726)

12
workaround.patch Normal file
View File

@ -0,0 +1,12 @@
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);