r26037 - in /packages/experimental/gnome-shell/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sat Dec 18 23:41:57 UTC 2010
Author: pochu
Date: Sat Dec 18 23:41:57 2010
New Revision: 26037
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26037
Log:
* debian/patches/02_fix_build_with_latest_gtk.patch:
- Patch from upstream git, fix build with GTK+ 2.91.6.
* debian/control.in:
- Bump the libgtk3.0-dev accordingly.
* debian/patches/*.diff:
- Renamed to debian/patches/*.patch.
Added:
packages/experimental/gnome-shell/debian/patches/01_favorite_apps.patch
- copied unchanged from r25988, packages/experimental/gnome-shell/debian/patches/01_favorite_apps.diff
packages/experimental/gnome-shell/debian/patches/02_fix_build_with_latest_gtk.patch
packages/experimental/gnome-shell/debian/patches/03_fix_dconf_service_location.patch
- copied unchanged from r25988, packages/experimental/gnome-shell/debian/patches/03_fix_dconf_service_location.diff
Removed:
packages/experimental/gnome-shell/debian/patches/01_favorite_apps.diff
packages/experimental/gnome-shell/debian/patches/03_fix_dconf_service_location.diff
Modified:
packages/experimental/gnome-shell/debian/changelog
packages/experimental/gnome-shell/debian/control
packages/experimental/gnome-shell/debian/control.in
packages/experimental/gnome-shell/debian/patches/series
Modified: packages/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/changelog?rev=26037&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/changelog [utf-8] Sat Dec 18 23:41:57 2010
@@ -21,6 +21,14 @@
* debian/control.in: Add Vcs-* fields
* debian/watch: Add watch file
+ [ Emilio Pozuelo Monfort ]
+ * debian/patches/02_fix_build_with_latest_gtk.patch:
+ - Patch from upstream git, fix build with GTK+ 2.91.6.
+ * debian/control.in:
+ - Bump the libgtk3.0-dev accordingly.
+ * debian/patches/*.diff:
+ - Renamed to debian/patches/*.patch.
+
-- Laurent Bigonville <bigon at debian.org> Thu, 16 Dec 2010 14:32:31 +0100
gnome-shell (2.31.5-2) experimental; urgency=low
Modified: packages/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control?rev=26037&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control [utf-8] Sat Dec 18 23:41:57 2010
@@ -33,7 +33,7 @@
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-menu-dev,
libgstreamer0.10-dev (>= 0.10.16),
- libgtk3.0-dev (>= 2.91.0),
+ libgtk3.0-dev (>= 2.91.6),
libstartup-notification0-dev,
libmutter-dev (>= 2.91.0),
librsvg2-dev,
Modified: packages/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control.in?rev=26037&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control.in [utf-8] Sat Dec 18 23:41:57 2010
@@ -28,7 +28,7 @@
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-menu-dev,
libgstreamer0.10-dev (>= 0.10.16),
- libgtk3.0-dev (>= 2.91.0),
+ libgtk3.0-dev (>= 2.91.6),
libstartup-notification0-dev,
libmutter-dev (>= 2.91.0),
librsvg2-dev,
Added: packages/experimental/gnome-shell/debian/patches/02_fix_build_with_latest_gtk.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/02_fix_build_with_latest_gtk.patch?rev=26037&op=file
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/02_fix_build_with_latest_gtk.patch (added)
+++ packages/experimental/gnome-shell/debian/patches/02_fix_build_with_latest_gtk.patch [utf-8] Sat Dec 18 23:41:57 2010
@@ -1,0 +1,80 @@
+From 7ce65e421b0123d3a86fa26aca5f991c5987f45e Mon Sep 17 00:00:00 2001
+From: Jason D. Clinton <me at jasonclinton.com>
+Date: Thu, 02 Dec 2010 22:07:34 +0000
+Subject: Fix compilation against latest GTK+-3 changes
+
+GDK_WINDOW_XWINDOW has been removed. All calls should use
+gdk_x11_window_get_xid() instead.
+---
+diff --git a/src/shell-embedded-window.c b/src/shell-embedded-window.c
+index a3b9153..01a5a4d 100644
+--- a/src/shell-embedded-window.c
++++ b/src/shell-embedded-window.c
+@@ -106,7 +106,7 @@ shell_embedded_window_realize (GtkWidget *widget)
+ * modifying the GDK hierarchy.
+ */
+ XReparentWindow (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)),
+- GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
++ gdk_x11_window_get_xid (gtk_widget_get_window (widget)),
+ window->priv->stage_xwindow,
+ window->priv->position.x, window->priv->position.y);
+ }
+diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c
+index c138418..a7c7bbe 100644
+--- a/src/shell-gtk-embed.c
++++ b/src/shell-gtk-embed.c
+@@ -39,7 +39,7 @@ shell_gtk_embed_on_window_realize (GtkWidget *widget,
+ * screen.
+ */
+ clutter_x11_texture_pixmap_set_window (CLUTTER_X11_TEXTURE_PIXMAP (embed),
+- GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
++ gdk_x11_window_get_xid (gtk_widget_get_window (widget)),
+ FALSE);
+ }
+
+diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c
+index e5cc2a6..37db2e0 100644
+--- a/src/tray/na-tray-child.c
++++ b/src/tray/na-tray-child.c
+@@ -420,7 +420,7 @@ na_tray_child_force_redraw (NaTrayChild *child)
+ gtk_widget_get_allocation (widget, &allocation);
+
+ xev.xexpose.type = Expose;
+- xev.xexpose.window = GDK_WINDOW_XWINDOW (plug_window);
++ xev.xexpose.window = gdk_x11_window_get_xid (plug_window);
+ xev.xexpose.x = 0;
+ xev.xexpose.y = 0;
+ xev.xexpose.width = allocation.width;
+diff --git a/src/tray/na-tray-manager.c b/src/tray/na-tray-manager.c
+index bccda63..64300bc 100644
+--- a/src/tray/na-tray-manager.c
++++ b/src/tray/na-tray-manager.c
+@@ -601,7 +601,7 @@ na_tray_manager_set_orientation_property (NaTrayManager *manager)
+ SYSTEM_TRAY_ORIENTATION_VERT;
+
+ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+- GDK_WINDOW_XWINDOW (window),
++ gdk_x11_window_get_xid (window),
+ orientation_atom,
+ XA_CARDINAL, 32,
+ PropModeReplace,
+@@ -646,7 +646,7 @@ na_tray_manager_set_visual_property (NaTrayManager *manager)
+ data[0] = XVisualIDFromVisual (xvisual);
+
+ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+- GDK_WINDOW_XWINDOW (window),
++ gdk_x11_window_get_xid (window),
+ visual_atom,
+ XA_VISUALID, 32,
+ PropModeReplace,
+@@ -724,7 +724,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
+ xev.data.l[0] = timestamp;
+ xev.data.l[1] = gdk_x11_atom_to_xatom_for_display (display,
+ manager->selection_atom);
+- xev.data.l[2] = GDK_WINDOW_XWINDOW (window);
++ xev.data.l[2] = gdk_x11_window_get_xid (window);
+ xev.data.l[3] = 0; /* manager specific data */
+ xev.data.l[4] = 0; /* manager specific data */
+
+--
+cgit v0.8.3.1
Modified: packages/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/series?rev=26037&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/patches/series [utf-8] Sat Dec 18 23:41:57 2010
@@ -1,2 +1,3 @@
-01_favorite_apps.diff
-03_fix_dconf_service_location.diff
+01_favorite_apps.patch
+02_fix_build_with_latest_gtk.patch
+03_fix_dconf_service_location.patch
More information about the pkg-gnome-commits
mailing list