intltool: Upgrade 0.50.2 -> 0.51.0

* Remove uclibc.patch as the whole localedir guessing code has been
  removed upstream.

* Add patch to fix deprecation warnings (and the resulting broken install paths)
  when using Perl 5.22 (RB)

(From OE-Core rev: bebbcb10f467b40cc9a2fb64c824f2ef4142f7fe)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

5 files changed, 0 insertions, 154 deletions

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
deleted file mode 100644
index 06c938b7e3..0000000000
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.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.2/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch
deleted file mode 100644
index 853ee1a438..0000000000
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/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]
-
-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
deleted file mode 100644
index fc69e37b45..0000000000
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/remove-xml-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
-
-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/uclibc.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
deleted file mode 100644
index 145c181f17..0000000000
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-on uclibc systems localedir should point to /usr/'share' as usual.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: intltool-0.50.2/intltool.m4
-===================================================================
---- intltool-0.50.2.orig/intltool.m4    2014-03-15 22:09:01.016627665 -0700
-+++ intltool-0.50.2/intltool.m4 2014-03-15 22:12:09.732631206 -0700
-@@ -173,6 +173,9 @@
-     AC_CHECK_FUNC(bind_textdomain_codeset,
-       [DATADIRNAME=share], [DATADIRNAME=lib])
-     ;;
-+    *-*-*uclibc*)
-+    [DATADIRNAME=share]
-+    ;;
-     *)
-     [DATADIRNAME=lib]
-     ;;
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
deleted file mode 100644
index 5f5fed3853..0000000000
--- a/meta/recipes-devtools/intltool/intltool-0.50.2/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 <raj.khem@gmail.com>
-
-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