diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-05-04 16:39:23 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-05 11:54:45 +0100 |
| commit | 4f8411a9acdd50e2f49acdb62fbb9640c0ed21cc (patch) | |
| tree | 40be759fb962b2c270f72365c67111e7e1d52b8b /meta/recipes-graphics | |
| parent | bed468e7562c2481074a68b12d03f0680defeca1 (diff) | |
| download | openembedded-core-4f8411a9acdd50e2f49acdb62fbb9640c0ed21cc.tar.gz openembedded-core-4f8411a9acdd50e2f49acdb62fbb9640c0ed21cc.tar.bz2 openembedded-core-4f8411a9acdd50e2f49acdb62fbb9640c0ed21cc.zip | |
clutter-gtk-1.4: Rebase patches
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-graphics/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 df0c52c1d6..d11c34e693 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 c18ffecefd..8e3e55252c 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 \ |