[clutter-box2dmm: 1/4] Fixed compilation errors and rebased onto clutter-box2d 0.12 * clutter-box2dmm/src/box2d.hg: Some o

[Aidan Delaney <adelaney src gnome org>]

commit 11144d7579240d4c4a8c3e9a19d30ba831cda264
Author: Aidan Delaney <aidan phoric eu>
Date:   Tue Feb 21 20:56:36 2012 +0000

    Fixed compilation errors and rebased onto clutter-box2d 0.12
     * clutter-box2dmm/src/box2d.hg: Some of the methods use ClutterBox2DJoint which needs to be explicitly wrapped, commented these out
     * codegen/m4/convert.m4 : removed references to non existant files
     * configure.ac: Updated dependencies in to clutter-box2d-0.12

 clutter-box2d/src/box2d.hg |    7 ++++---
 codegen/m4/convert.m4      |    1 -
 configure.ac               |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/clutter-box2d/src/box2d.hg b/clutter-box2d/src/box2d.hg
index a5b0838..b2fb6bb 100644
--- a/clutter-box2d/src/box2d.hg
+++ b/clutter-box2d/src/box2d.hg
@@ -45,11 +45,12 @@ protected:
 public:
   _WRAP_CREATE()
 
-  _WRAP_METHOD(void set_simulating(bool simulating = true), clutter_box2d_set_simulating)
-  _WRAP_METHOD(bool get_simulating() const, clutter_box2d_get_simulating)
+  _WRAP_METHOD(void set_simulating(gboolean simulating = true), clutter_box2d_set_simulating)
+  // TODO: similar compile problem to below  _WRAP_METHOD(gboolean get_simulating() const, clutter_box2d_get_simulating)
 
   //TODO: Wrap ClutterBox2DJoint properly - ideally it would be a registered type, with hidden implementation.
 
+/* TODO: re-add these when the m4 macros are fixed to generate code that compiles
   _WRAP_METHOD(ClutterBox2DJoint* add_revolute_joint(const Glib::RefPtr<Clutter::Actor>& actor1, const Glib::RefPtr<Clutter::Actor>& actor2, const Clutter::Vertex& anchor1, const Clutter::Vertex& anchor2, double reference_angle), clutter_box2d_add_revolute_joint)
 
 
@@ -73,7 +74,7 @@ public:
 //TODO: Remove this conversion when the C API has been fixed. See http://bugzilla.o-hand.com/show_bug.cgi?id=1095
 #m4 _CONVERSION(`const Clutter::Vertex&', `ClutterVertex*', `const_cast<Clutter::Vertex&>($3).gobj()')
   _WRAP_METHOD(ClutterBox2DJoint* add_mouse_joint(const Glib::RefPtr<Clutter::Actor>& actor, const Clutter::Vertex& target), clutter_box2d_add_mouse_joint)
-
+*/
 
   void set_child_linear_velocity(const Glib::RefPtr<Clutter::Actor>& actor, const Clutter::Vertex& linear_velocity);
   Clutter::Vertex get_child_linear_velocity(const Glib::RefPtr<const Clutter::Actor>& actor) const;
diff --git a/codegen/m4/convert.m4 b/codegen/m4/convert.m4
index 75aed74..55c4d3a 100644
--- a/codegen/m4/convert.m4
+++ b/codegen/m4/convert.m4
@@ -2,5 +2,4 @@ dnl $Id: convert.m4,v 1.1 2002/04/14 14:53:01 murrayc Exp $
 
 # Override of the file of the same name in gtkmm.
 
-include(convert_gtkmm.m4)
 include(convert_clutter-box2dmm.m4)
diff --git a/configure.ac b/configure.ac
index d3d242c..3d544d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([clutter-box2dmm], [0.9.2],
+AC_INIT([clutter-box2dmm], [0.12.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=clutter-box2dmm],
         [clutter-box2dmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -31,7 +31,7 @@ AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 MM_PREREQ([0.8])
-MM_INIT_MODULE([clutter-box2dmm-0.10])
+MM_INIT_MODULE([clutter-box2dmm-0.12])
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([CLUTTER_BOX2DMM_SO_VERSION], [0:0:0])
@@ -41,7 +41,7 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([CLUTTER_BOX2DMM_MODULES], ['clutter-box2d-0.10 >= 0.10.0 cluttermm-1.0 >= 0.9.6'])
+AC_SUBST([CLUTTER_BOX2DMM_MODULES], ['clutter-box2d-0.12 >= 0.12.0 cluttermm-1.0 >= 1.0.0'])
 PKG_CHECK_MODULES([CLUTTER_BOX2DMM], [$CLUTTER_BOX2DMM_MODULES])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])