diff --git a/gnome-desktop-crash.patch b/gnome-desktop-crash.patch new file mode 100644 index 0000000..a64a491 --- /dev/null +++ b/gnome-desktop-crash.patch @@ -0,0 +1,18 @@ +diff -up gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c.crash gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c +--- gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c.crash 2010-01-08 13:26:17.000000000 -0500 ++++ gnome-desktop-2.28.2/libgnome-desktop/gnome-bg.c 2010-01-08 13:27:23.909658442 -0500 +@@ -630,6 +630,14 @@ draw_color_area (GnomeBG *bg, + GdkRectangle *rect) + { + guint32 pixel; ++ GdkRectangle extent; ++ ++ extent.x = 0; ++ extent.y = 0; ++ extent.width = gdk_pixbuf_get_width (dest); ++ extent.height = gdk_pixbuf_get_height (dest); ++ ++ gdk_rectangle_intersect (rect, &extent, rect); + + switch (bg->color_type) { + case GNOME_BG_COLOR_SOLID: diff --git a/gnome-desktop.spec b/gnome-desktop.spec index b968017..3a01a95 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -12,7 +12,7 @@ Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop Version: 2.29.90 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.29/%{name}-%{version}.tar.bz2 Patch1: concatenate-edid-descriptors.patch @@ -20,6 +20,11 @@ Patch1: concatenate-edid-descriptors.patch Patch3: ignore-xrandr-badmatch.patch # https://bugzilla.gnome.org/show_bug.cgi?id=601753 Patch5: slideshow.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=606456 +Patch6: gnome-desktop-crash.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=606457 +Patch7: randr-version.patch + License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries @@ -81,6 +86,9 @@ libgnomedesktop. %patch1 -p1 -b .concatenate-edid-descriptors %patch3 -p1 -b .ignore-xrandr-badmatch %patch5 -p1 -b .slideshow +%patch6 -p1 -b .crash +%patch7 -p1 -b .randr-version + %build %configure --with-gnome-distributor="Red Hat, Inc" \ @@ -128,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Tue Feb 16 2010 Matthias Clasen - 2.29.90-2 +- Copy patches from F-12 + * Wed Feb 10 2010 Bastien Nocera 2.29.90-1 - Update to 2.29.90 diff --git a/randr-version.patch b/randr-version.patch new file mode 100644 index 0000000..30c11ea --- /dev/null +++ b/randr-version.patch @@ -0,0 +1,16 @@ +diff -up gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c.randr-version gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c +--- gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c.randr-version 2010-02-12 22:34:08.220397527 -0500 ++++ gnome-desktop-2.28.2/libgnome-desktop/gnome-rr.c 2010-02-16 11:20:55.832866111 -0500 +@@ -630,6 +630,12 @@ gnome_rr_screen_new (GdkScreen *gdk_scre + screen->randr_event_base = event_base; + + XRRQueryVersion (dpy, &screen->rr_major_version, &screen->rr_minor_version); ++ if (screen->rr_minor_version < 2) { ++ g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_RANDR_EXTENSION, ++ _("RANDR extension is too old (< 1.2)")); ++ g_free (screen); ++ return NULL; ++ } + + screen->info = screen_info_new (screen, TRUE, error); +