clutter-gtk-1.4: Rebase patches

Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
index df0c52c1d6864d50698779639fb5011ce2a7f275..d11c34e693d6db36f027fe3bfa9c318e4780df63 100644 (file)
--- a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
+++ b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
@@ -6,14 +6,14 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
 Index: git/clutter-gtk/Makefile.am
 ===================================================================
---- git.orig/clutter-gtk/Makefile.am   2011-01-30 13:10:29.000000000 +0800
-+++ git/clutter-gtk/Makefile.am        2011-01-30 13:15:09.000000000 +0800
-@@ -15,8 +15,6 @@
-       -DCLUTTER_GTK_COMPILATION       \
-       -DG_DISABLE_DEPRECATED          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
--      -DGDK_DISABLE_DEPRECATED        \
--      -DGTK_DISABLE_DEPRECATED        \
-       -DCLUTTER_DISABLE_DEPRECATED    \
-       $(CLUTTER_GTK_DEBUG_CFLAGS)     \
-       $(NULL)
+--- git.orig/clutter-gtk/Makefile.am   2011-05-04 14:07:20.000000000 -0700
++++ git/clutter-gtk/Makefile.am        2011-05-04 14:25:34.013984328 -0700
+@@ -8,8 +8,6 @@
+         -DCLUTTER_GTK_COMPILATION               \
+         -DG_DISABLE_DEPRECATED                  \
+         -DGDK_PIXBUF_DISABLE_DEPRECATED         \
+-        -DGDK_DISABLE_DEPRECATED                \
+-        -DGTK_DISABLE_DEPRECATED                \
+       -DCLUTTER_DISABLE_DEPRECATED
+ 
+ AM_CPPFLAGS = \

diff --git a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
index c18ffecefd5d58e3d6d04efeeadda052704451e6..8e3e55252c03f4ba7454555c5c63b919a7d55017 100644 (file)
--- a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
+++ b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
@@ -4,14 +4,13 @@ Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 
 Index: git/examples/Makefile.am
 ===================================================================
---- git.orig/examples/Makefile.am      2011-01-31 09:58:47.000000000 +0800
-+++ git/examples/Makefile.am   2011-01-31 09:59:02.000000000 +0800
-@@ -2,7 +2,7 @@
- 
+--- git.orig/examples/Makefile.am      2011-05-04 14:07:20.000000000 -0700
++++ git/examples/Makefile.am   2011-05-04 14:38:29.785984519 -0700
+@@ -1,6 +1,6 @@
  NULL =
  
 -noinst_PROGRAMS = \
 +bin_PROGRAMS = \
-       animated-notebook \
-       expose-test \
        gtk-clutter-events \
+       gtk-clutter-multistage \
+       gtk-clutter-test \