diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2011-05-31 22:42:49 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-01 18:32:30 +0100 |
| commit | 0a496df0209c93fd00ea929b5f27faa1a6e600c0 (patch) | |
| tree | 46f794cdddb38a01a0fc61e02c317765a1660456 | |
| parent | 42eebceb0dbcc3c3ee9f6b9485c6c51b831e0b2b (diff) | |
| download | openembedded-core-contrib-0a496df0209c93fd00ea929b5f27faa1a6e600c0.tar.gz | |
clutter-1.6: Add patch to update gettext macro version
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch | 32 |
2 files changed, 35 insertions, 2 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb index 938a30ceb1..555133f482 100644 --- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb +++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb @@ -1,6 +1,6 @@ require recipes-graphics/clutter/clutter.inc -PR = "r1" +PR = "r2" # Internal json-glib was removed in Clutter 1.5.2 STDDEPENDS += "json-glib" @@ -9,7 +9,8 @@ PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \ - file://enable_tests-1.4.patch" + file://enable_tests-1.4.patch \ + file://update_gettext_macro_version.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" S = "${WORKDIR}/clutter-${PV}" diff --git a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch b/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch new file mode 100644 index 0000000000..6671098902 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch @@ -0,0 +1,32 @@ +Upstream-Status: Pending + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: clutter-1.6.14/build/autotools/po.m4 +=================================================================== +--- clutter-1.6.14.orig/build/autotools/po.m4 2011-05-31 22:39:55.000000000 -0700 ++++ clutter-1.6.14/build/autotools/po.m4 2011-05-31 22:40:36.898833113 -0700 +@@ -29,7 +29,7 @@ + + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. +- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) ++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. +Index: clutter-1.6.14/po/Makefile.in.in +=================================================================== +--- clutter-1.6.14.orig/po/Makefile.in.in 2011-05-31 22:40:05.000000000 -0700 ++++ clutter-1.6.14/po/Makefile.in.in 2011-05-31 22:40:21.030833109 -0700 +@@ -8,8 +8,8 @@ + # Please note that the actual code of GNU gettext is covered by the GNU + # General Public License and is *not* in the public domain. + # +-# Origin: gettext-0.17 +-GETTEXT_MACRO_VERSION = 0.17 ++# Origin: gettext-0.18 ++GETTEXT_MACRO_VERSION = 0.18 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ |