Author: wiget Date: Thu Dec 9 19:27:27 2010 GMT Module: packages Tag: HEAD ---- Log message: - added gtk3.patch to fix compilation with gtk+ 2.91.6
---- Files affected: packages/gnome-desktop3: gnome-desktop3.spec (1.5 -> 1.6) , gtk3.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gnome-desktop3/gnome-desktop3.spec diff -u packages/gnome-desktop3/gnome-desktop3.spec:1.5 packages/gnome-desktop3/gnome-desktop3.spec:1.6 --- packages/gnome-desktop3/gnome-desktop3.spec:1.5 Thu Dec 2 22:52:38 2010 +++ packages/gnome-desktop3/gnome-desktop3.spec Thu Dec 9 20:27:22 2010 @@ -3,12 +3,13 @@ Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME Name: gnome-desktop3 Version: 2.91.3 -Release: 1 +Release: 2 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.91/gnome-desktop-%{version}.tar.bz2 # Source0-md5: a204082c65e09fc7278f7c401b895d6a Source1: pld-logo.svg +Patch0: gtk3.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.26.0 BuildRequires: autoconf @@ -109,6 +110,7 @@ %prep %setup -q -n gnome-desktop-%{version} +%patch0 -p1 sed -i -e 's/e...@shaw//' po/LINGUAS rm -f po/[email protected] @@ -187,6 +189,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2010/12/09 19:27:22 wiget +- added gtk3.patch to fix compilation with gtk+ 2.91.6 + Revision 1.5 2010/12/02 21:52:38 wiget - 2.91.3 ================================================================ Index: packages/gnome-desktop3/gtk3.patch diff -u /dev/null packages/gnome-desktop3/gtk3.patch:1.1 --- /dev/null Thu Dec 9 20:27:27 2010 +++ packages/gnome-desktop3/gtk3.patch Thu Dec 9 20:27:22 2010 @@ -0,0 +1,70 @@ +commit ff299bbed74e9603ea7c780de8805110d88dec28 +Author: Benjamin Otte <[email protected]> +Date: Wed Dec 1 12:37:59 2010 +0100 + + Replace GDK macro usage with proper function name + +diff --git a/libgnome-desktop/gnome-bg-crossfade.c b/libgnome-desktop/gnome-bg-crossfade.c +index df6a285..02a120e 100644 +--- a/libgnome-desktop/gnome-bg-crossfade.c ++++ b/libgnome-desktop/gnome-bg-crossfade.c +@@ -373,7 +373,7 @@ animations_are_disabled (GnomeBGCrossfade *fade) + static void + draw_background (GnomeBGCrossfade *fade) + { +- if (GDK_WINDOW_TYPE (fade->priv->window) == GDK_WINDOW_ROOT) { ++ if (gdk_window_get_window_type (fade->priv->window) == GDK_WINDOW_ROOT) { + XClearArea (GDK_WINDOW_XDISPLAY (fade->priv->window), + GDK_WINDOW_XID (fade->priv->window), + 0, 0, +@@ -494,7 +494,7 @@ gnome_bg_crossfade_start (GnomeBGCrossfade *fade, + g_return_if_fail (fade->priv->fading_surface != NULL); + g_return_if_fail (fade->priv->end_surface != NULL); + g_return_if_fail (!gnome_bg_crossfade_is_started (fade)); +- g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN); ++ g_return_if_fail (gdk_window_get_window_type (window) != GDK_WINDOW_FOREIGN); + + source = g_timeout_source_new (1000 / 60.0); + g_source_set_callback (source, +commit 24863ae9ea04dec397e41892cff21ae5ce9cef38 +Author: Benjamin Otte <[email protected]> +Date: Thu Dec 2 22:02:16 2010 +0100 + + rr: Use gdk_x11_window_get_xid() + + ... instead of removed gdk_x11_drawable_get_xid() + +diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c +index 7e8bc22..6b8379b 100644 +--- a/libgnome-desktop/gnome-rr.c ++++ b/libgnome-desktop/gnome-rr.c +@@ -668,7 +668,7 @@ gnome_rr_screen_new (GdkScreen *gdk_screen, + + screen->gdk_screen = gdk_screen; + screen->gdk_root = gdk_screen_get_root_window (gdk_screen); +- screen->xroot = gdk_x11_drawable_get_xid (screen->gdk_root); ++ screen->xroot = gdk_x11_window_get_xid (screen->gdk_root); + screen->xdisplay = dpy; + screen->xscreen = gdk_x11_screen_get_xscreen (screen->gdk_screen); + screen->connector_type_atom = XInternAtom (dpy, "ConnectorType", FALSE); +commit 260f6d2431088c5cd0ad1eb8d57f0ec994240f08 +Author: Benjamin Otte <[email protected]> +Date: Tue Nov 30 22:25:03 2010 +0100 + + Remove unnecessary cast + + The symbol will be removed soon, so better get rid of it. + +diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c +index 27aea30..76c61a8 100644 +--- a/libgnome-desktop/gnome-bg.c ++++ b/libgnome-desktop/gnome-bg.c +@@ -1094,7 +1094,7 @@ gnome_bg_create_surface (GnomeBG *bg, + + pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, + width, height); +- gnome_bg_draw (bg, pixbuf, gdk_window_get_screen (GDK_DRAWABLE (window)), is_root); ++ gnome_bg_draw (bg, pixbuf, gdk_window_get_screen (window), is_root); + gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); + g_object_unref (pixbuf); + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-desktop3/gnome-desktop3.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
