r26036 - in /packages/experimental/mutter/debian: changelog control control.in patches/02_gdk_removed_macro.patch patches/03_handle_new_gtk_states.patch patches/04_fix_gradient_example.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sat Dec 18 23:39:03 UTC 2010
Author: pochu
Date: Sat Dec 18 23:39:03 2010
New Revision: 26036
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26036
Log:
* debian/patches/02_gdk_removed_macro.patch,
* debian/patches/03_handle_new_gtk_states.patch,
* debian/patches/04_fix_gradient_example.patch:
- Patches from upstream git, fix the build with latest GTK+ 3.
* debian/control.in:
- Bump the libgtk3.0-dev build dependency accordingly.
Added:
packages/experimental/mutter/debian/patches/02_gdk_removed_macro.patch
packages/experimental/mutter/debian/patches/03_handle_new_gtk_states.patch
packages/experimental/mutter/debian/patches/04_fix_gradient_example.patch
Modified:
packages/experimental/mutter/debian/changelog
packages/experimental/mutter/debian/control
packages/experimental/mutter/debian/control.in
packages/experimental/mutter/debian/patches/series
Modified: packages/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/changelog?rev=26036&op=diff
==============================================================================
--- packages/experimental/mutter/debian/changelog [utf-8] (original)
+++ packages/experimental/mutter/debian/changelog [utf-8] Sat Dec 18 23:39:03 2010
@@ -1,3 +1,14 @@
+mutter (2.91.3-3) experimental; urgency=low
+
+ * debian/patches/02_gdk_removed_macro.patch,
+ * debian/patches/03_handle_new_gtk_states.patch,
+ * debian/patches/04_fix_gradient_example.patch:
+ - Patches from upstream git, fix the build with latest GTK+ 3.
+ * debian/control.in:
+ - Bump the libgtk3.0-dev build dependency accordingly.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 18 Dec 2010 23:39:24 +0000
+
mutter (2.91.3-2) experimental; urgency=low
* Update to the new gir policy:
Modified: packages/experimental/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/control?rev=26036&op=diff
==============================================================================
--- packages/experimental/mutter/debian/control [utf-8] (original)
+++ packages/experimental/mutter/debian/control [utf-8] Sat Dec 18 23:39:03 2010
@@ -12,7 +12,7 @@
debhelper (>= 5),
dh-autoreconf,
intltool (>= 0.34.90),
- libgtk3.0-dev (>= 2.91.3),
+ libgtk3.0-dev (>= 2.91.6),
gir1.2-gtk-3.0,
gir1.2-clutter-1.0 (>= 1.4.0),
gir1.2-json-glib-1.0 (>= 0.12.0-1~),
Modified: packages/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/control.in?rev=26036&op=diff
==============================================================================
--- packages/experimental/mutter/debian/control.in [utf-8] (original)
+++ packages/experimental/mutter/debian/control.in [utf-8] Sat Dec 18 23:39:03 2010
@@ -7,7 +7,7 @@
debhelper (>= 5),
dh-autoreconf,
intltool (>= 0.34.90),
- libgtk3.0-dev (>= 2.91.3),
+ libgtk3.0-dev (>= 2.91.6),
gir1.2-gtk-3.0,
gir1.2-clutter-1.0 (>= 1.4.0),
gir1.2-json-glib-1.0 (>= 0.12.0-1~),
Added: packages/experimental/mutter/debian/patches/02_gdk_removed_macro.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/patches/02_gdk_removed_macro.patch?rev=26036&op=file
==============================================================================
--- packages/experimental/mutter/debian/patches/02_gdk_removed_macro.patch (added)
+++ packages/experimental/mutter/debian/patches/02_gdk_removed_macro.patch [utf-8] Sat Dec 18 23:39:03 2010
@@ -1,0 +1,72 @@
+From 8994e621f720ca1897d86596564dc8e9316b052d Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Thu, 02 Dec 2010 14:51:36 +0000
+Subject: Replace some GDK X11 calls with future-proof ones
+
+GTK is about to clean up its code and remove duplicate macros and
+GdkDrawable usage. To prepare for that landing, we use the future-safe
+versions of the same calls.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=636302
+---
+diff --git a/src/tools/mutter-window-demo.c b/src/tools/mutter-window-demo.c
+index 5e8c5ca..2b8991e 100644
+--- a/src/tools/mutter-window-demo.c
++++ b/src/tools/mutter-window-demo.c
+@@ -51,7 +51,7 @@ set_gdk_window_struts (GdkWindow *window,
+ vals[11] = 800;
+
+ XChangeProperty (GDK_WINDOW_XDISPLAY (window),
+- GDK_WINDOW_XWINDOW (window),
++ GDK_WINDOW_XID (window),
+ XInternAtom (GDK_WINDOW_XDISPLAY (window),
+ "_NET_WM_STRUT_PARTIAL", False),
+ XA_CARDINAL, 32, PropModeReplace,
+@@ -125,7 +125,7 @@ set_gdk_window_type (GdkWindow *window,
+ type, False);
+
+ XChangeProperty (GDK_WINDOW_XDISPLAY (window),
+- GDK_WINDOW_XWINDOW (window),
++ GDK_WINDOW_XID (window),
+ XInternAtom (GDK_WINDOW_XDISPLAY (window), "_NET_WM_WINDOW_TYPE", False),
+ XA_ATOM, 32, PropModeReplace,
+ (guchar *)atoms,
+diff --git a/src/ui/menu.c b/src/ui/menu.c
+index 02f14d8..18324cb 100644
+--- a/src/ui/menu.c
++++ b/src/ui/menu.c
+@@ -401,10 +401,10 @@ meta_window_menu_new (MetaFrames *frames,
+ n_workspaces, active_workspace);
+
+ window = gtk_widget_get_window (GTK_WIDGET (frames));
+- display = gdk_x11_drawable_get_xdisplay (window);
++ display = GDK_WINDOW_XDISPLAY (window);
+
+ screen = gdk_window_get_screen (window);
+- xroot = GDK_DRAWABLE_XID (gdk_screen_get_root_window (screen));
++ xroot = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
+
+ submenu = gtk_menu_new ();
+
+diff --git a/src/ui/tile-preview.c b/src/ui/tile-preview.c
+index 214e1fa..3a0bbbd 100644
+--- a/src/ui/tile-preview.c
++++ b/src/ui/tile-preview.c
+@@ -195,7 +195,7 @@ meta_tile_preview_show (MetaTilePreview *preview,
+ gtk_widget_show (preview->preview_window);
+ window = gtk_widget_get_window (preview->preview_window);
+ meta_core_lower_beneath_focus_window (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+- GDK_WINDOW_XWINDOW (window),
++ GDK_WINDOW_XID (window),
+ gtk_get_current_event_time ());
+
+ old_rect.x = old_rect.y = 0;
+@@ -254,5 +254,5 @@ meta_tile_preview_get_xwindow (MetaTilePreview *preview,
+ if (create_serial)
+ *create_serial = preview->create_serial;
+
+- return GDK_WINDOW_XWINDOW (window);
++ return GDK_WINDOW_XID (window);
+ }
+--
+cgit v0.8.3.1
Added: packages/experimental/mutter/debian/patches/03_handle_new_gtk_states.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/patches/03_handle_new_gtk_states.patch?rev=26036&op=file
==============================================================================
--- packages/experimental/mutter/debian/patches/03_handle_new_gtk_states.patch (added)
+++ packages/experimental/mutter/debian/patches/03_handle_new_gtk_states.patch [utf-8] Sat Dec 18 23:39:03 2010
@@ -1,0 +1,49 @@
+From 544c8edd9e06e3144e36f89e847585cfe2f779f4 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Sat, 04 Dec 2010 22:19:44 +0000
+Subject: theme: Handle new GTK+ states
+
+---
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index f7ac4aa..1de6b62 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -6089,16 +6089,20 @@ meta_gradient_type_to_string (MetaGradientType type)
+ GtkStateType
+ meta_gtk_state_from_string (const char *str)
+ {
+- if (strcmp ("normal", str) == 0 || strcmp ("NORMAL", str) == 0)
++ if (g_ascii_strcasecmp ("normal", str) == 0)
+ return GTK_STATE_NORMAL;
+- else if (strcmp ("prelight", str) == 0 || strcmp ("PRELIGHT", str) == 0)
++ else if (g_ascii_strcasecmp ("prelight", str) == 0)
+ return GTK_STATE_PRELIGHT;
+- else if (strcmp ("active", str) == 0 || strcmp ("ACTIVE", str) == 0)
++ else if (g_ascii_strcasecmp ("active", str) == 0)
+ return GTK_STATE_ACTIVE;
+- else if (strcmp ("selected", str) == 0 || strcmp ("SELECTED", str) == 0)
++ else if (g_ascii_strcasecmp ("selected", str) == 0)
+ return GTK_STATE_SELECTED;
+- else if (strcmp ("insensitive", str) == 0 || strcmp ("INSENSITIVE", str) == 0)
++ else if (g_ascii_strcasecmp ("insensitive", str) == 0)
+ return GTK_STATE_INSENSITIVE;
++ else if (g_ascii_strcasecmp ("inconsistent", str) == 0)
++ return GTK_STATE_INCONSISTENT;
++ else if (g_ascii_strcasecmp ("focused", str) == 0)
++ return GTK_STATE_FOCUSED;
+ else
+ return -1; /* hack */
+ }
+@@ -6118,6 +6122,10 @@ meta_gtk_state_to_string (GtkStateType state)
+ return "SELECTED";
+ case GTK_STATE_INSENSITIVE:
+ return "INSENSITIVE";
++ case GTK_STATE_INCONSISTENT:
++ return "INCONSISTENT";
++ case GTK_STATE_FOCUSED:
++ return "FOCUSED";
+ }
+
+ return "<unknown>";
+--
+cgit v0.8.3.1
Added: packages/experimental/mutter/debian/patches/04_fix_gradient_example.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/patches/04_fix_gradient_example.patch?rev=26036&op=file
==============================================================================
--- packages/experimental/mutter/debian/patches/04_fix_gradient_example.patch (added)
+++ packages/experimental/mutter/debian/patches/04_fix_gradient_example.patch [utf-8] Sat Dec 18 23:39:03 2010
@@ -1,0 +1,210 @@
+From d746591894d6de2c334361ddb10de1f4219c3859 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Thu, 02 Dec 2010 14:50:02 +0000
+Subject: ui: Port testgradient example to GTK3
+
+https://bugzilla.gnome.org/show_bug.cgi?id=636301
+---
+diff --git a/src/ui/testgradient.c b/src/ui/testgradient.c
+index 2158984..eb20fa9 100644
+--- a/src/ui/testgradient.c
++++ b/src/ui/testgradient.c
+@@ -23,19 +23,17 @@
+ #include "gradient.h"
+ #include <gtk/gtk.h>
+
+-typedef void (* RenderGradientFunc) (GdkDrawable *drawable,
+- cairo_t *cr,
++typedef void (* RenderGradientFunc) (cairo_t *cr,
+ int width,
+ int height);
+
+ static void
+-draw_checkerboard (GdkDrawable *drawable,
+- int width,
+- int height)
++draw_checkerboard (cairo_t *cr,
++ int width,
++ int height)
+ {
+ gint i, j, xcount, ycount;
+ GdkColor color1, color2;
+- cairo_t *cr;
+
+ #define CHECK_SIZE 10
+ #define SPACING 2
+@@ -48,8 +46,6 @@ draw_checkerboard (GdkDrawable *drawable,
+ color2.green = 50000;
+ color2.blue = 50000;
+
+- cr = gdk_cairo_create (drawable);
+-
+ xcount = 0;
+ i = SPACING;
+ while (i < width)
+@@ -77,13 +73,10 @@ draw_checkerboard (GdkDrawable *drawable,
+ i += CHECK_SIZE + SPACING;
+ ++xcount;
+ }
+-
+- cairo_destroy (cr);
+ }
+
+ static void
+-render_simple (GdkDrawable *drawable,
+- cairo_t *cr,
++render_simple (cairo_t *cr,
+ int width, int height,
+ MetaGradientType type,
+ gboolean with_alpha)
+@@ -115,7 +108,7 @@ render_simple (GdkDrawable *drawable,
+ alphas, G_N_ELEMENTS (alphas),
+ META_GRADIENT_HORIZONTAL);
+
+- draw_checkerboard (drawable, width, height);
++ draw_checkerboard (cr , width, height);
+ }
+
+ gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+@@ -126,40 +119,35 @@ render_simple (GdkDrawable *drawable,
+ }
+
+ static void
+-render_vertical_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_vertical_func (cairo_t *cr,
+ int width, int height)
+ {
+- render_simple (drawable, cr, width, height, META_GRADIENT_VERTICAL, FALSE);
++ render_simple (cr, width, height, META_GRADIENT_VERTICAL, FALSE);
+ }
+
+ static void
+-render_horizontal_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_horizontal_func (cairo_t *cr,
+ int width, int height)
+ {
+- render_simple (drawable, cr, width, height, META_GRADIENT_HORIZONTAL, FALSE);
++ render_simple (cr, width, height, META_GRADIENT_HORIZONTAL, FALSE);
+ }
+
+ static void
+-render_diagonal_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_diagonal_func (cairo_t *cr,
+ int width, int height)
+ {
+- render_simple (drawable, cr, width, height, META_GRADIENT_DIAGONAL, FALSE);
++ render_simple (cr, width, height, META_GRADIENT_DIAGONAL, FALSE);
+ }
+
+ static void
+-render_diagonal_alpha_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_diagonal_alpha_func (cairo_t *cr,
+ int width, int height)
+ {
+- render_simple (drawable, cr, width, height, META_GRADIENT_DIAGONAL, TRUE);
++ render_simple (cr, width, height, META_GRADIENT_DIAGONAL, TRUE);
+ }
+
+ static void
+-render_multi (GdkDrawable *drawable,
+- cairo_t *cr,
++render_multi (cairo_t *cr,
+ int width, int height,
+ MetaGradientType type)
+ {
+@@ -186,32 +174,28 @@ render_multi (GdkDrawable *drawable,
+ }
+
+ static void
+-render_vertical_multi_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_vertical_multi_func (cairo_t *cr,
+ int width, int height)
+ {
+- render_multi (drawable, cr, width, height, META_GRADIENT_VERTICAL);
++ render_multi (cr, width, height, META_GRADIENT_VERTICAL);
+ }
+
+ static void
+-render_horizontal_multi_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_horizontal_multi_func (cairo_t *cr,
+ int width, int height)
+ {
+- render_multi (drawable, cr, width, height, META_GRADIENT_HORIZONTAL);
++ render_multi (cr, width, height, META_GRADIENT_HORIZONTAL);
+ }
+
+ static void
+-render_diagonal_multi_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_diagonal_multi_func (cairo_t *cr,
+ int width, int height)
+ {
+- render_multi (drawable, cr, width, height, META_GRADIENT_DIAGONAL);
++ render_multi (cr, width, height, META_GRADIENT_DIAGONAL);
+ }
+
+ static void
+-render_interwoven_func (GdkDrawable *drawable,
+- cairo_t *cr,
++render_interwoven_func (cairo_t *cr,
+ int width, int height)
+ {
+ GdkPixbuf *pixbuf;
+@@ -235,31 +219,22 @@ render_interwoven_func (GdkDrawable *drawable,
+ }
+
+ static gboolean
+-expose_callback (GtkWidget *widget,
+- GdkEventExpose *event,
+- gpointer data)
++draw_callback (GtkWidget *widget,
++ cairo_t *cr,
++ gpointer data)
+ {
+ RenderGradientFunc func = data;
+- GdkWindow *window;
+- GtkAllocation allocation;
+ GtkStyle *style;
+- cairo_t *cr;
+
+ style = gtk_widget_get_style (widget);
+- gtk_widget_get_allocation (widget, &allocation);
+
+- window = gtk_widget_get_window (widget);
+- cr = gdk_cairo_create (window);
+ gdk_cairo_set_source_color (cr, &style->fg[gtk_widget_get_state (widget)]);
+
+- (* func) (gtk_widget_get_window (widget),
+- cr,
+- allocation.width,
+- allocation.height);
+-
+- cairo_destroy (cr);
++ (* func) (cr,
++ gtk_widget_get_allocated_width (widget),
++ gtk_widget_get_allocated_height (widget));
+
+- return TRUE;
++ return FALSE;
+ }
+
+ static GtkWidget*
+@@ -280,8 +255,8 @@ create_gradient_window (const char *title,
+ gtk_window_set_default_size (GTK_WINDOW (window), 175, 175);
+
+ g_signal_connect (G_OBJECT (drawing_area),
+- "expose_event",
+- G_CALLBACK (expose_callback),
++ "draw",
++ G_CALLBACK (draw_callback),
+ func);
+
+ gtk_container_add (GTK_CONTAINER (window), drawing_area);
+--
+cgit v0.8.3.1
Modified: packages/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/patches/series?rev=26036&op=diff
==============================================================================
--- packages/experimental/mutter/debian/patches/series [utf-8] (original)
+++ packages/experimental/mutter/debian/patches/series [utf-8] Sat Dec 18 23:39:03 2010
@@ -1,1 +1,4 @@
01_Wcast-align.patch
+02_gdk_removed_macro.patch
+03_handle_new_gtk_states.patch
+04_fix_gradient_example.patch
More information about the pkg-gnome-commits
mailing list