From f0f5507f30b5d8d919e93cb6af6b724981e9cfef Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Tue, 5 Feb 2013 18:13:09 +0200 Subject: intltool: updated to 0.50.2 Signed-off-by: Bogdan Marinescu Signed-off-by: Saul Wold --- .../intltool-0.50.0/intltool-nowarn-0.50.0.patch | 42 ---------------------- .../intltool/intltool-0.50.0/noperlcheck.patch | 40 --------------------- .../intltool-0.50.0/remove-xml-check.patch | 33 ----------------- .../intltool/intltool-0.50.0/use-nativeperl.patch | 20 ----------- .../intltool/intltool-0.50.2/intltool-nowarn.patch | 42 ++++++++++++++++++++++ .../intltool/intltool-0.50.2/noperlcheck.patch | 40 +++++++++++++++++++++ .../intltool-0.50.2/remove-xml-check.patch | 33 +++++++++++++++++ .../intltool/intltool-0.50.2/use-nativeperl.patch | 20 +++++++++++ meta/recipes-devtools/intltool/intltool_0.50.0.bb | 19 ---------- meta/recipes-devtools/intltool/intltool_0.50.2.bb | 19 ++++++++++ 10 files changed, 154 insertions(+), 154 deletions(-) delete mode 100644 meta/recipes-devtools/intltool/intltool-0.50.0/intltool-nowarn-0.50.0.patch delete mode 100644 meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch delete mode 100644 meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch delete mode 100644 meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch create mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch delete mode 100644 meta/recipes-devtools/intltool/intltool_0.50.0.bb create mode 100644 meta/recipes-devtools/intltool/intltool_0.50.2.bb 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 deleted file mode 100644 index 06c938b7e3..0000000000 --- a/meta/recipes-devtools/intltool/intltool-0.50.0/intltool-nowarn-0.50.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: intltool-0.40.0/intltool-extract.in -=================================================================== ---- intltool-0.50.0.orig/intltool-extract.in 2011-10-08 22:24:57.000000000 +0300 -+++ intltool-0.50.0/intltool-extract.in 2011-12-07 16:04:07.000000000 +0200 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # -Index: intltool-0.50.0/intltool-merge.in -=================================================================== ---- intltool-0.50.0.orig/intltool-merge.in 2011-10-08 17:52:01.000000000 +0300 -+++ intltool-0.50.0/intltool-merge.in 2011-12-07 16:05:55.000000000 +0200 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # -Index: intltool-0.50.0/intltool-prepare.in -=================================================================== ---- intltool-0.50.0.orig/intltool-prepare.in 2011-10-08 09:16:58.000000000 +0300 -+++ intltool-0.50.0/intltool-prepare.in 2011-12-07 16:06:13.000000000 +0200 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # Intltool .desktop, .directory Prepare Tool -Index: intltool-0.50.0/intltool-update.in -=================================================================== ---- intltool-0.50.0.orig/intltool-update.in 2011-10-08 22:24:57.000000000 +0300 -+++ intltool-0.50.0/intltool-update.in 2011-12-07 16:06:39.000000000 +0200 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # diff --git a/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch deleted file mode 100644 index cc26749c48..0000000000 --- a/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch +++ /dev/null @@ -1,40 +0,0 @@ -In the target case, we can't check if perl exists or try running it. If we -don't patch the code, the native perl location would be used, not the target -which is also incorrect. We therefore disable this code and rely on the -correct value of PERL being passed in. - -RP 31/8/2011 - -Upstream-Status: Inappropriate [OE specific] - -Index: intltool-0.40.6/configure.ac -=================================================================== ---- intltool-0.40.6.orig/configure.ac 2011-08-31 11:21:13.061160535 +0100 -+++ intltool-0.40.6/configure.ac 2011-08-31 11:22:44.991160885 +0100 -@@ -11,24 +11,10 @@ - aclocaldir='${datadir}'/aclocal - AC_SUBST(aclocaldir) - --AC_PATH_PROG(PERL, perl) - if test -z "$PERL"; then -- AC_MSG_ERROR([perl not found]) --fi --AC_MSG_CHECKING([for perl >= 5.8.1]) --$PERL -e "use 5.8.1;" > /dev/null 2>&1 --if test $? -ne 0; then -- AC_MSG_ERROR([perl 5.8.1 is required for intltool]) --else -- PERL_VERSION="`$PERL -e \"printf '%vd', $^V\"`" -- AC_MSG_RESULT([$PERL_VERSION]) --fi --AC_MSG_CHECKING([for XML::Parser]) --if `$PERL -e "require XML::Parser" 2>/dev/null`; then -- AC_MSG_RESULT([ok]) --else -- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+ AC_MSG_ERROR([PERL variable not set]) - fi -+AC_SUBST(PERL) - - AC_OUTPUT([ - 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 deleted file mode 100644 index fc69e37b45..0000000000 --- a/meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -Signed-off-by: Florin Sarbu - -Upstream-Status: Inappropriate [OE specific] - -Index: intltool-0.40.6/intltool.m4 -=================================================================== ---- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 -+++ intltool-0.40.6/intltool.m4 2011-11-23 15:39:34.689561872 -0800 -@@ -122,14 +122,16 @@ - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) - fi --if test "x$2" != "xno-xml"; then -- AC_MSG_CHECKING([for XML::Parser]) -- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -- AC_MSG_RESULT([ok]) -- else -- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -- fi --fi -+ -+# Disable this check since we know XML::Parser is installed -+#if test "x$2" != "xno-xml"; then -+# AC_MSG_CHECKING([for XML::Parser]) -+# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -+# AC_MSG_RESULT([ok]) -+# else -+# AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+# fi -+#fi - - # Substitute ALL_LINGUAS so we can use it in po/Makefile - 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 deleted file mode 100644 index 5f5fed3853..0000000000 --- a/meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch +++ /dev/null @@ -1,20 +0,0 @@ -OE has perl binary as 'nativeperl' in native sysroot so we look for it -in order to avoid intltool searching and finding perl from /usr/bin -on build system which may not have all the modules that it needs. - -Signed-off-by: Khem Raj - -Upstream-Status: Inappropriate [OE specific] -Index: intltool-0.40.6/intltool.m4 -=================================================================== ---- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 -+++ intltool-0.40.6/intltool.m4 2011-08-09 08:07:16.427347846 -0700 -@@ -110,7 +110,7 @@ - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) - fi - --AC_PATH_PROG(INTLTOOL_PERL, perl) -+AC_PATH_PROG(INTLTOOL_PERL, nativeperl) - if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) - fi diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch new file mode 100644 index 0000000000..06c938b7e3 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch @@ -0,0 +1,42 @@ +Upstream-Status: Inappropriate [embedded specific] + +Index: intltool-0.40.0/intltool-extract.in +=================================================================== +--- intltool-0.50.0.orig/intltool-extract.in 2011-10-08 22:24:57.000000000 +0300 ++++ intltool-0.50.0/intltool-extract.in 2011-12-07 16:04:07.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.50.0/intltool-merge.in +=================================================================== +--- intltool-0.50.0.orig/intltool-merge.in 2011-10-08 17:52:01.000000000 +0300 ++++ intltool-0.50.0/intltool-merge.in 2011-12-07 16:05:55.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.50.0/intltool-prepare.in +=================================================================== +--- intltool-0.50.0.orig/intltool-prepare.in 2011-10-08 09:16:58.000000000 +0300 ++++ intltool-0.50.0/intltool-prepare.in 2011-12-07 16:06:13.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # Intltool .desktop, .directory Prepare Tool +Index: intltool-0.50.0/intltool-update.in +=================================================================== +--- intltool-0.50.0.orig/intltool-update.in 2011-10-08 22:24:57.000000000 +0300 ++++ intltool-0.50.0/intltool-update.in 2011-12-07 16:06:39.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch new file mode 100644 index 0000000000..853ee1a438 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch @@ -0,0 +1,40 @@ +In the target case, we can't check if perl exists or try running it. If we +don't patch the code, the native perl location would be used, not the target +which is also incorrect. We therefore disable this code and rely on the +correct value of PERL being passed in. + +RP 31/8/2011 + +Upstream-Status: Inappropriate [OE specific] + +diff --git a/configure.ac b/configure.ac +index 5338a76..e709a2b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,24 +11,10 @@ AC_SUBST(pkgdatadir) dnl automake does not need this, but libtoolize does + aclocaldir='${datadir}'/aclocal + AC_SUBST(aclocaldir) + +-AC_PATH_PROG(PERL, perl) + if test -z "$PERL"; then +- AC_MSG_ERROR([perl not found]) +-fi +-AC_MSG_CHECKING([for perl >= 5.8.1]) +-$PERL -e "use 5.8.1;" > /dev/null 2>&1 +-if test $? -ne 0; then +- AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +-else +- PERL_VERSION="`$PERL -e \"printf '%vd', $^V\"`" +- AC_MSG_RESULT([$PERL_VERSION]) +-fi +-AC_MSG_CHECKING([for XML::Parser]) +-if `$PERL -e "require XML::Parser" 2>/dev/null`; then +- AC_MSG_RESULT([ok]) +-else +- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ AC_MSG_ERROR([PERL variable not set]) + fi ++AC_SUBST(PERL) + AC_PATH_PROG(BZR, bzr) + + diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch new file mode 100644 index 0000000000..fc69e37b45 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch @@ -0,0 +1,33 @@ +Signed-off-by: Florin Sarbu + +Upstream-Status: Inappropriate [OE specific] + +Index: intltool-0.40.6/intltool.m4 +=================================================================== +--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 ++++ intltool-0.40.6/intltool.m4 2011-11-23 15:39:34.689561872 -0800 +@@ -122,14 +122,16 @@ + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) + fi +-if test "x$2" != "xno-xml"; then +- AC_MSG_CHECKING([for XML::Parser]) +- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +- AC_MSG_RESULT([ok]) +- else +- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) +- fi +-fi ++ ++# Disable this check since we know XML::Parser is installed ++#if test "x$2" != "xno-xml"; then ++# AC_MSG_CHECKING([for XML::Parser]) ++# if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++# AC_MSG_RESULT([ok]) ++# else ++# AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++# fi ++#fi + + # Substitute ALL_LINGUAS so we can use it in po/Makefile + AC_SUBST(ALL_LINGUAS) diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch new file mode 100644 index 0000000000..5f5fed3853 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.50.2/use-nativeperl.patch @@ -0,0 +1,20 @@ +OE has perl binary as 'nativeperl' in native sysroot so we look for it +in order to avoid intltool searching and finding perl from /usr/bin +on build system which may not have all the modules that it needs. + +Signed-off-by: Khem Raj + +Upstream-Status: Inappropriate [OE specific] +Index: intltool-0.40.6/intltool.m4 +=================================================================== +--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 ++++ intltool-0.40.6/intltool.m4 2011-08-09 08:07:16.427347846 -0700 +@@ -110,7 +110,7 @@ + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi + +-AC_PATH_PROG(INTLTOOL_PERL, perl) ++AC_PATH_PROG(INTLTOOL_PERL, nativeperl) + if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) + fi diff --git a/meta/recipes-devtools/intltool/intltool_0.50.0.bb b/meta/recipes-devtools/intltool/intltool_0.50.0.bb deleted file mode 100644 index f890e924e9..0000000000 --- a/meta/recipes-devtools/intltool/intltool_0.50.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require intltool.inc -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r1" - -SRC_URI += "file://intltool-nowarn-0.50.0.patch \ - ${NATIVEPATCHES} \ - " - -# -# All of the intltool scripts have the correct paths to perl already -# embedded into them and can find perl fine, so we add the remove xml-check -# in the intltool.m4 via the remove-xml-check.patch -NATIVEPATCHES = "file://noperlcheck.patch \ - file://remove-xml-check.patch" -NATIVEPATCHES_class-native = "file://use-nativeperl.patch" - -SRC_URI[md5sum] = "0da9847a60391ca653df35123b1f7cc0" -SRC_URI[sha256sum] = "dccfb0b7dd35a170130e8934bfd30c29da6ae73bcd3ca4ba71317c977b2893d6" diff --git a/meta/recipes-devtools/intltool/intltool_0.50.2.bb b/meta/recipes-devtools/intltool/intltool_0.50.2.bb new file mode 100644 index 0000000000..c25e21ae5d --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool_0.50.2.bb @@ -0,0 +1,19 @@ +require intltool.inc +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r0" + +SRC_URI += "file://intltool-nowarn.patch \ + ${NATIVEPATCHES} \ + " + +# +# All of the intltool scripts have the correct paths to perl already +# embedded into them and can find perl fine, so we add the remove xml-check +# in the intltool.m4 via the remove-xml-check.patch +NATIVEPATCHES = "file://noperlcheck.patch \ + file://remove-xml-check.patch" +NATIVEPATCHES_class-native = "file://use-nativeperl.patch" + +SRC_URI[md5sum] = "23fbd879118253cb99aeac067da5f591" +SRC_URI[sha256sum] = "67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406" -- cgit v1.2.3