diff --git a/gnome-desktop-foreign-for-screen.patch b/gnome-desktop-foreign-for-screen.patch new file mode 100644 index 0000000..4953e9d --- /dev/null +++ b/gnome-desktop-foreign-for-screen.patch @@ -0,0 +1,36 @@ + libgnome-desktop/gnome-bg.c | 10 +++++++--- + 1 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c +index d9d6709..c1932da 100644 +--- a/libgnome-desktop/gnome-bg.c ++++ b/libgnome-desktop/gnome-bg.c +@@ -880,6 +880,7 @@ make_root_pixmap (GdkScreen *screen, gint width, gint height) + Pixmap result; + GdkPixmap *gdk_pixmap; + int screen_num; ++ int depth; + + screen_num = gdk_screen_get_number (screen); + +@@ -902,14 +903,17 @@ make_root_pixmap (GdkScreen *screen, gint width, gint height) + + XSetCloseDownMode (display, RetainPermanent); + ++ depth = DefaultDepth (display, screen_num); ++ + result = XCreatePixmap (display, + RootWindow (display, screen_num), +- width, height, +- DefaultDepth (display, screen_num)); ++ width, height, depth); + + XCloseDisplay (display); + +- gdk_pixmap = gdk_pixmap_foreign_new (result); ++ gdk_pixmap = gdk_pixmap_foreign_new_for_screen (screen, result, ++ width, height, depth); ++ + gdk_drawable_set_colormap ( + GDK_DRAWABLE (gdk_pixmap), + gdk_drawable_get_colormap (gdk_screen_get_root_window (screen))); diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 576e068..fce019a 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 11 11:03:18 CET 2008 - rodrigo@novell.com + +- Add upstream patch for bgo#555701 + ------------------------------------------------------------------- Wed Oct 22 15:42:23 CDT 2008 - maw@suse.de diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 8c00b8c..e6e59d1 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -27,7 +27,7 @@ License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 o Group: System/GUI/GNOME Obsoletes: gnome-core Version: 2.24.1 -Release: 1 +Release: 2 Summary: The GNOME Desktop API Library Source: %{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -41,6 +41,8 @@ Patch3: gnome-desktop-recently-used-apps.patch Patch5: gnome-desktop-fate300461-desktop-gettext.patch # PATCH-FEATURE-UPSTREAM gnome-desktop-randr-cloned-outputs.diff fate4147 federico@novell.com - Infrastructure to support Fn-F7 to switch between display modes on laptops Patch6: gnome-desktop-randr-cloned-outputs.diff +# PATCH-FIX-UPSTREAM gnome-desktop-foreign-for-screen.patch bgo#555701 rodrigo@novell.com +Patch7: gnome-desktop-foreign-for-screen.patch Requires: %{name}-lang = %{version} Requires: libgnome-desktop-2-7 = %{version} @@ -137,6 +139,7 @@ Authors: %patch3 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build autoreconf -f -i @@ -195,10 +198,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/gnome-desktop %changelog +* Tue Nov 11 2008 rodrigo@novell.com +- Add upstream patch for bgo#555701 * Wed Oct 22 2008 maw@suse.de - Update to version 2.24.1: + Updated translations. -* Fri Oct 03 2008 mboman@suse.de +* Sat Oct 04 2008 mboman@suse.de - Update to version 2.24.0: + GnomeRR: don't try and set the screen size if turning off any of the CRTC's failed @@ -307,7 +312,7 @@ rm -rf $RPM_BUILD_ROOT for multilib support * Tue Apr 01 2008 vuntz@suse.de - Remove uz@cyrillic workaround (see bnc#372941) -* Thu Mar 13 2008 maw@suse.de +* Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Updated translations. * Tue Mar 04 2008 maw@suse.de @@ -363,7 +368,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Aug 14 2007 maw@suse.de - Rename the uz@cyrillic locale directory to uz@Cyrl to avoid unowned directories. -* Tue Aug 07 2007 maw@suse.de +* Wed Aug 08 2007 maw@suse.de - Use %%fdupes - Split off a -lang subpackage - s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. @@ -382,7 +387,7 @@ rm -rf $RPM_BUILD_ROOT - Removed invalid desktop Category "Application" (#254654). * Fri Apr 27 2007 sbrabec@suse.cz - Do not call meinproc (#227624). -* Wed Apr 11 2007 maw@suse.de +* Thu Apr 12 2007 maw@suse.de - Update to version 2.18.1 - Minor fixes - Updated translations for both the documentation (ar and ca) @@ -405,7 +410,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Nov 15 2006 jimmyk@suse.de - Updated recently-used-apps.patch to be compatible with new recently-used format, BNC #221392. -* Thu Oct 12 2006 ro@suse.de +* Fri Oct 13 2006 ro@suse.de - added gnome-doc-utils-devel to buildreq * Mon Oct 02 2006 jhargadon@suse.de - update to version 2.16.1 @@ -486,11 +491,11 @@ rm -rf $RPM_BUILD_ROOT - Update to version 2.9.91 * Tue Feb 08 2005 sbrabec@suse.cz - Changed Categories for gnome-about (#50440). -* Sat Feb 05 2005 gekker@suse.de +* Sun Feb 06 2005 gekker@suse.de - Update to version 2.9.90.1 * Sat Jan 22 2005 gekker@suse.de - Fixing the broken build -* Thu Jan 20 2005 gekker@suse.de +* Fri Jan 21 2005 gekker@suse.de - Update to version 2.9.4 * Tue Nov 02 2004 ro@suse.de - locale rename: no -> nb