[clutter-gtkmm] 0.9.6, disable viewport to match glib, use gtkmm30

Tom Callaway spot at fedoraproject.org
Thu Sep 30 16:40:57 UTC 2010


commit 1d407bc8ce366abd8a19448b12539eaca8653dca
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Sep 30 12:40:54 2010 -0400

    0.9.6, disable viewport to match glib, use gtkmm30

 .gitignore                            |    1 +
 clutter-gtkmm-0.9.6-no-viewport.patch | 1412 +++++++++++++++++++++++++++++++++
 clutter-gtkmm.spec                    |   20 +-
 sources                               |    2 +-
 4 files changed, 1429 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 92e8975..c7c679b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 clutter-gtkmm-0.9.5.tar.bz2
+/clutter-gtkmm-0.9.6.tar.bz2
diff --git a/clutter-gtkmm-0.9.6-no-viewport.patch b/clutter-gtkmm-0.9.6-no-viewport.patch
new file mode 100644
index 0000000..f9d0a37
--- /dev/null
+++ b/clutter-gtkmm-0.9.6-no-viewport.patch
@@ -0,0 +1,1412 @@
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm.h.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm.h
+--- clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm.h.no-viewport	2010-09-29 15:23:35.070924139 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm.h	2010-09-29 15:23:38.132922944 -0400
+@@ -59,6 +59,5 @@
+ #include <clutter-gtkmm/embed.h>
+ #include <clutter-gtkmm/init.h>
+ #include <clutter-gtkmm/utility.h>
+-#include <clutter-gtkmm/viewport.h>
+ 
+ #endif /* !LIBCLUTTER_GTKMM_H */
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/Makefile.in.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/Makefile.in
+--- clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/Makefile.in.no-viewport	2010-09-29 15:22:12.582922131 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/Makefile.in	2010-09-29 15:22:26.123924839 -0400
+@@ -81,7 +81,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libclutter_gtkmm_ at CLUTTER_GTKMM_API_VERSION@_la_DEPENDENCIES =  \
+ 	$(am__DEPENDENCIES_1)
+-am__objects_1 = embed.lo viewport.lo
++am__objects_1 = embed.lo
+ am__objects_2 = $(am__objects_1) wrap_init.lo
+ am__objects_3 = init.lo utility.lo
+ am__objects_4 = $(am__objects_2) $(am__objects_3)
+@@ -282,7 +282,7 @@ files_defs = \
+ 	clutter-gtk_vfuncs.defs		\
+ 	clutter-gtk_docs.xml
+ 
+-files_hg = embed.hg viewport.hg
++files_hg = embed.hg
+ files_ccg = $(files_hg:.hg=.ccg)
+ files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc
+ files_built_h = $(files_hg:.hg=.h)
+@@ -395,7 +395,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/embed.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/init.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utility.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/viewport.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wrap_init.Plo at am__quote@
+ 
+ .cc.o:
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/private/viewport_p.h.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/private/viewport_p.h
+--- clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/private/viewport_p.h.no-viewport	2010-04-05 13:22:28.000000000 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/private/viewport_p.h	2010-09-29 15:21:44.477923932 -0400
+@@ -1,57 +0,0 @@
+-// -*- c++ -*-
+-// Generated by gtkmmproc -- DO NOT MODIFY!
+-#ifndef _CLUTTER_GTKMM_VIEWPORT_P_H
+-#define _CLUTTER_GTKMM_VIEWPORT_P_H
+-
+-
+-#include <cluttermm/private/actor_p.h>
+-
+-#include <glibmm/class.h>
+-
+-namespace Clutter
+-{
+-
+-namespace Gtk
+-{
+-
+-class Viewport_Class : public Glib::Class
+-{
+-public:
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+-  typedef Viewport CppObjectType;
+-  typedef GtkClutterViewport BaseObjectType;
+-  typedef GtkClutterViewportClass BaseClassType;
+-  typedef ::Clutter::Actor_Class CppClassParent;
+-  typedef ClutterActorClass BaseClassParent;
+-
+-  friend class Viewport;
+-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+-
+-  const Glib::Class& init();
+-
+-
+-  static void class_init_function(void* g_class, void* class_data);
+-
+-  static Glib::ObjectBase* wrap_new(GObject*);
+-
+-protected:
+-
+-#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-  //Callbacks (default signal handlers):
+-  //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
+-  //You could prevent the original default signal handlers being called by overriding the *_impl method.
+-#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-
+-  //Callbacks (virtual functions):
+-#ifdef GLIBMM_VFUNCS_ENABLED
+-#endif //GLIBMM_VFUNCS_ENABLED
+-};
+-
+-
+-} // namespace Gtk
+-
+-} // namespace Clutter
+-
+-
+-#endif /* _CLUTTER_GTKMM_VIEWPORT_P_H */
+-
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.cc.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.cc
+--- clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.cc.no-viewport	2010-05-05 17:39:22.000000000 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.cc	2010-09-29 15:21:39.931924757 -0400
+@@ -1,177 +0,0 @@
+-// Generated by gtkmmproc -- DO NOT MODIFY!
+-
+-
+-#include <clutter-gtkmm/viewport.h>
+-#include <clutter-gtkmm/private/viewport_p.h>
+-
+-/* Copyright (C) 2007 The cluttermm Development Team
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-#include <clutter-gtk/clutter-gtk.h>
+-
+-namespace Clutter
+-{
+-namespace Gtk
+-{
+-
+-} // namespace Gtk
+-} // namespace Clutter
+-
+-namespace
+-{
+-} // anonymous namespace
+-
+-
+-namespace Glib
+-{
+-
+-Glib::RefPtr<Clutter::Gtk::Viewport> wrap(GtkClutterViewport* object, bool take_copy)
+-{
+-  return Glib::RefPtr<Clutter::Gtk::Viewport>( dynamic_cast<Clutter::Gtk::Viewport*> (Glib::wrap_auto ((GObject*)(object), take_copy)) );
+-  //We use dynamic_cast<> in case of multiple inheritance.
+-}
+-
+-} /* namespace Glib */
+-
+-
+-namespace Clutter
+-{
+-
+-namespace Gtk
+-{
+-
+-
+-/* The *_Class implementation: */
+-
+-const Glib::Class& Viewport_Class::init()
+-{
+-  if(!gtype_) // create the GType if necessary
+-  {
+-    // Glib::Class has to know the class init function to clone custom types.
+-    class_init_func_ = &Viewport_Class::class_init_function;
+-
+-    // This is actually just optimized away, apparently with no harm.
+-    // Make sure that the parent type has been created.
+-    //CppClassParent::CppObjectType::get_type();
+-
+-    // Create the wrapper type, with the same class/instance size as the base type.
+-    register_derived_type(gtk_clutter_viewport_get_type());
+-
+-    // Add derived versions of interfaces, if the C type implements any interfaces:
+-
+-  }
+-
+-  return *this;
+-}
+-
+-
+-void Viewport_Class::class_init_function(void* g_class, void* class_data)
+-{
+-  BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
+-  CppClassParent::class_init_function(klass, class_data);
+-
+-#ifdef GLIBMM_VFUNCS_ENABLED
+-#endif //GLIBMM_VFUNCS_ENABLED
+-
+-#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-}
+-
+-#ifdef GLIBMM_VFUNCS_ENABLED
+-#endif //GLIBMM_VFUNCS_ENABLED
+-
+-#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-
+-
+-Glib::ObjectBase* Viewport_Class::wrap_new(GObject* object)
+-{
+-  return new Viewport((GtkClutterViewport*)object);
+-}
+-
+-
+-/* The implementation: */
+-
+-GtkClutterViewport* Viewport::gobj_copy()
+-{
+-  reference();
+-  return gobj();
+-}
+-
+-Viewport::Viewport(const Glib::ConstructParams& construct_params)
+-:
+-  ::Clutter::Actor(construct_params)
+-{
+-
+-}
+-
+-Viewport::Viewport(GtkClutterViewport* castitem)
+-:
+-  ::Clutter::Actor((ClutterActor*)(castitem))
+-{}
+-
+-
+-Viewport::~Viewport()
+-{}
+-
+-
+-Viewport::CppClassType Viewport::viewport_class_; // initialize static member
+-
+-GType Viewport::get_type()
+-{
+-  return viewport_class_.init().get_type();
+-}
+-
+-
+-GType Viewport::get_base_type()
+-{
+-  return gtk_clutter_viewport_get_type();
+-}
+-
+-
+-Viewport::Viewport(::Gtk::Adjustment* h_adjustment, ::Gtk::Adjustment* v_adjustment, ::Gtk::Adjustment* z_adjustment)
+-:
+-  // Mark this class as non-derived to allow C++ vfuncs to be skipped.
+-  Glib::ObjectBase(0),
+-  ::Clutter::Actor(Glib::ConstructParams(viewport_class_.init(), "h_adjustment", (h_adjustment ? (h_adjustment)->gobj() : 0), "v_adjustment", (v_adjustment ? (v_adjustment)->gobj() : 0), "z_adjustment", (z_adjustment ? (z_adjustment)->gobj() : 0), static_cast<char*>(0)))
+-{
+-  
+-
+-}
+-
+-Glib::RefPtr<Viewport> Viewport::create(::Gtk::Adjustment* h_adjustment, ::Gtk::Adjustment* v_adjustment, ::Gtk::Adjustment* z_adjustment)
+-{
+-  return Glib::RefPtr<Viewport>( new Viewport(h_adjustment, v_adjustment, z_adjustment) );
+-}
+-void Viewport::get_origin(float& x, float& y, float& z) const
+-{
+-gtk_clutter_viewport_get_origin(const_cast<GtkClutterViewport*>(gobj()), &(x), &(y), &(z)); 
+-}
+-
+-
+-#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-
+-#ifdef GLIBMM_VFUNCS_ENABLED
+-#endif //GLIBMM_VFUNCS_ENABLED
+-
+-
+-} // namespace Gtk
+-
+-} // namespace Clutter
+-
+-
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.h.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.h
+--- clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.h.no-viewport	2010-05-05 17:44:00.000000000 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/viewport.h	2010-09-29 15:28:46.596924185 -0400
+@@ -1,173 +0,0 @@
+-// -*- c++ -*-
+-// Generated by gtkmmproc -- DO NOT MODIFY!
+-#ifndef _CLUTTER_GTKMM_VIEWPORT_H
+-#define _CLUTTER_GTKMM_VIEWPORT_H
+-
+-
+-#include <glibmm.h>
+-
+-/* Copyright (C) 2007 The cluttermm Development Team
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-#include <cluttermm/actor.h>
+-#include <gtkmm/adjustment.h>
+-
+-
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+-typedef struct _GtkClutterViewport GtkClutterViewport;
+-typedef struct _GtkClutterViewportClass GtkClutterViewportClass;
+-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+-
+-
+-namespace Clutter
+-{
+-
+-namespace Gtk
+-{ class Viewport_Class; } // namespace Gtk
+-
+-} // namespace Clutter
+-namespace Clutter
+-{
+-namespace Gtk
+-{
+-
+-/** This is a scrollable actor that can contain a single Clutter::Actor.
+- *
+- * Using two Gtk::Adjustments it is possible to control the visible area of the 
+- * child actor if the size of the viewport is smaller than the size of the child.
+- *
+- * The Gtk::Adjustments used to control the horizontal and vertical scrolling 
+- * can be attached to a Gtk::Scrollbar subclass, like Gtk::HScrollbar or Gtk::VScrollbar.
+- *
+- * The Viewport can be used inside any Clutter::Container implementation.
+- */
+-
+-class Viewport :
+-  public ::Clutter::Actor
+-{
+-  
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+-
+-public:
+-  typedef Viewport CppObjectType;
+-  typedef Viewport_Class CppClassType;
+-  typedef GtkClutterViewport BaseObjectType;
+-  typedef GtkClutterViewportClass BaseClassType;
+-
+-private:  friend class Viewport_Class;
+-  static CppClassType viewport_class_;
+-
+-private:
+-  // noncopyable
+-  Viewport(const Viewport&);
+-  Viewport& operator=(const Viewport&);
+-
+-protected:
+-  explicit Viewport(const Glib::ConstructParams& construct_params);
+-  explicit Viewport(GtkClutterViewport* castitem);
+-
+-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+-
+-public:
+-  virtual ~Viewport();
+-
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+-  static GType get_type()      G_GNUC_CONST;
+-
+-
+-  static GType get_base_type() G_GNUC_CONST;
+-#endif
+-
+-  ///Provides access to the underlying C GObject.
+-  GtkClutterViewport*       gobj()       { return reinterpret_cast<GtkClutterViewport*>(gobject_); }
+-
+-  ///Provides access to the underlying C GObject.
+-  const GtkClutterViewport* gobj() const { return reinterpret_cast<GtkClutterViewport*>(gobject_); }
+-
+-  ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs.
+-  GtkClutterViewport* gobj_copy();
+-
+-private:
+-
+-
+-protected:
+- 
+-
+-  explicit Viewport(::Gtk::Adjustment* h_adjustment = 0, ::Gtk::Adjustment* v_adjustment = 0, ::Gtk::Adjustment* z_adjustment = 0);
+-
+-public:
+-
+-  
+-  static Glib::RefPtr<Viewport> create(::Gtk::Adjustment* h_adjustment =  0, ::Gtk::Adjustment* v_adjustment =  0, ::Gtk::Adjustment* z_adjustment =  0);
+-
+-  
+-  /** Retrieves the current translation factor ("origin") used when
+-   * displaying the child of @a viewport.
+-   * 
+-   * @newin{1,0}.
+-   * @param x Return location for the X origin in pixels, or <tt>0</tt>.
+-   * @param y Return location for the Y origin in pixels, or <tt>0</tt>.
+-   * @param z Return location for the Z origin in pixels, or <tt>0</tt>.
+-   */
+-  void get_origin(float& x, float& y, float& z) const;
+-
+-  //gtkmmproc error: h-adjustment : property defs lookup failed.
+-  //gtkmmproc error: v-adjustment : property defs lookup failed.
+-  //gtkmmproc error: z-adjustment : property defs lookup failed.
+-
+-
+-public:
+-
+-public:
+-  //C++ methods used to invoke GTK+ virtual functions:
+-#ifdef GLIBMM_VFUNCS_ENABLED
+-#endif //GLIBMM_VFUNCS_ENABLED
+-
+-protected:
+-  //GTK+ Virtual Functions (override these to change behaviour):
+-#ifdef GLIBMM_VFUNCS_ENABLED
+-#endif //GLIBMM_VFUNCS_ENABLED
+-
+-  //Default Signal Handlers::
+-#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+-
+-
+-};
+-
+-} // namespace Gtk
+-} // namespace Clutter
+-
+-//vim: ts=2,sw=2
+-
+-
+-namespace Glib
+-{
+-  /** A Glib::wrap() method for this object.
+-   * 
+-   * @param object The C instance.
+-   * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
+-   * @result A C++ instance that wraps this C instance.
+-   *
+-   * @relates Clutter::Gtk::Viewport
+-   */
+-  Glib::RefPtr<Clutter::Gtk::Viewport> wrap(GtkClutterViewport* object, bool take_copy = false);
+-}
+-
+-
+-#endif /* _CLUTTER_GTKMM_VIEWPORT_H */
+-
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/wrap_init.cc.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/wrap_init.cc
+--- clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/wrap_init.cc.no-viewport	2010-09-29 15:22:53.878923882 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/clutter-gtkmm/wrap_init.cc	2010-09-29 15:23:03.707925076 -0400
+@@ -13,7 +13,6 @@
+ // #include the widget headers so that we can call the get_type() static methods:
+ 
+ #include "embed.h"
+-#include "viewport.h"
+ 
+ extern "C"
+ {
+@@ -21,7 +20,6 @@ extern "C"
+ //Declarations of the *_get_type() functions:
+ 
+ GType gtk_clutter_embed_get_type(void);
+-GType gtk_clutter_viewport_get_type(void);
+ 
+ //Declarations of the *_error_quark() functions:
+ 
+@@ -31,7 +29,6 @@ GType gtk_clutter_viewport_get_type(void
+ //Declarations of the *_Class::wrap_new() methods, instead of including all the private headers:
+ 
+ namespace Clutter { namespace Gtk {  class Embed_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  } }
+-namespace Clutter { namespace Gtk {  class Viewport_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  } }
+ 
+ namespace Clutter { namespace Gtk { 
+ 
+@@ -41,11 +38,9 @@ void wrap_init()
+ 
+ // Map gtypes to gtkmm wrapper-creation functions:
+   Glib::wrap_register(gtk_clutter_embed_get_type(), &Clutter::Gtk::Embed_Class::wrap_new);
+-  Glib::wrap_register(gtk_clutter_viewport_get_type(), &Clutter::Gtk::Viewport_Class::wrap_new);
+ 
+   // Register the gtkmm gtypes:
+   Clutter::Gtk::Embed::get_type();
+-  Clutter::Gtk::Viewport::get_type();
+ 
+ } // wrap_init()
+ 
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_methods.defs.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_methods.defs
+--- clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_methods.defs.no-viewport	2010-09-29 15:26:49.877924068 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_methods.defs	2010-09-29 15:27:07.202923761 -0400
+@@ -13,13 +13,6 @@
+   (gtype-id "GTK_TYPE_CLUTTER_SCROLLABLE")
+ )
+ 
+-(define-object ClutterViewport
+-  (in-module "Gtk")
+-  (parent "ClutterActor")
+-  (c-name "GtkClutterViewport")
+-  (gtype-id "GTK_TYPE_CLUTTER_VIEWPORT")
+-)
+-
+ (define-object ClutterZoomable
+   (in-module "Gtk")
+   (c-name "GtkClutterZoomable")
+@@ -276,37 +269,6 @@
+ 
+ 
+ 
+-;; From gtk-clutter-viewport.h
+-
+-(define-function gtk_clutter_viewport_get_type
+-  (c-name "gtk_clutter_viewport_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-function gtk_clutter_viewport_new
+-  (c-name "gtk_clutter_viewport_new")
+-  (is-constructor-of "GtkClutterViewport")
+-  (return-type "ClutterActor*")
+-  (parameters
+-    '("GtkAdjustment*" "h_adjust")
+-    '("GtkAdjustment*" "v_adjust")
+-    '("GtkAdjustment*" "z_adjust")
+-  )
+-)
+-
+-(define-method get_origin
+-  (of-object "GtkClutterViewport")
+-  (c-name "gtk_clutter_viewport_get_origin")
+-  (return-type "none")
+-  (parameters
+-    '("gfloat*" "x")
+-    '("gfloat*" "y")
+-    '("gfloat*" "z")
+-  )
+-)
+-
+-
+-
+ ;; From gtk-clutter-zoomable.h
+ 
+ (define-function gtk_clutter_zoomable_get_type
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_signals.defs.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_signals.defs
+--- clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_signals.defs.no-viewport	2010-09-29 15:23:57.019924003 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/src/clutter-gtk_signals.defs	2010-09-29 15:26:13.598924017 -0400
+@@ -207,413 +207,6 @@
+   (construct-only #f)
+ )
+ 
+-;; From GtkClutterViewport
+-
+-(define-property vadjustment
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamObject")
+-  (docs "The GtkAdjustment that determines the value of the vertical position for this scrollable actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property hadjustment
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamObject")
+-  (docs "The GtkAdjustment that determines the value of the horizontal position for this scrollable actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property name
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamString")
+-  (docs "Name of the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property x
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "X coordinate of the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property y
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "Y coordinate of the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property width
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "Width of the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property height
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "Height of the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property fixed-x
+-  (of-object "GtkClutterViewport")
+-  (prop-type "ClutterParamSpecUnit")
+-  (docs "Forced X position of the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property fixed-y
+-  (of-object "GtkClutterViewport")
+-  (prop-type "ClutterParamSpecUnit")
+-  (docs "Forced Y position of the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property fixed-position-set
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether to use fixed positioning for the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property min-width
+-  (of-object "GtkClutterViewport")
+-  (prop-type "ClutterParamSpecUnit")
+-  (docs "Forced minimum width request for the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property min-width-set
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether to use the min-width property")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property min-height
+-  (of-object "GtkClutterViewport")
+-  (prop-type "ClutterParamSpecUnit")
+-  (docs "Forced minimum height request for the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property min-height-set
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether to use the min-height property")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property natural-width
+-  (of-object "GtkClutterViewport")
+-  (prop-type "ClutterParamSpecUnit")
+-  (docs "Forced natural width request for the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property natural-width-set
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether to use the natural-width property")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property natural-height
+-  (of-object "GtkClutterViewport")
+-  (prop-type "ClutterParamSpecUnit")
+-  (docs "Forced natural height request for the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property natural-height-set
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether to use the natural-height property")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property request-mode
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamEnum")
+-  (docs "The actor's request mode")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property allocation
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoxed")
+-  (docs "The actor's allocation")
+-  (readable #t)
+-  (writable #f)
+-  (construct-only #f)
+-)
+-
+-(define-property depth
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "Depth of actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property clip
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoxed")
+-  (docs "The clip region for the actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property has-clip
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether the actor has a clip set or not")
+-  (readable #t)
+-  (writable #f)
+-  (construct-only #f)
+-)
+-
+-(define-property clip-to-allocation
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Sets the clip region to track the actor's allocation")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property opacity
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamUChar")
+-  (docs "Opacity of actor")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property visible
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether the actor is visible or not")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property reactive
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether the actor is reactive to events or not")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property scale-x
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamDouble")
+-  (docs "Scale factor on the X axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property scale-y
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamDouble")
+-  (docs "Scale factor on the Y axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property scale-center-x
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "Horizontal scale center")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property scale-center-y
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "Vertical scale center")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property scale-gravity
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamEnum")
+-  (docs "The center of scaling")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property rotation-angle-x
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamDouble")
+-  (docs "The rotation angle on the X axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property rotation-angle-y
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamDouble")
+-  (docs "The rotation angle on the Y axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property rotation-angle-z
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamDouble")
+-  (docs "The rotation angle on the Z axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property rotation-center-x
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoxed")
+-  (docs "The rotation center on the X axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property rotation-center-y
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoxed")
+-  (docs "The rotation center on the Y axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property rotation-center-z
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoxed")
+-  (docs "The rotation center on the Z axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property rotation-center-z-gravity
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamEnum")
+-  (docs "Center point for rotation around the Z axis")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property anchor-x
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "X coordinate of the anchor point")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property anchor-y
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamInt")
+-  (docs "Y coordinate of the anchor point")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property anchor-gravity
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamEnum")
+-  (docs "The anchor point as a ClutterGravity")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property show-on-set-parent
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoolean")
+-  (docs "Whether the actor is shown when parented")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property child
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamObject")
+-  (docs "The ClutterActor inside the viewport")
+-  (readable #t)
+-  (writable #t)
+-  (construct-only #f)
+-)
+-
+-(define-property origin
+-  (of-object "GtkClutterViewport")
+-  (prop-type "GParamBoxed")
+-  (docs "The current origin of the viewport")
+-  (readable #t)
+-  (writable #f)
+-  (construct-only #f)
+-)
+-
+ ;; From GtkClutterScrollable
+ 
+ (define-property vadjustment
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/src/filelist.am.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/src/filelist.am
+--- clutter-gtkmm-0.9.6/clutter-gtk/src/filelist.am.no-viewport	2010-09-29 15:26:27.741923376 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/src/filelist.am	2010-09-29 15:26:35.409923963 -0400
+@@ -9,5 +9,5 @@ files_defs =				\
+ 	clutter-gtk_vfuncs.defs		\
+ 	clutter-gtk_docs.xml
+ 
+-files_hg  = embed.hg viewport.hg
++files_hg  = embed.hg
+ files_ccg = $(files_hg:.hg=.ccg)
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/src/Makefile.in.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/src/Makefile.in
+--- clutter-gtkmm-0.9.6/clutter-gtk/src/Makefile.in.no-viewport	2010-09-29 15:27:50.989923960 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/src/Makefile.in	2010-09-29 15:27:57.976923801 -0400
+@@ -216,7 +216,7 @@ files_defs = \
+ 	clutter-gtk_vfuncs.defs		\
+ 	clutter-gtk_docs.xml
+ 
+-files_hg = embed.hg viewport.hg
++files_hg = embed.hg
+ files_ccg = $(files_hg:.hg=.ccg)
+ files_codegen_m4 = convert.m4 convert_clutter_gtk.m4
+ 
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.ccg.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.ccg
+--- clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.ccg.no-viewport	2010-01-07 16:00:41.000000000 -0500
++++ clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.ccg	2010-09-29 15:20:54.616923247 -0400
+@@ -1,26 +0,0 @@
+-/* Copyright (C) 2007 The cluttermm Development Team
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-#include <clutter-gtk/clutter-gtk.h>
+-
+-namespace Clutter
+-{
+-namespace Gtk
+-{
+-
+-} // namespace Gtk
+-} // namespace Clutter
+diff -up clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.hg.no-viewport clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.hg
+--- clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.hg.no-viewport	2010-05-05 17:41:40.000000000 -0400
++++ clutter-gtkmm-0.9.6/clutter-gtk/src/viewport.hg	2010-09-29 15:20:40.737923657 -0400
+@@ -1,62 +0,0 @@
+-/* Copyright (C) 2007 The cluttermm Development Team
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-#include <cluttermm/actor.h>
+-#include <gtkmm/adjustment.h>
+-
+-_DEFS(clutter-gtkmm,clutter-gtk)
+-_PINCLUDE(cluttermm/private/actor_p.h)
+-
+-
+-namespace Clutter
+-{
+-namespace Gtk
+-{
+-
+-/** This is a scrollable actor that can contain a single Clutter::Actor.
+- *
+- * Using two Gtk::Adjustments it is possible to control the visible area of the 
+- * child actor if the size of the viewport is smaller than the size of the child.
+- *
+- * The Gtk::Adjustments used to control the horizontal and vertical scrolling 
+- * can be attached to a Gtk::Scrollbar subclass, like Gtk::HScrollbar or Gtk::VScrollbar.
+- *
+- * The Viewport can be used inside any Clutter::Container implementation.
+- */
+-class Viewport :
+-  public ::Clutter::Actor
+-{
+-  _CLASS_GOBJECT(Viewport, GtkClutterViewport, GTK_CLUTTER_VIEWPORT, ::Clutter::Actor, ClutterActor)
+-
+-protected:
+-#m4 _CONVERSION(`::Gtk::Adjustment*',`GtkAdjustment*',`($3 ? ($3)->gobj() : 0)')
+-  _WRAP_CTOR(Viewport(::Gtk::Adjustment* h_adjustment = 0, ::Gtk::Adjustment* v_adjustment = 0, ::Gtk::Adjustment* z_adjustment = 0), gtk_clutter_viewport_new)
+-
+-public:
+-
+-  _WRAP_CREATE(::Gtk::Adjustment* h_adjustment = 0, ::Gtk::Adjustment* v_adjustment = 0, ::Gtk::Adjustment* z_adjustment = 0)
+-  _WRAP_METHOD(void get_origin(float& x, float& y, float& z) const, gtk_clutter_viewport_get_origin)
+-
+-  _WRAP_PROPERTY("h_adjustment", ::Gtk::Adjustment*)
+-  _WRAP_PROPERTY("v_adjustment", ::Gtk::Adjustment*)
+-  _WRAP_PROPERTY("z_adjustment", ::Gtk::Adjustment*)
+-};
+-
+-} // namespace Gtk
+-} // namespace Clutter
+-
+-//vim: ts=2,sw=2
+diff -up clutter-gtkmm-0.9.6/doc/Makefile.in.no-viewport clutter-gtkmm-0.9.6/doc/Makefile.in
+--- clutter-gtkmm-0.9.6/doc/Makefile.in.no-viewport	2010-09-29 15:27:23.186924009 -0400
++++ clutter-gtkmm-0.9.6/doc/Makefile.in	2010-09-29 15:27:32.216924709 -0400
+@@ -236,7 +236,7 @@ files_defs = \
+ 	clutter-gtk_vfuncs.defs		\
+ 	clutter-gtk_docs.xml
+ 
+-files_hg = embed.hg viewport.hg
++files_hg = embed.hg
+ files_ccg = $(files_hg:.hg=.ccg)
+ files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc
+ files_built_h = $(files_hg:.hg=.h)
+diff -up clutter-gtkmm-0.9.6/doc/reference/html/classClutter_1_1Gtk_1_1Viewport.html.no-viewport clutter-gtkmm-0.9.6/doc/reference/html/classClutter_1_1Gtk_1_1Viewport.html
+--- clutter-gtkmm-0.9.6/doc/reference/html/classClutter_1_1Gtk_1_1Viewport.html.no-viewport	2010-05-05 17:47:16.000000000 -0400
++++ clutter-gtkmm-0.9.6/doc/reference/html/classClutter_1_1Gtk_1_1Viewport.html	2010-09-29 15:28:18.319924006 -0400
+@@ -1,309 +0,0 @@
+-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-<html xmlns="http://www.w3.org/1999/xhtml">
+-<head>
+-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+-<title>clutter-gtkmm: Clutter::Gtk::Viewport Class Reference</title>
+-<link href="tabs.css" rel="stylesheet" type="text/css"/>
+-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+-</head>
+-<body>
+-<!-- Generated by Doxygen 1.6.1 -->
+-<div class="navigation" id="top">
+-  <div class="tabs">
+-    <ul>
+-      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+-      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+-      <li><a href="namespaces.html"><span>Namespaces</span></a></li>
+-      <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+-    </ul>
+-  </div>
+-  <div class="tabs">
+-    <ul>
+-      <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+-      <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+-      <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+-    </ul>
+-  </div>
+-  <div class="navpath"><a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/namespaceClutter.html">Clutter</a>::<a class="el" href="namespaceClutter_1_1Gtk.html">Gtk</a>::<a class="el" href="classClutter_1_1Gtk_1_1Viewport.html">Viewport</a>
+-  </div>
+-</div>
+-<div class="contents">
+-<h1>Clutter::Gtk::Viewport Class Reference</h1><!-- doxytag: class="Clutter::Gtk::Viewport" --><!-- doxytag: inherits="Clutter::Actor" -->
+-<p>This is a scrollable actor that can contain a single <a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Actor.html">Clutter::Actor</a>. <a href="#_details">More...</a></p>
+-
+-<p>Inherits <a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Actor.html">Clutter::Actor</a>.</p>
+-<div class="dynheader">
+-Collaboration diagram for Clutter::Gtk::Viewport:</div>
+-<div class="dynsection">
+-<div class="center"><img src="classClutter_1_1Gtk_1_1Viewport__coll__graph.png" border="0" usemap="#Clutter_1_1Gtk_1_1Viewport_coll__map" alt="Collaboration graph"/></div>
+-<map name="Clutter_1_1Gtk_1_1Viewport_coll__map" id="Clutter_1_1Gtk_1_1Viewport_coll__map">
+-<area shape="rect" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Actor.html" title="Clutter::Actor" alt="" coords="67,315,165,344"/><area shape="rect" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/classGlib_1_1Object.html" title="Glib::Object" alt="" coords="5,237,96,267"/><area shape="rect" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/classGlib_1_1ObjectBase.html" title="Glib::ObjectBase" alt="" coords="45,83,165,112"/><area shape="rect" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/classGlib_1_1Interface.html" title="Glib::Interface" alt="" coords="120,160,224,189"/><area shape="rect" doxygen="libsigc++-2.0.tag:http://library.gnome.
 org/devel/libsigc++/unstable/" href="http://library.gnome.org/devel/libsigc++/unstable/structsigc_1_1trackable.html" title="sigc::trackable" alt="" coords="52,5,159,35"/><area shape="rect" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Scriptable.html" title="Clutter::Scriptable" alt="" coords="120,237,245,267"/></map>
+-<center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
+-
+-<p><a href="classClutter_1_1Gtk_1_1Viewport-members.html">List of all members.</a></p>
+-<table border="0" cellpadding="0" cellspacing="0">
+-<tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top">virtual&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#a3f13d7c04e910646eb1a17badfbe5c20">~Viewport</a> ()</td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top">GtkClutterViewport*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#a08cc6329fe37eaa28dee32d8f786b890">gobj</a> ()</td></tr>
+-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Provides access to the underlying C GObject. <a href="#a08cc6329fe37eaa28dee32d8f786b890"></a><br/></td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top">const GtkClutterViewport*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#a351393ae405ff36fc623d19cc5b2433c">gobj</a> () const </td></tr>
+-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Provides access to the underlying C GObject. <a href="#a351393ae405ff36fc623d19cc5b2433c"></a><br/></td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top">GtkClutterViewport*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#a594fb594b3b34ce74998e7d77d9e32fa">gobj_copy</a> ()</td></tr>
+-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs. <a href="#a594fb594b3b34ce74998e7d77d9e32fa"></a><br/></td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#a992361081af3a2c34a15f76105dd29b0">get_origin</a> (float&amp; x, float&amp; y, float&amp; z) const </td></tr>
+-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieves the current translation factor ("origin") used when displaying the child of <em>viewport</em>. <a href="#a992361081af3a2c34a15f76105dd29b0"></a><br/></td></tr>
+-<tr><td colspan="2"><h2>Static Public Member Functions</h2></td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top">static <a class="elRef" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/classGlib_1_1RefPtr.html">Glib::RefPtr</a>&lt; <a class="el" href="classClutter_1_1Gtk_1_1Viewport.html">Viewport</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#af3123a15e29f4e3f5aab6c51c4f8e7d7">create</a> (::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a>* h_adjustment=0,::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a>* v_adjustment=0,::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" h
 ref="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a>* z_adjustment=0)</td></tr>
+-<tr><td colspan="2"><h2>Protected Member Functions</h2></td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#a718c063ff166238e0472cd0c00614bb7">Viewport</a> (::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a>* h_adjustment=0,::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a>* v_adjustment=0,::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a>* z_adjustment=0)</td></tr>
+-<tr><td colspan="2"><h2>Related Functions</h2></td></tr>
+-<tr><td colspan="2"><p>(Note that these are not member functions.) </p>
+-<br/><br/></td></tr>
+-<tr><td class="memItemLeft" align="right" valign="top"><a class="elRef" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/classGlib_1_1RefPtr.html">Glib::RefPtr</a><br class="typebreak"/>
+-&lt; <a class="el" href="classClutter_1_1Gtk_1_1Viewport.html">Clutter::Gtk::Viewport</a> &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classClutter_1_1Gtk_1_1Viewport.html#a517c9e21e93e6b6cbcfce4ae291688d8">wrap</a> (GtkClutterViewport* object, bool take_copy=false)</td></tr>
+-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A <a class="elRef" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/namespaceGlib.html#a671306f4a3a0cae5ab4d7a9d54886592">Glib::wrap()</a> method for this object. <a href="#a517c9e21e93e6b6cbcfce4ae291688d8"></a><br/></td></tr>
+-</table>
+-<hr/><a name="_details"></a><h2>Detailed Description</h2>
+-<p>This is a scrollable actor that can contain a single <a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Actor.html">Clutter::Actor</a>. </p>
+-<p>Using two Gtk::Adjustments it is possible to control the visible area of the child actor if the size of the viewport is smaller than the size of the child.</p>
+-<p>The Gtk::Adjustments used to control the horizontal and vertical scrolling can be attached to a <a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Scrollbar.html">Gtk::Scrollbar</a> subclass, like <a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1HScrollbar.html">Gtk::HScrollbar</a> or <a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1VScrollbar.html">Gtk::VScrollbar</a>.</p>
+-<p>The <a class="el" href="classClutter_1_1Gtk_1_1Viewport.html" title="This is a scrollable actor that can contain a single Clutter::Actor.">Viewport</a> can be used inside any <a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Container.html">Clutter::Container</a> implementation. </p>
+-<hr/><h2>Constructor &amp; Destructor Documentation</h2>
+-<a class="anchor" id="a3f13d7c04e910646eb1a17badfbe5c20"></a><!-- doxytag: member="Clutter::Gtk::Viewport::~Viewport" ref="a3f13d7c04e910646eb1a17badfbe5c20" args="()" -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname">virtual Clutter::Gtk::Viewport::~Viewport </td>
+-          <td>(</td>
+-          <td class="paramname"></td>
+-          <td>&#160;)&#160;</td>
+-          <td><code> [virtual]</code></td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-</div>
+-</div>
+-<a class="anchor" id="a718c063ff166238e0472cd0c00614bb7"></a><!-- doxytag: member="Clutter::Gtk::Viewport::Viewport" ref="a718c063ff166238e0472cd0c00614bb7" args="(::Gtk::Adjustment *h_adjustment=0,::Gtk::Adjustment *v_adjustment=0,::Gtk::Adjustment *z_adjustment=0)" -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname">Clutter::Gtk::Viewport::Viewport </td>
+-          <td>(</td>
+-          <td class="paramtype">::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a> *&#160;</td>
+-          <td class="paramname"> <em>h_adjustment</em> = <code>0</code>, </td>
+-        </tr>
+-        <tr>
+-          <td class="paramkey"></td>
+-          <td></td>
+-          <td class="paramtype">::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a> *&#160;</td>
+-          <td class="paramname"> <em>v_adjustment</em> = <code>0</code>, </td>
+-        </tr>
+-        <tr>
+-          <td class="paramkey"></td>
+-          <td></td>
+-          <td class="paramtype">::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a> *&#160;</td>
+-          <td class="paramname"> <em>z_adjustment</em> = <code>0</code></td><td>&#160;</td>
+-        </tr>
+-        <tr>
+-          <td></td>
+-          <td>)</td>
+-          <td></td><td></td><td><code> [explicit, protected]</code></td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-</div>
+-</div>
+-<hr/><h2>Member Function Documentation</h2>
+-<a class="anchor" id="af3123a15e29f4e3f5aab6c51c4f8e7d7"></a><!-- doxytag: member="Clutter::Gtk::Viewport::create" ref="af3123a15e29f4e3f5aab6c51c4f8e7d7" args="(::Gtk::Adjustment *h_adjustment=0,::Gtk::Adjustment *v_adjustment=0,::Gtk::Adjustment *z_adjustment=0)" -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname">static <a class="elRef" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/classGlib_1_1RefPtr.html">Glib::RefPtr</a>&lt;<a class="el" href="classClutter_1_1Gtk_1_1Viewport.html">Viewport</a>&gt; Clutter::Gtk::Viewport::create </td>
+-          <td>(</td>
+-          <td class="paramtype">::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a> *&#160;</td>
+-          <td class="paramname"> <em>h_adjustment</em> = <code>0</code>, </td>
+-        </tr>
+-        <tr>
+-          <td class="paramkey"></td>
+-          <td></td>
+-          <td class="paramtype">::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a> *&#160;</td>
+-          <td class="paramname"> <em>v_adjustment</em> = <code>0</code>, </td>
+-        </tr>
+-        <tr>
+-          <td class="paramkey"></td>
+-          <td></td>
+-          <td class="paramtype">::<a class="elRef" doxygen="gtkmm-2.4.tag:http://library.gnome.org/devel/gtkmm/unstable/" href="http://library.gnome.org/devel/gtkmm/unstable/classGtk_1_1Adjustment.html">Gtk::Adjustment</a> *&#160;</td>
+-          <td class="paramname"> <em>z_adjustment</em> = <code>0</code></td><td>&#160;</td>
+-        </tr>
+-        <tr>
+-          <td></td>
+-          <td>)</td>
+-          <td></td><td></td><td><code> [static]</code></td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-</div>
+-</div>
+-<a class="anchor" id="a992361081af3a2c34a15f76105dd29b0"></a><!-- doxytag: member="Clutter::Gtk::Viewport::get_origin" ref="a992361081af3a2c34a15f76105dd29b0" args="(float &amp;x, float &amp;y, float &amp;z) const " -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname">void Clutter::Gtk::Viewport::get_origin </td>
+-          <td>(</td>
+-          <td class="paramtype">float &amp;&#160;</td>
+-          <td class="paramname"> <em>x</em>, </td>
+-        </tr>
+-        <tr>
+-          <td class="paramkey"></td>
+-          <td></td>
+-          <td class="paramtype">float &amp;&#160;</td>
+-          <td class="paramname"> <em>y</em>, </td>
+-        </tr>
+-        <tr>
+-          <td class="paramkey"></td>
+-          <td></td>
+-          <td class="paramtype">float &amp;&#160;</td>
+-          <td class="paramname"> <em>z</em></td><td>&#160;</td>
+-        </tr>
+-        <tr>
+-          <td></td>
+-          <td>)</td>
+-          <td></td><td></td><td> const</td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-<p>Retrieves the current translation factor ("origin") used when displaying the child of <em>viewport</em>. </p>
+-<dl class="since_1_0"><dt><b><a class="el" href="since_1_0.html#_since_1_0000001">Since clutter-gtkmm 1.0:</a></b></dt><dd></dd></dl>
+-<dl><dt><b>Parameters:</b></dt><dd>
+-  <table border="0" cellspacing="2" cellpadding="0">
+-    <tr><td valign="top"></td><td valign="top"><em>x</em>&#160;</td><td>Return location for the X origin in pixels, or <code>0</code>. </td></tr>
+-    <tr><td valign="top"></td><td valign="top"><em>y</em>&#160;</td><td>Return location for the Y origin in pixels, or <code>0</code>. </td></tr>
+-    <tr><td valign="top"></td><td valign="top"><em>z</em>&#160;</td><td>Return location for the Z origin in pixels, or <code>0</code>. </td></tr>
+-  </table>
+-  </dd>
+-</dl>
+-
+-</div>
+-</div>
+-<a class="anchor" id="a351393ae405ff36fc623d19cc5b2433c"></a><!-- doxytag: member="Clutter::Gtk::Viewport::gobj" ref="a351393ae405ff36fc623d19cc5b2433c" args="() const " -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname">const GtkClutterViewport* Clutter::Gtk::Viewport::gobj </td>
+-          <td>(</td>
+-          <td class="paramname"></td>
+-          <td>&#160;)&#160;</td>
+-          <td> const<code> [inline]</code></td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-<p>Provides access to the underlying C GObject. </p>
+-
+-<p>Reimplemented from <a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Actor.html#a4e97b8d3b4d586392b96e3a094ab81d7">Clutter::Actor</a>.</p>
+-
+-</div>
+-</div>
+-<a class="anchor" id="a08cc6329fe37eaa28dee32d8f786b890"></a><!-- doxytag: member="Clutter::Gtk::Viewport::gobj" ref="a08cc6329fe37eaa28dee32d8f786b890" args="()" -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname">GtkClutterViewport* Clutter::Gtk::Viewport::gobj </td>
+-          <td>(</td>
+-          <td class="paramname"></td>
+-          <td>&#160;)&#160;</td>
+-          <td><code> [inline]</code></td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-<p>Provides access to the underlying C GObject. </p>
+-
+-<p>Reimplemented from <a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Actor.html#add08539e0cacf1abc65705b53123186f">Clutter::Actor</a>.</p>
+-
+-</div>
+-</div>
+-<a class="anchor" id="a594fb594b3b34ce74998e7d77d9e32fa"></a><!-- doxytag: member="Clutter::Gtk::Viewport::gobj_copy" ref="a594fb594b3b34ce74998e7d77d9e32fa" args="()" -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname">GtkClutterViewport* Clutter::Gtk::Viewport::gobj_copy </td>
+-          <td>(</td>
+-          <td class="paramname"></td>
+-          <td>&#160;)&#160;</td>
+-          <td></td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-<p>Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs. </p>
+-
+-<p>Reimplemented from <a class="elRef" doxygen="cluttermm-1.0.tag:http://library.gnome.org/devel/cluttermm/unstable/" href="http://library.gnome.org/devel/cluttermm/unstable/classClutter_1_1Actor.html#a66c35d498df0f88dfec80b0d910ae47b">Clutter::Actor</a>.</p>
+-
+-</div>
+-</div>
+-<hr/><h2>Friends And Related Function Documentation</h2>
+-<a class="anchor" id="a517c9e21e93e6b6cbcfce4ae291688d8"></a><!-- doxytag: member="Clutter::Gtk::Viewport::wrap" ref="a517c9e21e93e6b6cbcfce4ae291688d8" args="(GtkClutterViewport *object, bool take_copy=false)" -->
+-<div class="memitem">
+-<div class="memproto">
+-      <table class="memname">
+-        <tr>
+-          <td class="memname"><a class="elRef" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/classGlib_1_1RefPtr.html">Glib::RefPtr</a>&lt; <a class="el" href="classClutter_1_1Gtk_1_1Viewport.html">Clutter::Gtk::Viewport</a> &gt; wrap </td>
+-          <td>(</td>
+-          <td class="paramtype">GtkClutterViewport *&#160;</td>
+-          <td class="paramname"> <em>object</em>, </td>
+-        </tr>
+-        <tr>
+-          <td class="paramkey"></td>
+-          <td></td>
+-          <td class="paramtype">bool&#160;</td>
+-          <td class="paramname"> <em>take_copy</em> = <code>false</code></td><td>&#160;</td>
+-        </tr>
+-        <tr>
+-          <td></td>
+-          <td>)</td>
+-          <td></td><td></td><td><code> [related]</code></td>
+-        </tr>
+-      </table>
+-</div>
+-<div class="memdoc">
+-
+-<p>A <a class="elRef" doxygen="glibmm-2.4.tag:http://library.gnome.org/devel/glibmm/unstable/" href="http://library.gnome.org/devel/glibmm/unstable/namespaceGlib.html#a671306f4a3a0cae5ab4d7a9d54886592">Glib::wrap()</a> method for this object. </p>
+-<dl><dt><b>Parameters:</b></dt><dd>
+-  <table border="0" cellspacing="2" cellpadding="0">
+-    <tr><td valign="top"></td><td valign="top"><em>object</em>&#160;</td><td>The C instance. </td></tr>
+-    <tr><td valign="top"></td><td valign="top"><em>take_copy</em>&#160;</td><td>False if the result should take ownership of the C instance. True if it should take a new copy or ref. </td></tr>
+-  </table>
+-  </dd>
+-</dl>
+-<dl class="return"><dt><b>Returns:</b></dt><dd>A C++ instance that wraps this C instance. </dd></dl>
+-
+-</div>
+-</div>
+-<hr/>The documentation for this class was generated from the following file:<ul>
+-<li>clutter-gtkmm/viewport.h</li>
+-</ul>
+-</div>
+-<hr size="1"/><address style="text-align: right;"><small>Generated on Wed May 5 23:47:15 2010 for clutter-gtkmm by&#160;
+-<a href="http://www.doxygen.org/index.html">
+-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
+-</body>
+-</html>
diff --git a/clutter-gtkmm.spec b/clutter-gtkmm.spec
index 64afd2b..f4bae4d 100644
--- a/clutter-gtkmm.spec
+++ b/clutter-gtkmm.spec
@@ -1,19 +1,22 @@
 Summary:	A basic gtkmm Clutter widget
 Name:		clutter-gtkmm
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.gtkmm.org/
 Source0:	http://download.gnome.org/sources/clutter-gtkmm/0.9/%{name}-%{version}.tar.bz2
 
+# See http://git.clutter-project.org/clutter-gtk/commit/?id=bdbb3c3c2fba04a251b4217dfd5ea5c88bbc830f
+Patch0:		clutter-gtkmm-0.9.6-no-viewport.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	clutter-gtk-devel >= 0.10.2
-BuildRequires:	cluttermm-devel >= 0.9.5
+BuildRequires:	cluttermm-devel >= 0.9.6
 BuildRequires:	doxygen
 BuildRequires:	graphviz
-BuildRequires:	gtkmm24-devel >= 2.18
+BuildRequires:	gtkmm30-devel
 
 %description
 Clutter-gtkmm allows Clutter to be embedded in gtkmm applications. Clutter is
@@ -33,10 +36,14 @@ This package contains development files for %{name}.
 %prep
 %setup -q
 
+%patch0 -p1 -b .no-viewport
+
 sed --in-place \
-  --expression 's/clutter-gtk-0\.90 >= 0\.90/clutter-gtk-1.0 >= 0.10.2/g' \
+  --expression 's|clutter-gtk-0.10 |clutter-gtk-1.0 |g' \
   ./configure
 
+sed -i 's|gtkmm-2.4|gtkmm-3.0|g' ./configure
+
 %build
 %configure --disable-silent-rules --docdir=%{_docdir}/%{name}-%{version}
 
@@ -92,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}-1.0/include
 
 %changelog
+* Wed Sep 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-1
+- update to 0.9.6
+
 * Wed Sep 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.5-2
 - update clutter-gtk version in configure to 1.0
 
diff --git a/sources b/sources
index ea1ada1..042a4e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc5ac5cbc434406249d43333192ae427  clutter-gtkmm-0.9.5.tar.bz2
+741c4ffbb9b83d81eb12fca7582703e0  clutter-gtkmm-0.9.6.tar.bz2


More information about the scm-commits mailing list