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>
This commit is contained in:
Saul Wold
2011-05-04 16:39:23 -07:00
committed by Richard Purdie
parent 9bb5a68081
commit 37481801b1
2 changed files with 16 additions and 17 deletions

View File

@@ -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 = \

View File

@@ -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 \