From 4f8411a9acdd50e2f49acdb62fbb9640c0ed21cc Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 4 May 2011 16:39:23 -0700 Subject: clutter-gtk-1.4: Rebase patches Signed-off-by: Saul Wold --- .../clutter/clutter-gtk/disable_deprecated.patch | 22 +++++++++++----------- .../clutter/clutter-gtk/enable_tests.patch | 11 +++++------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch index df0c52c1d..d11c34e69 100644 --- 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 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 c18ffecef..8e3e55252 100644 --- 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 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 \ -- cgit v1.2.3