diff options
author | Florin Sarbu <florin.sarbu@windriver.com> | 2012-04-20 10:52:08 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-28 09:20:51 +0100 |
commit | 520c5d9bda1b39c1f489094b7eee2e6ca1fbcd4f (patch) | |
tree | d77670232470ea710fef7181de6e8e9bf335b6c8 /meta/recipes-devtools/intltool/intltool-0.50.0 | |
parent | c3bb97b03b76ad73412bb0763bfd636171469477 (diff) | |
download | poky-520c5d9bda1b39c1f489094b7eee2e6ca1fbcd4f.tar.gz |
Update intltool to version 0.50.0
Uprev intltool to newer 0.50.0 version
(From OE-Core rev: c17d1f146e43a4acaad5de629c33404426870356)
Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/intltool/intltool-0.50.0')
4 files changed, 131 insertions, 0 deletions
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.0/intltool-nowarn-0.50.0.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/intltool-nowarn-0.50.0.patch new file mode 100644 index 0000000000..06c938b7e3 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.0/intltool-nowarn-0.50.0.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: intltool-0.40.0/intltool-extract.in | ||
4 | =================================================================== | ||
5 | --- intltool-0.50.0.orig/intltool-extract.in 2011-10-08 22:24:57.000000000 +0300 | ||
6 | +++ intltool-0.50.0/intltool-extract.in 2011-12-07 16:04:07.000000000 +0200 | ||
7 | @@ -1,4 +1,4 @@ | ||
8 | -#!@INTLTOOL_PERL@ -w | ||
9 | +#!@INTLTOOL_PERL@ | ||
10 | # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
11 | |||
12 | # | ||
13 | Index: intltool-0.50.0/intltool-merge.in | ||
14 | =================================================================== | ||
15 | --- intltool-0.50.0.orig/intltool-merge.in 2011-10-08 17:52:01.000000000 +0300 | ||
16 | +++ intltool-0.50.0/intltool-merge.in 2011-12-07 16:05:55.000000000 +0200 | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -#!@INTLTOOL_PERL@ -w | ||
19 | +#!@INTLTOOL_PERL@ | ||
20 | # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
21 | |||
22 | # | ||
23 | Index: intltool-0.50.0/intltool-prepare.in | ||
24 | =================================================================== | ||
25 | --- intltool-0.50.0.orig/intltool-prepare.in 2011-10-08 09:16:58.000000000 +0300 | ||
26 | +++ intltool-0.50.0/intltool-prepare.in 2011-12-07 16:06:13.000000000 +0200 | ||
27 | @@ -1,4 +1,4 @@ | ||
28 | -#!@INTLTOOL_PERL@ -w | ||
29 | +#!@INTLTOOL_PERL@ | ||
30 | # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
31 | |||
32 | # Intltool .desktop, .directory Prepare Tool | ||
33 | Index: intltool-0.50.0/intltool-update.in | ||
34 | =================================================================== | ||
35 | --- intltool-0.50.0.orig/intltool-update.in 2011-10-08 22:24:57.000000000 +0300 | ||
36 | +++ intltool-0.50.0/intltool-update.in 2011-12-07 16:06:39.000000000 +0200 | ||
37 | @@ -1,4 +1,4 @@ | ||
38 | -#!@INTLTOOL_PERL@ -w | ||
39 | +#!@INTLTOOL_PERL@ | ||
40 | # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
41 | |||
42 | # | ||
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch new file mode 100644 index 0000000000..cc26749c48 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | In the target case, we can't check if perl exists or try running it. If we | ||
2 | don't patch the code, the native perl location would be used, not the target | ||
3 | which is also incorrect. We therefore disable this code and rely on the | ||
4 | correct value of PERL being passed in. | ||
5 | |||
6 | RP 31/8/2011 | ||
7 | |||
8 | Upstream-Status: Inappropriate [OE specific] | ||
9 | |||
10 | Index: intltool-0.40.6/configure.ac | ||
11 | =================================================================== | ||
12 | --- intltool-0.40.6.orig/configure.ac 2011-08-31 11:21:13.061160535 +0100 | ||
13 | +++ intltool-0.40.6/configure.ac 2011-08-31 11:22:44.991160885 +0100 | ||
14 | @@ -11,24 +11,10 @@ | ||
15 | aclocaldir='${datadir}'/aclocal | ||
16 | AC_SUBST(aclocaldir) | ||
17 | |||
18 | -AC_PATH_PROG(PERL, perl) | ||
19 | if test -z "$PERL"; then | ||
20 | - AC_MSG_ERROR([perl not found]) | ||
21 | -fi | ||
22 | -AC_MSG_CHECKING([for perl >= 5.8.1]) | ||
23 | -$PERL -e "use 5.8.1;" > /dev/null 2>&1 | ||
24 | -if test $? -ne 0; then | ||
25 | - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) | ||
26 | -else | ||
27 | - PERL_VERSION="`$PERL -e \"printf '%vd', $^V\"`" | ||
28 | - AC_MSG_RESULT([$PERL_VERSION]) | ||
29 | -fi | ||
30 | -AC_MSG_CHECKING([for XML::Parser]) | ||
31 | -if `$PERL -e "require XML::Parser" 2>/dev/null`; then | ||
32 | - AC_MSG_RESULT([ok]) | ||
33 | -else | ||
34 | - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
35 | + AC_MSG_ERROR([PERL variable not set]) | ||
36 | fi | ||
37 | +AC_SUBST(PERL) | ||
38 | |||
39 | AC_OUTPUT([ | ||
40 | Makefile | ||
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch new file mode 100644 index 0000000000..476d0913d4 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Index: intltool-0.40.6/intltool.m4 | ||
2 | =================================================================== | ||
3 | --- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 | ||
4 | +++ intltool-0.40.6/intltool.m4 2011-11-23 15:39:34.689561872 -0800 | ||
5 | @@ -122,14 +122,16 @@ | ||
6 | IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" | ||
7 | AC_MSG_RESULT([$IT_PERL_VERSION]) | ||
8 | fi | ||
9 | -if test "x$2" != "xno-xml"; then | ||
10 | - AC_MSG_CHECKING([for XML::Parser]) | ||
11 | - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then | ||
12 | - AC_MSG_RESULT([ok]) | ||
13 | - else | ||
14 | - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
15 | - fi | ||
16 | -fi | ||
17 | + | ||
18 | +# Disable this check since we know XML::Parser is installed | ||
19 | +#if test "x$2" != "xno-xml"; then | ||
20 | +# AC_MSG_CHECKING([for XML::Parser]) | ||
21 | +# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then | ||
22 | +# AC_MSG_RESULT([ok]) | ||
23 | +# else | ||
24 | +# AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
25 | +# fi | ||
26 | +#fi | ||
27 | |||
28 | # Substitute ALL_LINGUAS so we can use it in po/Makefile | ||
29 | AC_SUBST(ALL_LINGUAS) | ||
diff --git a/meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch new file mode 100644 index 0000000000..5f5fed3853 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | OE has perl binary as 'nativeperl' in native sysroot so we look for it | ||
2 | in order to avoid intltool searching and finding perl from /usr/bin | ||
3 | on build system which may not have all the modules that it needs. | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | |||
7 | Upstream-Status: Inappropriate [OE specific] | ||
8 | Index: intltool-0.40.6/intltool.m4 | ||
9 | =================================================================== | ||
10 | --- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 | ||
11 | +++ intltool-0.40.6/intltool.m4 2011-08-09 08:07:16.427347846 -0700 | ||
12 | @@ -110,7 +110,7 @@ | ||
13 | AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) | ||
14 | fi | ||
15 | |||
16 | -AC_PATH_PROG(INTLTOOL_PERL, perl) | ||
17 | +AC_PATH_PROG(INTLTOOL_PERL, nativeperl) | ||
18 | if test -z "$INTLTOOL_PERL"; then | ||
19 | AC_MSG_ERROR([perl not found]) | ||
20 | fi | ||