[libmx] - updated for clutter 1.4+

[Dan Horák]

commit 158b8d8ebef5009978b735f5b1b20b81ea6e1af9
Author: Dan Horák <dan at danny.cz>
Date:   Fri Dec 3 16:09:48 2010 +0100

    - updated for clutter 1.4+

 libmx.spec                 |    7 ++-
 mx-1.1.0-clutter-1.4.patch |  122 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletions(-)
---
diff --git a/libmx.spec b/libmx.spec
index 5092d4d..2679f40 100644
--- a/libmx.spec
+++ b/libmx.spec
@@ -1,12 +1,13 @@
 Name:          libmx
 Version:       1.1.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       A clutter widget toolkit
 
 Group:         System Environment/Libraries
 License:       LGPLv2
 URL:           http://www.clutter-project.org
 Source0:       http://source.clutter-project.org/sources/mx/1.0/mx-%{version}.tar.bz2
+Patch0:        mx-1.1.0-clutter-1.4.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-imcontext-devel
@@ -49,6 +50,7 @@ toolkit, currently used primarily by Moblin.
 
 %prep
 %setup -q -n mx-%{version}
+%patch0 -p1 -b .clutter15
 
 %build
 %configure --disable-static --enable-introspection --enable-gtk-doc --with-clutter-imcontext --with-clutter-gesture
@@ -90,6 +92,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/mx
 
 %changelog
+* Fri Dec 03 2010 Dan Horák <dan[at]danny.cz> 1.1.0-4
+- updated for clutter 1.4+
+
 * Wed Sep 29 2010 jkeating - 1.1.0-3
 - Rebuilt for gcc bug 634757
 
