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>

diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
deleted file mode 100644 (file)
index ff9f52e..0000000
--- a/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: intltool-0.40.0/intltool-extract.in
-===================================================================
---- intltool-0.40.0.orig/intltool-extract.in   2008-12-17 11:50:19.000000000 +0000
-+++ intltool-0.40.0/intltool-extract.in        2008-12-17 11:50:31.000000000 +0000
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w 
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
-Index: intltool-0.40.0/intltool-merge.in
-===================================================================
---- intltool-0.40.0.orig/intltool-merge.in     2008-12-17 11:50:19.000000000 +0000
-+++ intltool-0.40.0/intltool-merge.in  2008-12-17 11:50:38.000000000 +0000
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
-Index: intltool-0.40.0/intltool-prepare.in
-===================================================================
---- intltool-0.40.0.orig/intltool-prepare.in   2008-12-17 11:50:19.000000000 +0000
-+++ intltool-0.40.0/intltool-prepare.in        2008-12-17 11:50:42.000000000 +0000
-@@ -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.40.0/intltool-unicodify.in
-===================================================================
---- intltool-0.40.0.orig/intltool-unicodify.in 2008-12-17 11:50:19.000000000 +0000
-+++ intltool-0.40.0/intltool-unicodify.in      2008-12-17 11:50:46.000000000 +0000
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
-         
- #
- #  The i18n Unicode Encoding Utility
-Index: intltool-0.40.0/intltool-update.in
-===================================================================
---- intltool-0.40.0.orig/intltool-update.in    2008-12-17 11:50:19.000000000 +0000
-+++ intltool-0.40.0/intltool-update.in 2008-12-17 11:50:49.000000000 +0000
-@@ -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/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 (file)
index 0000000..06c938b
--- /dev/null
+++ b/meta/recipes-devtools/intltool/intltool-0.50.0/intltool-nowarn-0.50.0.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.40.6/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch
similarity index 85%
rename from meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch
rename to meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch
index 3d8b591..cc26749 100644 (file)
--- a/meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch
+++ b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch
@@ -7,11 +7,11 @@ RP 31/8/2011
 
 Upstream-Status: Inappropriate [OE specific]
 
-Index: intltool-0.40.6/configure.in
+Index: intltool-0.40.6/configure.ac
 ===================================================================
---- intltool-0.40.6.orig/configure.in  2011-08-31 11:21:13.061160535 +0100
-+++ intltool-0.40.6/configure.in       2011-08-31 11:22:44.991160885 +0100
-@@ -9,24 +9,10 @@
+--- 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)
  

diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch
similarity index 95%
rename from meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
rename to meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch
index 2eb9abd..476d091 100644 (file)
--- a/meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch
+++ b/meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch
@@ -1,6 +1,3 @@
-
-Upstream-Status: Inappropriate [configuration]
-
 Index: intltool-0.40.6/intltool.m4
 ===================================================================
 --- intltool-0.40.6.orig/intltool.m4   2009-02-14 14:12:28.000000000 -0800

diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch
similarity index 100%
rename from meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch
rename to meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch

diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index 8d983df..1c41f0f 100644 (file)
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -3,7 +3,7 @@ SECTION = "devel"
 LICENSE = "GPLv2"
 
 URLV="${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
-SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
+SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
 S = "${WORKDIR}/intltool-${PV}"
 
 DEPENDS = "libxml-parser-perl-native"

diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
similarity index 63%
rename from meta/recipes-devtools/intltool/intltool_0.40.6.bb
rename to meta/recipes-devtools/intltool/intltool_0.50.0.bb
index c820f11..d1ee31d 100644 (file)
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
@@ -1,11 +1,11 @@
 require intltool.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r6"
+PR = "r0"
 
-SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
-                   ${NATIVEPATCHES} \
-                 "
+SRC_URI += "file://intltool-nowarn-0.50.0.patch \
+           ${NATIVEPATCHES} \
+           "
 
 #
 # All of the intltool scripts have the correct paths to perl already
@@ -15,5 +15,5 @@ NATIVEPATCHES = "file://noperlcheck.patch \
                  file://remove-xml-check.patch"
 NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" 
 
-SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
-SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"
+SRC_URI[md5sum] = "0da9847a60391ca653df35123b1f7cc0"
+SRC_URI[sha256sum] = "dccfb0b7dd35a170130e8934bfd30c29da6ae73bcd3ca4ba71317c977b2893d6"