Hello community, here is the log from the commit of package mutter for openSUSE:Factory checked in at Fri Sep 24 00:39:27 CEST 2010. -------- --- mutter/mutter.changes 2010-09-09 23:10:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/mutter/mutter.changes 2010-09-18 13:30:51.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Sep 18 13:21:57 CEST 2010 - vuntz@opensuse.org + +- Add mutter-no-gdk_display.patch: stop using gdk_display that got + removed in recent GTK+ 3 versions. +- Add mutter-gdk-keys.patch: update the code after some API changes + in GDK 3. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mutter-gdk-keys.patch mutter-no-gdk_display.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ --- /var/tmp/diff_new_pack.1u9oBc/_old 2010-09-24 00:37:09.000000000 +0200 +++ /var/tmp/diff_new_pack.1u9oBc/_new 2010-09-24 00:37:09.000000000 +0200 @@ -33,11 +33,15 @@ License: GPLv2+ Group: System/GUI/GNOME Version: 2.31.5 -Release: 1 +Release: 2 Summary: Window and compositing manager based on Clutter Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM mutter-gdk-cairo.patch dimstar@opensuse.org -- Replace GDK drawing API with cairo, upstream git commit 08cfdcd & 0839c1 Patch0: mutter-gdk-cairo.patch +# PATCH-FIX-UPSTREAM mutter-no-gdk_display.patch vuntz@opensuse.org -- Stop using gdk_display, taken from git +Patch1: mutter-no-gdk_display.patch +# PATCH-FIX-UPSTREAM mutter-gdk-keys.patch vuntz@opensuse.org -- Update for GDK 3 API changes, taken from git +Patch2: mutter-gdk-keys.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity @@ -66,6 +70,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure \ ++++++ mutter-gdk-keys.patch ++++++

From 8a6b583cdcda3742bf31df9220c0256a838917b6 Mon Sep 17 00:00:00 2001 From: Florian Müllner <fmuellner@gnome.org> Date: Thu, 09 Sep 2010 15:01:52 +0000 Subject: Adjust for API break in gdkkeysyms.h

The key symbols were renamed to avoid namespace conflicts with gobject-introspection. --- diff --git a/src/gdk-compat.h b/src/gdk-compat.h index 31991e8..501b4f4 100644 --- a/src/gdk-compat.h +++ b/src/gdk-compat.h @@ -15,4 +15,10 @@ #endif /*GTK_CHECK_VERSION */ + +/* Compatibility with old GDK key symbols */ +#ifndef GDK_KEY_Escape +#define GDK_KEY_Escape GDK_Escape +#endif /* GDK_KEY_Escape */ + #endif /* __GDK_COMPAT_H__ */ diff --git a/src/tools/mutter-mag.c b/src/tools/mutter-mag.c index 23a0487..b45c538 100644 --- a/src/tools/mutter-mag.c +++ b/src/tools/mutter-mag.c @@ -28,6 +28,7 @@ #include <unistd.h> #include <stdlib.h> #include <math.h> +#include <gdk-compat.h> static GtkWidget *grab_widget = NULL; static GtkWidget *display_window = NULL; @@ -191,7 +192,7 @@ key_press (GtkWidget *invisible, GdkEventKey *event, gpointer data) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { shutdown_grab (); -- cgit v0.8.3.1 ++++++ mutter-no-gdk_display.patch ++++++ ++++ 886 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org