r25978 - in /desktop/experimental/gnome-desktop3/debian: changelog patches/00git_no_GDK_DRAWABLE.patch patches/00git_no_GDK_WINDOW_TYPE.patch patches/00git_no_gdk_x11_drawable_get_xid.patch patches/series

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Fri Dec 17 23:35:07 UTC 2010 

Author: sjoerd
Date: Fri Dec 17 23:35:06 2010
New Revision: 25978

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25978
Log:
Merge ubuntu patches

Added:
    desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_DRAWABLE.patch
    desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_WINDOW_TYPE.patch
    desktop/experimental/gnome-desktop3/debian/patches/00git_no_gdk_x11_drawable_get_xid.patch
Modified:
    desktop/experimental/gnome-desktop3/debian/changelog
    desktop/experimental/gnome-desktop3/debian/patches/series

Modified: desktop/experimental/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/changelog?rev=25978&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/changelog [utf-8] Fri Dec 17 23:35:06 2010
@@ -1,10 +1,15 @@
 gnome-desktop3 (2.91.3-3) UNRELEASED; urgency=low
 
+  [ Sebastien Bacher ]
   * debian/control.in: updated the dpkg-dev build-depends
   * debian/rules:
     - use dpkg-vendor to set the distributor
 
- -- Sebastien Bacher <seb128 at debian.org>  Mon, 06 Dec 2010 15:16:46 +0100
+  [ Sjoerd Simons ]
+  * Merge patches to build against new GTK+ from the ubuntu packaging
+    (originally from git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Dec 2010 23:34:00 +0000
 
 gnome-desktop3 (2.91.3-2) experimental; urgency=low
 

Added: desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_DRAWABLE.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_DRAWABLE.patch?rev=25978&op=file
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_DRAWABLE.patch (added)
+++ desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_DRAWABLE.patch [utf-8] Fri Dec 17 23:35:06 2010
@@ -1,0 +1,22 @@
+From 260f6d2431088c5cd0ad1eb8d57f0ec994240f08 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Tue, 30 Nov 2010 21:25:03 +0000
+Subject: 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);
+ 	}
+--
+cgit v0.8.3.1

Added: desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_WINDOW_TYPE.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_WINDOW_TYPE.patch?rev=25978&op=file
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_WINDOW_TYPE.patch (added)
+++ desktop/experimental/gnome-desktop3/debian/patches/00git_no_GDK_WINDOW_TYPE.patch [utf-8] Fri Dec 17 23:35:06 2010
@@ -1,0 +1,30 @@
+From ff299bbed74e9603ea7c780de8805110d88dec28 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Wed, 01 Dec 2010 11:37:59 +0000
+Subject: 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,
+--
+cgit v0.8.3.1

Added: desktop/experimental/gnome-desktop3/debian/patches/00git_no_gdk_x11_drawable_get_xid.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/patches/00git_no_gdk_x11_drawable_get_xid.patch?rev=25978&op=file
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/patches/00git_no_gdk_x11_drawable_get_xid.patch (added)
+++ desktop/experimental/gnome-desktop3/debian/patches/00git_no_gdk_x11_drawable_get_xid.patch [utf-8] Fri Dec 17 23:35:06 2010
@@ -1,0 +1,22 @@
+From 24863ae9ea04dec397e41892cff21ae5ce9cef38 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Thu, 02 Dec 2010 21:02:16 +0000
+Subject: 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);
+--
+cgit v0.8.3.1

Modified: desktop/experimental/gnome-desktop3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/patches/series?rev=25978&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/patches/series [utf-8] Fri Dec 17 23:35:06 2010
@@ -1,1 +1,4 @@
+00git_no_GDK_DRAWABLE.patch
+00git_no_GDK_WINDOW_TYPE.patch
+00git_no_gdk_x11_drawable_get_xid.patch
 99_ltmain_as-needed.patch

More information about the pkg-gnome-commits mailing list