summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-31 22:42:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-01 18:34:37 +0100
commit484c4e73245c93a08413cd204513bf5c5698b994 (patch)
treeb11b90017c0d43b2ce7fb8e1e97b22ea4ba558f0 /meta
parent22f3c4ed8fa6d4eba6972c44b3bc50276238c7f5 (diff)
downloadpoky-484c4e73245c93a08413cd204513bf5c5698b994.tar.gz
clutter-1.6: Add patch to update gettext macro version
(From OE-Core rev: 0a496df0209c93fd00ea929b5f27faa1a6e600c0) 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-1.6_1.6.14.bb5
-rw-r--r--meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch32
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 @@
1require recipes-graphics/clutter/clutter.inc 1require recipes-graphics/clutter/clutter.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5# Internal json-glib was removed in Clutter 1.5.2 5# Internal json-glib was removed in Clutter 1.5.2
6STDDEPENDS += "json-glib" 6STDDEPENDS += "json-glib"
@@ -9,7 +9,8 @@ PACKAGES =+ "${PN}-examples"
9FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 9FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
10 10
11SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \ 11SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \
12 file://enable_tests-1.4.patch" 12 file://enable_tests-1.4.patch \
13 file://update_gettext_macro_version.patch"
13 14
14LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" 15LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
15S = "${WORKDIR}/clutter-${PV}" 16S = "${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 @@
1Upstream-Status: Pending
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: clutter-1.6.14/build/autotools/po.m4
6===================================================================
7--- clutter-1.6.14.orig/build/autotools/po.m4 2011-05-31 22:39:55.000000000 -0700
8+++ clutter-1.6.14/build/autotools/po.m4 2011-05-31 22:40:36.898833113 -0700
9@@ -29,7 +29,7 @@
10
11 dnl Release version of the gettext macros. This is used to ensure that
12 dnl the gettext macros and po/Makefile.in.in are in sync.
13- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
14+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
15
16 dnl Perform the following tests also if --disable-nls has been given,
17 dnl because they are needed for "make dist" to work.
18Index: clutter-1.6.14/po/Makefile.in.in
19===================================================================
20--- clutter-1.6.14.orig/po/Makefile.in.in 2011-05-31 22:40:05.000000000 -0700
21+++ clutter-1.6.14/po/Makefile.in.in 2011-05-31 22:40:21.030833109 -0700
22@@ -8,8 +8,8 @@
23 # Please note that the actual code of GNU gettext is covered by the GNU
24 # General Public License and is *not* in the public domain.
25 #
26-# Origin: gettext-0.17
27-GETTEXT_MACRO_VERSION = 0.17
28+# Origin: gettext-0.18
29+GETTEXT_MACRO_VERSION = 0.18
30
31 PACKAGE = @PACKAGE@
32 VERSION = @VERSION@