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 12:26:44 +0100 |
| commit | 37481801b1528bb69a9de9437fb771a62a4bd0bc (patch) | |
| tree | 91cb3544cd301f6bbc2a8f40b9a643523f0b8d9c /meta | |
| parent | 9bb5a68081e5ebe26c9ba9bc1f12a2a654b5825b (diff) | |
| download | poky-37481801b1528bb69a9de9437fb771a62a4bd0bc.tar.gz | |
clutter-gtk-1.4: Rebase patches
(From OE-Core rev: 4f8411a9acdd50e2f49acdb62fbb9640c0ed21cc)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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> | |||
| 6 | 6 | ||
| 7 | Index: git/clutter-gtk/Makefile.am | 7 | Index: git/clutter-gtk/Makefile.am |
| 8 | =================================================================== | 8 | =================================================================== |
| 9 | --- git.orig/clutter-gtk/Makefile.am 2011-01-30 13:10:29.000000000 +0800 | 9 | --- git.orig/clutter-gtk/Makefile.am 2011-05-04 14:07:20.000000000 -0700 |
| 10 | +++ git/clutter-gtk/Makefile.am 2011-01-30 13:15:09.000000000 +0800 | 10 | +++ git/clutter-gtk/Makefile.am 2011-05-04 14:25:34.013984328 -0700 |
| 11 | @@ -15,8 +15,6 @@ | 11 | @@ -8,8 +8,6 @@ |
| 12 | -DCLUTTER_GTK_COMPILATION \ | 12 | -DCLUTTER_GTK_COMPILATION \ |
| 13 | -DG_DISABLE_DEPRECATED \ | 13 | -DG_DISABLE_DEPRECATED \ |
| 14 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ | 14 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ |
| 15 | - -DGDK_DISABLE_DEPRECATED \ | 15 | - -DGDK_DISABLE_DEPRECATED \ |
| 16 | - -DGTK_DISABLE_DEPRECATED \ | 16 | - -DGTK_DISABLE_DEPRECATED \ |
| 17 | -DCLUTTER_DISABLE_DEPRECATED \ | 17 | -DCLUTTER_DISABLE_DEPRECATED |
| 18 | $(CLUTTER_GTK_DEBUG_CFLAGS) \ | 18 | |
| 19 | $(NULL) | 19 | 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> | |||
| 4 | 4 | ||
| 5 | Index: git/examples/Makefile.am | 5 | Index: git/examples/Makefile.am |
| 6 | =================================================================== | 6 | =================================================================== |
| 7 | --- git.orig/examples/Makefile.am 2011-01-31 09:58:47.000000000 +0800 | 7 | --- git.orig/examples/Makefile.am 2011-05-04 14:07:20.000000000 -0700 |
| 8 | +++ git/examples/Makefile.am 2011-01-31 09:59:02.000000000 +0800 | 8 | +++ git/examples/Makefile.am 2011-05-04 14:38:29.785984519 -0700 |
| 9 | @@ -2,7 +2,7 @@ | 9 | @@ -1,6 +1,6 @@ |
| 10 | |||
| 11 | NULL = | 10 | NULL = |
| 12 | 11 | ||
| 13 | -noinst_PROGRAMS = \ | 12 | -noinst_PROGRAMS = \ |
| 14 | +bin_PROGRAMS = \ | 13 | +bin_PROGRAMS = \ |
| 15 | animated-notebook \ | ||
| 16 | expose-test \ | ||
| 17 | gtk-clutter-events \ | 14 | gtk-clutter-events \ |
| 15 | gtk-clutter-multistage \ | ||
| 16 | gtk-clutter-test \ | ||