[libmx/f16] Make GAction compile

Bastien Nocera hadess at fedoraproject.org
Thu Oct 6 16:35:23 UTC 2011


commit 4f4b20286c662243f5e57b5ef87722ab8030b67c
Author: Bastien Nocera <hadess at hadess.net>
Date:   Thu Oct 6 17:35:20 2011 +0100

    Make GAction compile

 0001-GAction-API-changed-in-2.29.90.patch |   28 ++++++++++++++++++++++++++++
 libmx.spec                                |    3 +++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/0001-GAction-API-changed-in-2.29.90.patch b/0001-GAction-API-changed-in-2.29.90.patch
new file mode 100644
index 0000000..88dd174
--- /dev/null
+++ b/0001-GAction-API-changed-in-2.29.90.patch
@@ -0,0 +1,28 @@
+From b606c6afe84e9f50ae0877249e1d797c1230651b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 6 Oct 2011 17:34:04 +0100
+Subject: [PATCH] GAction API changed in 2.29.90
+
+(or earlier, but it's the one we're trying to compile against)
+---
+ mx/mx-action.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mx/mx-action.c b/mx/mx-action.c
+index 0faf5eb..9568a31 100644
+--- a/mx/mx-action.c
++++ b/mx/mx-action.c
+@@ -204,8 +204,8 @@ g_action_iface_init (GActionInterface *iface)
+   iface->get_state_hint = mx_action_get_state_hint;
+   iface->get_enabled = mx_action_get_enabled;
+   iface->get_state = mx_action_get_state;
+-  /* the set_state virtual function was renamed to change_state in glib 2.30 */
+-#if GLIB_CHECK_VERSION (2, 30, 0)
++  /* the set_state virtual function was renamed to change_state in glib 2.29.90 */
++#if GLIB_CHECK_VERSION (2, 29, 90)
+   iface->change_state = mx_action_set_state;
+ #else
+   iface->set_state = mx_action_set_state;
+-- 
+1.7.6.2
+
diff --git a/libmx.spec b/libmx.spec
index a9678d9..7f548de 100644
--- a/libmx.spec
+++ b/libmx.spec
@@ -19,6 +19,8 @@ BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: gtk-doc
 
+Patch0: 0001-GAction-API-changed-in-2.29.90.patch
+
 %description
 Mx is a clutter widget toolkit that provides a set of standard user interface 
 elements, including buttons, progress bars, tooltips, scroll bars and others. 
@@ -49,6 +51,7 @@ toolkit, currently used primarily by Moblin.
 
 %prep
 %setup -q -n mx-%{version}
+%patch0 -p1 -b .gaction
 
 %build
 %configure --disable-static --enable-introspection --enable-gtk-doc


More information about the scm-commits mailing list