From 26f3afdf37d39cde4af1b8e8153ca6c84cfaa9e7bfdbf5cf897de1bf8c9a021d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 16 Oct 2010 14:57:42 +0000 Subject: [PATCH] Accepting request 50835 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/50835 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=14 --- gtk3-fix-badmatch-gnome-shell.patch | 12 ++++++++++++ gtk3.changes | 6 ++++++ gtk3.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 gtk3-fix-badmatch-gnome-shell.patch diff --git a/gtk3-fix-badmatch-gnome-shell.patch b/gtk3-fix-badmatch-gnome-shell.patch new file mode 100644 index 0000000..8c346b4 --- /dev/null +++ b/gtk3-fix-badmatch-gnome-shell.patch @@ -0,0 +1,12 @@ +diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c +index 66494d6..aa326bf 100644 +--- a/gdk/x11/gdkwindow-x11.c ++++ b/gdk/x11/gdkwindow-x11.c +@@ -2676,6 +2676,7 @@ gdk_window_x11_set_background (GdkWindow *window, + if (cairo_pattern_get_surface (pattern, &surface) == CAIRO_STATUS_SUCCESS && + matrix_is_identity (&matrix) && + cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_XLIB && ++ cairo_xlib_surface_get_visual (surface) == GDK_VISUAL_XVISUAL (gdk_window_get_visual ((window))) && + cairo_xlib_surface_get_display (surface) == GDK_WINDOW_XDISPLAY (window)) + { + double x, y; diff --git a/gtk3.changes b/gtk3.changes index 41c2a89..2364bbe 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 15 17:12:37 CEST 2010 - vuntz@opensuse.org + +- Add gtk3-fix-badmatch-gnome-shell.patch to fix a crash in + gnome-shell. + ------------------------------------------------------------------- Wed Oct 13 20:24:01 CEST 2010 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index f37892a..6a9c32a 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -43,6 +43,8 @@ Patch1: gtk3-path-local.patch Patch2: gtk3-bnc129753-localize-font-style-name.patch # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch +# PATCH-FIX-UPSTREAM gtk3-fix-badmatch-gnome-shell.patch vuntz@opensuse.org -- Fix BadMatch in gnome-shell. Already in git. +Patch4: gtk3-fix-badmatch-gnome-shell.patch BuildRequires: fdupes BuildRequires: cups-devel BuildRequires: gnome-patch-translation @@ -274,6 +276,7 @@ cp -a %{S:1} . %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 gnome-patch-translation-update %build