[pyclutter-gtk] fix configure check to look for clutter-gtk-1.0, update to latest git bits, drop all Scrollable, Zoo
Tom Callaway
spot at fedoraproject.org
Thu Sep 30 19:44:07 UTC 2010
commit 0dbdb195ac9d0f25cb1a80f024a0d05c2d140864
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Thu Sep 30 15:44:05 2010 -0400
fix configure check to look for clutter-gtk-1.0, update to latest git bits, drop all Scrollable, Zoomable, Standin, and Viewport code mappings (gone in clutter-gtk-1.0)
pyclutter-gtk-0.10.0-clutter-gtk-1.0.patch | 65 ++++++
pyclutter-gtk-0.10.0-git-changes-20100929.patch | 239 +++++++++++++++++++++++
pyclutter-gtk-0.10.0-no-scrollable.patch | 72 +++++++
pyclutter-gtk-0.10.0-no-standin.patch | 58 ++++++
pyclutter-gtk-0.10.0-no-viewport.patch | 55 +++++
pyclutter-gtk-0.10.0-no-zoomable.patch | 57 ++++++
pyclutter-gtk.spec | 20 ++-
7 files changed, 565 insertions(+), 1 deletions(-)
---
diff --git a/pyclutter-gtk-0.10.0-clutter-gtk-1.0.patch b/pyclutter-gtk-0.10.0-clutter-gtk-1.0.patch
new file mode 100644
index 0000000..8048604
--- /dev/null
+++ b/pyclutter-gtk-0.10.0-clutter-gtk-1.0.patch
@@ -0,0 +1,65 @@
+diff -up pyclutter-gtk-0.10.0/configure.ac.BAD pyclutter-gtk-0.10.0/configure.ac
+--- pyclutter-gtk-0.10.0/configure.ac.BAD 2010-09-29 11:29:06.181923341 -0400
++++ pyclutter-gtk-0.10.0/configure.ac 2010-09-29 11:29:10.735925579 -0400
+@@ -102,7 +102,7 @@ AS_IF([test -n "$export_dynamic"],
+ )
+
+ dnl check for clutter-gtk
+-PKG_CHECK_MODULES(CLUTTERGTK, clutter-gtk-0.10 >= cluttergtk_required_version)
++PKG_CHECK_MODULES(CLUTTERGTK, clutter-gtk-1.0 >= cluttergtk_required_version)
+ AC_SUBST(CLUTTERGTK_CFLAGS)
+ AC_SUBST(CLUTTERGTK_LIBS)
+ AS_IF([test -n "$export_dynamic"],
+diff -up pyclutter-gtk-0.10.0/configure.BAD pyclutter-gtk-0.10.0/configure
+--- pyclutter-gtk-0.10.0/configure.BAD 2010-09-29 11:29:29.990924071 -0400
++++ pyclutter-gtk-0.10.0/configure 2010-09-29 11:30:17.282924001 -0400
+@@ -12301,12 +12301,12 @@ if test -n "$PKG_CONFIG"; then
+ pkg_cv_CLUTTERGTK_CFLAGS="$CLUTTERGTK_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-0.10 >= 0.10.2\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "clutter-gtk-0.10 >= 0.10.2") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 0.10.2\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 0.10.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_CLUTTERGTK_CFLAGS=`$PKG_CONFIG --cflags "clutter-gtk-0.10 >= 0.10.2" 2>/dev/null`
++ pkg_cv_CLUTTERGTK_CFLAGS=`$PKG_CONFIG --cflags "clutter-gtk-1.0 >= 0.10.2" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -12319,12 +12319,12 @@ if test -n "$PKG_CONFIG"; then
+ pkg_cv_CLUTTERGTK_LIBS="$CLUTTERGTK_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-0.10 >= 0.10.2\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "clutter-gtk-0.10 >= 0.10.2") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 0.10.2\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 0.10.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_CLUTTERGTK_LIBS=`$PKG_CONFIG --libs "clutter-gtk-0.10 >= 0.10.2" 2>/dev/null`
++ pkg_cv_CLUTTERGTK_LIBS=`$PKG_CONFIG --libs "clutter-gtk-1.0 >= 0.10.2" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -12343,14 +12343,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CLUTTERGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "clutter-gtk-0.10 >= 0.10.2"`
++ CLUTTERGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "clutter-gtk-1.0 >= 0.10.2"`
+ else
+- CLUTTERGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "clutter-gtk-0.10 >= 0.10.2"`
++ CLUTTERGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "clutter-gtk-1.0 >= 0.10.2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CLUTTERGTK_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (clutter-gtk-0.10 >= 0.10.2) were not met:
++ as_fn_error "Package requirements (clutter-gtk-1.0 >= 0.10.2) were not met:
+
+ $CLUTTERGTK_PKG_ERRORS
+
diff --git a/pyclutter-gtk-0.10.0-git-changes-20100929.patch b/pyclutter-gtk-0.10.0-git-changes-20100929.patch
new file mode 100644
index 0000000..6c6358f
--- /dev/null
+++ b/pyclutter-gtk-0.10.0-git-changes-20100929.patch
@@ -0,0 +1,239 @@
+diff -urP ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs pyclutter-gtk/clutter-gtk/cluttergtk.defs
+--- ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs 2010-01-25 08:30:27.000000000 -0500
++++ pyclutter-gtk/clutter-gtk/cluttergtk.defs 2010-09-29 11:42:19.753924000 -0400
+@@ -2,6 +2,50 @@
+
+ (include "cluttergtk-types.defs")
+
++;; From gtk-clutter-actor.h
++
++(define-function actor_get_type
++ (c-name "gtk_clutter_actor_get_type")
++ (return-type "GType")
++)
++
++(define-function actor_new
++ (c-name "gtk_clutter_actor_new")
++ (is-constructor-of "GtkClutterActor")
++ (return-type "ClutterActor*")
++)
++
++(define-function actor_new_with_contents
++ (c-name "gtk_clutter_actor_new_with_contents")
++ (return-type "ClutterActor*")
++ (parameters
++ '("GtkWidget*" "contents")
++ )
++)
++
++(define-method set_receives_events
++ (of-object "GtkClutterActor")
++ (c-name "gtk_clutter_actor_set_receives_events")
++ (return-type "none")
++ (parameters
++ '("gboolean" "receives_events")
++ )
++)
++
++(define-method get_receives_events
++ (of-object "GtkClutterActor")
++ (c-name "gtk_clutter_actor_get_receives_events")
++ (return-type "gboolean")
++)
++
++(define-method get_widget
++ (of-object "GtkClutterActor")
++ (c-name "gtk_clutter_actor_get_widget")
++ (return-type "GtkWidget*")
++)
++
++;; From gtk-clutter-embed.h
++
+ (define-function clutter_embed_get_type
+ (c-name "gtk_clutter_embed_get_type")
+ (return-type "GType")
+@@ -66,6 +110,37 @@
+ )
+ )
+
++;; From gtk-clutter-standin.h
++
++(define-function standin_get_type
++ (c-name "gtk_clutter_standin_get_type")
++ (return-type "GType")
++)
++
++(define-function standin_new
++ (c-name "gtk_clutter_standin_new")
++ (is-constructor-of "GtkClutterStandin")
++ (return-type "GtkWidget*")
++ (properties
++ '("actor" (optional))
++ )
++)
++
++(define-method set_actor
++ (of-object "GtkClutterStandin")
++ (c-name "gtk_clutter_standin_set_actor")
++ (return-type "none")
++ (parameters
++ '("ClutterActor*" "actor")
++ )
++)
++
++(define-method get_actor
++ (of-object "GtkClutterStandin")
++ (c-name "gtk_clutter_standin_get_actor")
++ (return-type "ClutterActor*")
++)
++
+ ;; From gtk-clutter-util.h
+
+
+@@ -239,6 +314,27 @@
+ )
+ )
+
++;; From gtk-clutter-window.h
++
++(define-function gtk_clutter_window_get_type
++ (c-name "gtk_clutter_window_get_type")
++ (return-type "GType")
++)
++
++(define-function gtk_clutter_window_new
++ (c-name "gtk_clutter_window_new")
++ (is-constructor-of "GtkClutterWindow")
++ (return-type "GtkWidget*")
++)
++
++(define-method get_stage
++ (of-object "GtkClutterWindow")
++ (c-name "gtk_clutter_window_get_stage")
++ (return-type "ClutterActor*")
++ (parameters
++ )
++)
++
+ ;; From gtk-clutter-zoomable.h
+
+ (define-function gtk_clutter_zoomable_get_type
+diff -urP ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtkmodule.c pyclutter-gtk/clutter-gtk/cluttergtkmodule.c
+--- ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtkmodule.c 2010-01-25 10:39:00.000000000 -0500
++++ pyclutter-gtk/clutter-gtk/cluttergtkmodule.c 2010-09-29 11:42:19.754924000 -0400
+@@ -86,12 +86,6 @@
+ m = Py_InitModule ("_cluttergtk", pycluttergtk_functions);
+ d = PyModule_GetDict (m);
+
+- PyModule_AddObject (m, "__version__",
+- Py_BuildValue ("(iii)",
+- PYCLUTTERGTK_MAJOR_VERSION,
+- PYCLUTTERGTK_MINOR_VERSION,
+- PYCLUTTERGTK_MICRO_VERSION));
+-
+ init_clutter_gtk ();
+ pycluttergtk_register_classes (d);
+
+diff -urP ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.override pyclutter-gtk/clutter-gtk/cluttergtk.override
+--- ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.override 2010-01-25 08:30:27.000000000 -0500
++++ pyclutter-gtk/clutter-gtk/cluttergtk.override 2010-09-29 11:42:19.753924000 -0400
+@@ -14,10 +14,14 @@
+ import gtk.Widget as PyGtkWidget_Type
+ import gtk.Adjustment as PyGtkAdjustment_Type
+ import gtk.Container as PyGtkContainer_Type
++import gtk.Window as PyGtkWindow_Type
+ %%
+ ignore-glob
+ *_get_type
+ %%
++ignore
++ gtk_clutter_actor_new_with_contents
++%%
+ body
+
+ static PyObject *
+@@ -432,3 +436,30 @@
+
+ return Py_BuildValue ("(NN)", py_h_adjust, py_v_adjust);
+ }
++%%
++new-constructor GTK_CLUTTER_TYPE_ACTOR
++%%
++override gtk_clutter_actor_new kwargs
++static int
++_wrap_gtk_clutter_actor_new (PyGObject *self,
++ PyObject *args,
++ PyObject *kwargs)
++{
++ static char *kwlist[] = { "contents", NULL };
++ PyGObject *py_contents = NULL;
++ GtkWidget *bin;
++
++ if (!PyArg_ParseTupleAndKeywords (args, kwargs,
++ "|O!:cluttergtk.Actor.__init__",
++ kwlist,
++ &PyGtkWidget_Type, &py_contents))
++ return -1;
++
++ pygobject_construct (self, NULL);
++ bin = gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (self->obj));
++
++ if (py_contents)
++ gtk_container_add (GTK_CONTAINER (bin), GTK_WIDGET (py_contents->obj));
++
++ return 0;
++}
+diff -urP ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs pyclutter-gtk/clutter-gtk/cluttergtk-types.defs
+--- ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs 2010-01-25 08:30:27.000000000 -0500
++++ pyclutter-gtk/clutter-gtk/cluttergtk-types.defs 2010-09-29 11:42:19.753924000 -0400
+@@ -2,6 +2,13 @@
+
+ ; object definitions ...
+
++(define-object Actor
++ (in-module "GtkClutter")
++ (parent "ClutterActor")
++ (c-name "GtkClutterActor")
++ (gtype-id "GTK_CLUTTER_TYPE_ACTOR")
++)
++
+ (define-object Embed
+ (in-module "GtkClutter")
+ (parent "GtkContainer")
+@@ -16,6 +23,13 @@
+ (vtable "GtkClutterScrollableIface")
+ )
+
++(define-object Standin
++ (in-module "GtkClutter")
++ (parent "GtkWidget")
++ (c-name "GtkClutterStandin")
++ (gtype-id "GTK_CLUTTER_TYPE_STANDIN")
++)
++
+ (define-object Viewport
+ (in-module "GtkClutter")
+ (parent "ClutterActor")
+@@ -23,6 +37,13 @@
+ (gtype-id "GTK_CLUTTER_TYPE_VIEWPORT")
+ )
+
++(define-object Window
++ (in-module "GtkClutter")
++ (parent "GtkWindow")
++ (c-name "GtkClutterWindow")
++ (gtype-id "GTK_CLUTTER_TYPE_WINDOW")
++)
++
+ (define-interface Zoomable
+ (in-module "GtkClutter")
+ (c-name "GtkClutterZoomable")
+diff -urP ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/__init__.py pyclutter-gtk/clutter-gtk/__init__.py
+--- ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/__init__.py 2010-01-25 10:39:00.000000000 -0500
++++ pyclutter-gtk/clutter-gtk/__init__.py 2010-09-29 11:42:19.753924000 -0400
+@@ -35,4 +35,3 @@
+ from cluttergtk import _cluttergtk
+
+ from cluttergtk._cluttergtk import *
+-__version__ = _cluttergtk.__version__
+Only in ../BUILD/pyclutter-gtk-0.10.0/clutter-gtk/: Makefile.in
diff --git a/pyclutter-gtk-0.10.0-no-scrollable.patch b/pyclutter-gtk-0.10.0-no-scrollable.patch
new file mode 100644
index 0000000..6eb73eb
--- /dev/null
+++ b/pyclutter-gtk-0.10.0-no-scrollable.patch
@@ -0,0 +1,72 @@
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-scrollable pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-scrollable 2010-09-29 11:59:57.406921372 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs 2010-09-29 12:00:12.029923777 -0400
+@@ -65,51 +65,6 @@
+ )
+ )
+
+-;; From gtk-clutter-scrollable.h
+-
+-(define-function gtk_clutter_scrollable_get_type
+- (c-name "gtk_clutter_scrollable_get_type")
+- (return-type "GType")
+-)
+-
+-(define-method set_adjustments
+- (of-object "GtkClutterScrollable")
+- (c-name "gtk_clutter_scrollable_set_adjustments")
+- (return-type "none")
+- (parameters
+- '("GtkAdjustment*" "h_adjust")
+- '("GtkAdjustment*" "v_adjust")
+- )
+-)
+-
+-(define-virtual set_adjustments
+- (of-object "GtkClutterScrollable")
+- (return-type "none")
+- (parameters
+- '("GtkAdjustment*" "h_adjust")
+- '("GtkAdjustment*" "v_adjust")
+- )
+-)
+-
+-(define-method get_adjustments
+- (of-object "GtkClutterScrollable")
+- (c-name "gtk_clutter_scrollable_get_adjustments")
+- (return-type "none")
+- (parameters
+- '("GtkAdjustment**" "h_adjust")
+- '("GtkAdjustment**" "v_adjust")
+- )
+-)
+-
+-(define-virtual get_adjustments
+- (of-object "GtkClutterScrollable")
+- (return-type "none")
+- (parameters
+- '("GtkAdjustment**" "h_adjust")
+- '("GtkAdjustment**" "v_adjust")
+- )
+-)
+-
+ ;; From gtk-clutter-standin.h
+
+ (define-function standin_get_type
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-scrollable pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-scrollable 2010-09-29 12:00:26.478924172 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs 2010-09-29 12:00:38.008924005 -0400
+@@ -16,13 +16,6 @@
+ (gtype-id "GTK_CLUTTER_TYPE_EMBED")
+ )
+
+-(define-interface Scrollable
+- (in-module "GtkClutter")
+- (c-name "GtkClutterScrollable")
+- (gtype-id "GTK_CLUTTER_TYPE_SCROLLABLE")
+- (vtable "GtkClutterScrollableIface")
+-)
+-
+ (define-object Standin
+ (in-module "GtkClutter")
+ (parent "GtkWidget")
diff --git a/pyclutter-gtk-0.10.0-no-standin.patch b/pyclutter-gtk-0.10.0-no-standin.patch
new file mode 100644
index 0000000..d19a0d8
--- /dev/null
+++ b/pyclutter-gtk-0.10.0-no-standin.patch
@@ -0,0 +1,58 @@
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-standin pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-standin 2010-09-29 12:05:47.434923955 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs 2010-09-29 12:06:00.840923486 -0400
+@@ -65,37 +65,6 @@
+ )
+ )
+
+-;; From gtk-clutter-standin.h
+-
+-(define-function standin_get_type
+- (c-name "gtk_clutter_standin_get_type")
+- (return-type "GType")
+-)
+-
+-(define-function standin_new
+- (c-name "gtk_clutter_standin_new")
+- (is-constructor-of "GtkClutterStandin")
+- (return-type "GtkWidget*")
+- (properties
+- '("actor" (optional))
+- )
+-)
+-
+-(define-method set_actor
+- (of-object "GtkClutterStandin")
+- (c-name "gtk_clutter_standin_set_actor")
+- (return-type "none")
+- (parameters
+- '("ClutterActor*" "actor")
+- )
+-)
+-
+-(define-method get_actor
+- (of-object "GtkClutterStandin")
+- (c-name "gtk_clutter_standin_get_actor")
+- (return-type "ClutterActor*")
+-)
+-
+ ;; From gtk-clutter-util.h
+
+
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-standin pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-standin 2010-09-29 12:06:12.967924058 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs 2010-09-29 12:06:25.660924319 -0400
+@@ -16,13 +16,6 @@
+ (gtype-id "GTK_CLUTTER_TYPE_EMBED")
+ )
+
+-(define-object Standin
+- (in-module "GtkClutter")
+- (parent "GtkWidget")
+- (c-name "GtkClutterStandin")
+- (gtype-id "GTK_CLUTTER_TYPE_STANDIN")
+-)
+-
+ (define-object Viewport
+ (in-module "GtkClutter")
+ (parent "ClutterActor")
diff --git a/pyclutter-gtk-0.10.0-no-viewport.patch b/pyclutter-gtk-0.10.0-no-viewport.patch
new file mode 100644
index 0000000..58f68cc
--- /dev/null
+++ b/pyclutter-gtk-0.10.0-no-viewport.patch
@@ -0,0 +1,55 @@
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-viewport pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-viewport 2010-09-29 12:07:40.124923613 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs 2010-09-29 12:07:50.313924546 -0400
+@@ -210,34 +210,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*")
+- (properties
+- '("hadjustment" (optional))
+- '("vadjustment" (optional))
+- )
+-)
+-
+-(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-window.h
+
+ (define-function gtk_clutter_window_get_type
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-viewport pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-viewport 2010-09-29 12:08:04.227924821 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs 2010-09-29 12:08:10.869924552 -0400
+@@ -16,13 +16,6 @@
+ (gtype-id "GTK_CLUTTER_TYPE_EMBED")
+ )
+
+-(define-object Viewport
+- (in-module "GtkClutter")
+- (parent "ClutterActor")
+- (c-name "GtkClutterViewport")
+- (gtype-id "GTK_CLUTTER_TYPE_VIEWPORT")
+-)
+-
+ (define-object Window
+ (in-module "GtkClutter")
+ (parent "GtkWindow")
diff --git a/pyclutter-gtk-0.10.0-no-zoomable.patch b/pyclutter-gtk-0.10.0-no-zoomable.patch
new file mode 100644
index 0000000..122cf48
--- /dev/null
+++ b/pyclutter-gtk-0.10.0-no-zoomable.patch
@@ -0,0 +1,57 @@
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-zoomable pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs.no-zoomable 2010-09-29 12:03:34.331923847 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk.defs 2010-09-29 12:03:56.974924345 -0400
+@@ -289,39 +289,3 @@
+ (parameters
+ )
+ )
+-
+-;; From gtk-clutter-zoomable.h
+-
+-(define-function gtk_clutter_zoomable_get_type
+- (c-name "gtk_clutter_zoomable_get_type")
+- (return-type "GType")
+-)
+-
+-(define-method set_adjustment
+- (of-object "GtkClutterZoomable")
+- (c-name "gtk_clutter_zoomable_set_adjustment")
+- (return-type "none")
+- (parameters
+- '("GtkAdjustment*" "z_adjust")
+- )
+-)
+-
+-(define-virtual set_adjustment
+- (of-object "GtkClutterZoomable")
+- (return-type "none")
+- (parameters
+- '("GtkAdjustment*" "z_adjust")
+- )
+-)
+-
+-(define-method get_adjustment
+- (of-object "GtkClutterZoomable")
+- (c-name "gtk_clutter_zoomable_get_adjustment")
+- (return-type "GtkAdjustment*")
+-)
+-
+-(define-virtual get_adjustment
+- (of-object "GtkClutterZoomable")
+- (return-type "GtkAdjustment*")
+-)
+-
+diff -up pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-zoomable pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs
+--- pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs.no-zoomable 2010-09-29 12:04:18.439925620 -0400
++++ pyclutter-gtk-0.10.0/clutter-gtk/cluttergtk-types.defs 2010-09-29 12:04:28.169923563 -0400
+@@ -36,10 +36,3 @@
+ (c-name "GtkClutterWindow")
+ (gtype-id "GTK_CLUTTER_TYPE_WINDOW")
+ )
+-
+-(define-interface Zoomable
+- (in-module "GtkClutter")
+- (c-name "GtkClutterZoomable")
+- (gtype-id "GTK_CLUTTER_TYPE_ZOOMABLE")
+- (vtable "GtkClutterZoomableIface")
+-)
diff --git a/pyclutter-gtk.spec b/pyclutter-gtk.spec
index 727c648..e8b9226 100644
--- a/pyclutter-gtk.spec
+++ b/pyclutter-gtk.spec
@@ -5,7 +5,7 @@
Name: pyclutter-gtk
Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python modules that allow you to use the Clutter-GTK toolkit
Group: Development/Languages
@@ -13,6 +13,13 @@ License: LGPLv2+
URL: http://www.clutter-project.org/
Source0: http://www.clutter-project.org/sources/%{name}/0.10/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: pyclutter-gtk-0.10.0-clutter-gtk-1.0.patch
+Patch1: pyclutter-gtk-0.10.0-git-changes-20100929.patch
+# See http://git.clutter-project.org/clutter-gtk/commit/?id=bdbb3c3c2fba04a251b4217dfd5ea5c88bbc830f
+Patch2: pyclutter-gtk-0.10.0-no-scrollable.patch
+Patch3: pyclutter-gtk-0.10.0-no-zoomable.patch
+Patch4: pyclutter-gtk-0.10.0-no-standin.patch
+Patch5: pyclutter-gtk-0.10.0-no-viewport.patch
BuildRequires: clutter-devel
BuildRequires: clutter-gtk-devel
@@ -38,6 +45,12 @@ Pyclutter
%prep
%setup -q
+%patch0 -p1 -b .clutter-gtk-1.0
+%patch1 -p1 -b .git20100929
+%patch2 -p1 -b .no-scrollable
+%patch3 -p1 -b .no-zoomable
+%patch4 -p1 -b .no-standin
+%patch5 -p1 -b .no-viewport
%build
%configure
@@ -64,6 +77,11 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/%{name}-0.10.pc
%changelog
+* Wed Sep 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-3
+- fix configure check to look for clutter-gtk-1.0
+- update to latest git bits
+- drop all Scrollable, Zoomable, Standin, and Viewport code mappings (gone in clutter-gtk-1.0)
+
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
More information about the scm-commits
mailing list