diff --git a/mx-1.1.0-clutter-1.4.patch b/mx-1.1.0-clutter-1.4.patch
new file mode 100644
index 0000000..57bcf45
--- /dev/null
+++ b/mx-1.1.0-clutter-1.4.patch
@@ -0,0 +1,122 @@
+diff -up mx-1.1.0/mx/mx-button.c.orig mx-1.1.0/mx/mx-button.c
+--- mx-1.1.0/mx/mx-button.c.orig	2010-12-03 16:00:16.000000000 +0100
++++ mx-1.1.0/mx/mx-button.c	2010-12-03 16:00:43.000000000 +0100
+@@ -344,7 +344,7 @@ static gboolean
+ mx_button_key_press (ClutterActor    *actor,
+                      ClutterKeyEvent *event)
+ {
+-  if (event->keyval == CLUTTER_Return || event->keyval == CLUTTER_space)
++  if (event->keyval == CLUTTER_KEY_Return || event->keyval == CLUTTER_KEY_space)
+     {
+       mx_button_push (MX_BUTTON (actor), NULL);
+ 
+@@ -358,7 +358,7 @@ static gboolean
+ mx_button_key_release (ClutterActor    *actor,
+                        ClutterKeyEvent *event)
+ {
+-  if (event->keyval == CLUTTER_Return || event->keyval == CLUTTER_space)
++  if (event->keyval == CLUTTER_KEY_Return || event->keyval == CLUTTER_KEY_space)
+     {
+       mx_button_pull (MX_BUTTON (actor));
+ 
+diff -up mx-1.1.0/mx/mx-combo-box.c.orig mx-1.1.0/mx/mx-combo-box.c
+--- mx-1.1.0/mx/mx-combo-box.c.orig	2010-12-03 16:01:01.000000000 +0100
++++ mx-1.1.0/mx/mx-combo-box.c	2010-12-03 16:01:37.000000000 +0100
+@@ -544,12 +544,12 @@ mx_combo_box_key_press_event (ClutterAct
+ 
+   switch (event->keyval)
+     {
+-    case CLUTTER_Down:
++    case CLUTTER_KEY_Down:
+       mx_combo_box_set_index (MX_COMBO_BOX (actor),
+                               CLAMP (priv->index + 1, 0, n_items -1));
+       return TRUE;
+ 
+-    case CLUTTER_Up:
++    case CLUTTER_KEY_Up:
+       mx_combo_box_set_index (MX_COMBO_BOX (actor),
+                               CLAMP (priv->index - 1, 0, n_items -1));
+       return TRUE;
+diff -up mx-1.1.0/mx/mx-entry.c.orig mx-1.1.0/mx/mx-entry.c
+--- mx-1.1.0/mx/mx-entry.c.orig	2010-12-03 15:59:32.000000000 +0100
++++ mx-1.1.0/mx/mx-entry.c	2010-12-03 16:00:09.000000000 +0100
+@@ -675,7 +675,7 @@ mx_entry_key_press_event (ClutterActor  
+ 
+   /* paste */
+   if ((event->modifier_state & CLUTTER_CONTROL_MASK)
+-      && event->keyval == CLUTTER_v)
++      && event->keyval == CLUTTER_KEY_v)
+     {
+       MxClipboard *clipboard;
+ 
+@@ -688,7 +688,7 @@ mx_entry_key_press_event (ClutterActor  
+ 
+   /* copy */
+   if ((event->modifier_state & CLUTTER_CONTROL_MASK)
+-      && event->keyval == CLUTTER_c)
++      && event->keyval == CLUTTER_KEY_c)
+     {
+       MxClipboard *clipboard;
+       gchar *text;
+@@ -706,7 +706,7 @@ mx_entry_key_press_event (ClutterActor  
+ 
+   /* cut */
+   if ((event->modifier_state & CLUTTER_CONTROL_MASK)
+-      && event->keyval == CLUTTER_x)
++      && event->keyval == CLUTTER_KEY_x)
+     {
+       MxClipboard *clipboard;
+       gchar *text;
+@@ -728,7 +728,7 @@ mx_entry_key_press_event (ClutterActor  
+ 
+   /* undo */
+   if ((event->modifier_state & CLUTTER_CONTROL_MASK)
+-      && event->keyval == CLUTTER_z)
++      && event->keyval == CLUTTER_KEY_z)
+     {
+       gchar *str;
+ 
+@@ -951,7 +951,7 @@ mx_entry_store_undo_on_keypress (Clutter
+                                  ClutterKeyEvent *event,
+                                  MxEntry         *entry)
+ {
+-  if (event->keyval == CLUTTER_space)
++  if (event->keyval == CLUTTER_KEY_space)
+     {
+       /* store the text immediately */
+       if (entry->priv->undo_timeout_source)
+diff -up mx-1.1.0/mx/mx-focus-manager.c.orig mx-1.1.0/mx/mx-focus-manager.c
+--- mx-1.1.0/mx/mx-focus-manager.c.orig	2010-12-03 15:58:08.000000000 +0100
++++ mx-1.1.0/mx/mx-focus-manager.c	2010-12-03 15:59:17.000000000 +0100
+@@ -225,26 +225,26 @@ mx_focus_manager_event_cb (ClutterStage 
+   old_focus = priv->focused;
+   switch (event->key.keyval)
+     {
+-    case CLUTTER_Tab:
++    case CLUTTER_KEY_Tab:
+       if (event->key.modifier_state & CLUTTER_SHIFT_MASK)
+         mx_focus_manager_move_focus (manager, MX_FOCUS_DIRECTION_PREVIOUS);
+       else
+         mx_focus_manager_move_focus (manager, MX_FOCUS_DIRECTION_NEXT);
+       break;
+ 
+-    case CLUTTER_Right:
++    case CLUTTER_KEY_Right:
+       mx_focus_manager_move_focus (manager, MX_FOCUS_DIRECTION_RIGHT);
+       break;
+ 
+-    case CLUTTER_Left:
++    case CLUTTER_KEY_Left:
+       mx_focus_manager_move_focus (manager, MX_FOCUS_DIRECTION_LEFT);
+       break;
+ 
+-    case CLUTTER_Up:
++    case CLUTTER_KEY_Up:
+       mx_focus_manager_move_focus (manager, MX_FOCUS_DIRECTION_UP);
+       break;
+ 
+-    case CLUTTER_Down:
++    case CLUTTER_KEY_Down:
+       mx_focus_manager_move_focus (manager, MX_FOCUS_DIRECTION_DOWN);
+       break;
+