Patchwork [15/26] clutter-gtk-1.4: Rebase patches

login
register
mail settings
Submitter Saul Wold
Date May 5, 2011, 7:57 a.m.
Message ID <e9657c6bea34cdd406957589c3ec5e94130f8f74.1304581770.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/3243/
State New, archived
Headers show

Comments

Saul Wold - May 5, 2011, 7:57 a.m.
From: Saul Wold <sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../clutter/clutter-gtk/disable_deprecated.patch   |   22 ++++++++++----------
 .../clutter/clutter-gtk/enable_tests.patch         |   11 ++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

Patch

diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
index df0c52c..d11c34e 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 <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 c18ffec..8e3e552 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 <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 \