summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorFlorin Sarbu <florin.sarbu@windriver.com>2012-04-20 10:52:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-28 09:20:51 +0100
commit520c5d9bda1b39c1f489094b7eee2e6ca1fbcd4f (patch)
treed77670232470ea710fef7181de6e8e9bf335b6c8 /meta
parentc3bb97b03b76ad73412bb0763bfd636171469477 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch52
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.0/intltool-nowarn-0.50.0.patch42
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch (renamed from meta/recipes-devtools/intltool/intltool-0.40.6/noperlcheck.patch)8
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.0/remove-xml-check.patch (renamed from meta/recipes-devtools/intltool/intltool-0.40.6/remove-xml-check.patch)3
-rw-r--r--meta/recipes-devtools/intltool/intltool-0.50.0/use-nativeperl.patch (renamed from meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch)0
-rw-r--r--meta/recipes-devtools/intltool/intltool.inc2
-rw-r--r--meta/recipes-devtools/intltool/intltool_0.50.0.bb (renamed from meta/recipes-devtools/intltool/intltool_0.40.6.bb)12
7 files changed, 53 insertions, 66 deletions
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
index ff9f52e218..0000000000
--- a/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: intltool-0.40.0/intltool-extract.in
4===================================================================
5--- intltool-0.40.0.orig/intltool-extract.in 2008-12-17 11:50:19.000000000 +0000
6+++ intltool-0.40.0/intltool-extract.in 2008-12-17 11:50:31.000000000 +0000
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 #
13Index: intltool-0.40.0/intltool-merge.in
14===================================================================
15--- intltool-0.40.0.orig/intltool-merge.in 2008-12-17 11:50:19.000000000 +0000
16+++ intltool-0.40.0/intltool-merge.in 2008-12-17 11:50:38.000000000 +0000
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 #
23Index: intltool-0.40.0/intltool-prepare.in
24===================================================================
25--- intltool-0.40.0.orig/intltool-prepare.in 2008-12-17 11:50:19.000000000 +0000
26+++ intltool-0.40.0/intltool-prepare.in 2008-12-17 11:50:42.000000000 +0000
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
33Index: intltool-0.40.0/intltool-unicodify.in
34===================================================================
35--- intltool-0.40.0.orig/intltool-unicodify.in 2008-12-17 11:50:19.000000000 +0000
36+++ intltool-0.40.0/intltool-unicodify.in 2008-12-17 11:50:46.000000000 +0000
37@@ -1,4 +1,4 @@
38-#!@INTLTOOL_PERL@ -w
39+#!@INTLTOOL_PERL@
40
41 #
42 # The i18n Unicode Encoding Utility
43Index: intltool-0.40.0/intltool-update.in
44===================================================================
45--- intltool-0.40.0.orig/intltool-update.in 2008-12-17 11:50:19.000000000 +0000
46+++ intltool-0.40.0/intltool-update.in 2008-12-17 11:50:49.000000000 +0000
47@@ -1,4 +1,4 @@
48-#!@INTLTOOL_PERL@ -w
49+#!@INTLTOOL_PERL@
50 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
51
52 #
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 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: 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 #
13Index: 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 #
23Index: 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
33Index: 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.40.6/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool-0.50.0/noperlcheck.patch
index 3d8b591a40..cc26749c48 100644
--- 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
7 7
8Upstream-Status: Inappropriate [OE specific] 8Upstream-Status: Inappropriate [OE specific]
9 9
10Index: intltool-0.40.6/configure.in 10Index: intltool-0.40.6/configure.ac
11=================================================================== 11===================================================================
12--- intltool-0.40.6.orig/configure.in 2011-08-31 11:21:13.061160535 +0100 12--- intltool-0.40.6.orig/configure.ac 2011-08-31 11:21:13.061160535 +0100
13+++ intltool-0.40.6/configure.in 2011-08-31 11:22:44.991160885 +0100 13+++ intltool-0.40.6/configure.ac 2011-08-31 11:22:44.991160885 +0100
14@@ -9,24 +9,10 @@ 14@@ -11,24 +11,10 @@
15 aclocaldir='${datadir}'/aclocal 15 aclocaldir='${datadir}'/aclocal
16 AC_SUBST(aclocaldir) 16 AC_SUBST(aclocaldir)
17 17
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
index 2eb9abd06b..476d0913d4 100644
--- 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 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Index: intltool-0.40.6/intltool.m4 1Index: intltool-0.40.6/intltool.m4
5=================================================================== 2===================================================================
6--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 3--- 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
index 5f5fed3853..5f5fed3853 100644
--- a/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch
+++ b/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 8d983dfc6c..1c41f0ff41 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -3,7 +3,7 @@ SECTION = "devel"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4 4
5URLV="${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" 5URLV="${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
6SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" 6SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
7S = "${WORKDIR}/intltool-${PV}" 7S = "${WORKDIR}/intltool-${PV}"
8 8
9DEPENDS = "libxml-parser-perl-native" 9DEPENDS = "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
index c820f11bf4..d1ee31dd41 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
@@ -1,11 +1,11 @@
1require intltool.inc 1require intltool.inc
2LICENSE="GPLv2" 2LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4PR = "r6" 4PR = "r0"
5 5
6SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \ 6SRC_URI += "file://intltool-nowarn-0.50.0.patch \
7 ${NATIVEPATCHES} \ 7 ${NATIVEPATCHES} \
8 " 8 "
9 9
10# 10#
11# All of the intltool scripts have the correct paths to perl already 11# All of the intltool scripts have the correct paths to perl already
@@ -15,5 +15,5 @@ NATIVEPATCHES = "file://noperlcheck.patch \
15 file://remove-xml-check.patch" 15 file://remove-xml-check.patch"
16NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" 16NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
17 17
18SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5" 18SRC_URI[md5sum] = "0da9847a60391ca653df35123b1f7cc0"
19SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64" 19SRC_URI[sha256sum] = "dccfb0b7dd35a170130e8934bfd30c29da6ae73bcd3ca4ba71317c977b2893d6"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 01:07:25 +0000