summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-05 13:37:58 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:25 +0000
commit18fe7edf55fa25251bf292c27276cf2384a8508f (patch)
tree4070ad5ea872a9de56d399917d2a34ef1d55d582 /meta
parent88de83a0dc939217e0f53c43d2bf2b2c09d92d24 (diff)
downloadpoky-18fe7edf55fa25251bf292c27276cf2384a8508f.tar.gz
intltool: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch40
-rw-r--r--meta/packages/intltool/intltool-native_0.40.5.bb11
-rw-r--r--meta/packages/intltool/intltool.inc9
-rw-r--r--meta/packages/intltool/intltool_0.40.5.bb7
4 files changed, 10 insertions, 57 deletions
diff --git a/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch b/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch
deleted file mode 100644
index 546db5f119..0000000000
--- a/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1--- intltool-0.35.0/intltool-extract.in.in.orig 2006-06-16 15:49:14.000000000 -0600
2+++ intltool-0.35.0/intltool-extract.in.in 2006-06-16 15:49:18.000000000 -0600
3@@ -1,4 +1,4 @@
4-#!@INTLTOOL_PERL@ -w
5+#!@INTLTOOL_PERL@
6 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
7
8 #
9--- intltool-0.35.0/intltool-merge.in.in.orig 2006-06-16 15:49:18.000000000 -0600
10+++ intltool-0.35.0/intltool-merge.in.in 2006-06-16 15:49:23.000000000 -0600
11@@ -1,4 +1,4 @@
12-#!@INTLTOOL_PERL@ -w
13+#!@INTLTOOL_PERL@
14 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
15
16 #
17--- intltool-0.35.0/intltool-prepare.in.orig 2006-06-16 15:49:23.000000000 -0600
18+++ intltool-0.35.0/intltool-prepare.in 2006-06-16 15:49:26.000000000 -0600
19@@ -1,4 +1,4 @@
20-#!@INTLTOOL_PERL@ -w
21+#!@INTLTOOL_PERL@
22 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
23
24 # Intltool .desktop, .directory Prepare Tool
25--- intltool-0.35.0/intltool-unicodify.in.orig 2006-06-16 15:49:26.000000000 -0600
26+++ intltool-0.35.0/intltool-unicodify.in 2006-06-16 15:49:30.000000000 -0600
27@@ -1,4 +1,4 @@
28-#!@INTLTOOL_PERL@ -w
29+#!@INTLTOOL_PERL@
30
31 #
32 # The i18n Unicode Encoding Utility
33--- intltool-0.35.0/intltool-update.in.in.orig 2006-06-16 15:49:30.000000000 -0600
34+++ intltool-0.35.0/intltool-update.in.in 2006-06-16 15:49:35.000000000 -0600
35@@ -1,4 +1,4 @@
36-#!@INTLTOOL_PERL@ -w
37+#!@INTLTOOL_PERL@
38 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
39
40 #
diff --git a/meta/packages/intltool/intltool-native_0.40.5.bb b/meta/packages/intltool/intltool-native_0.40.5.bb
deleted file mode 100644
index d359be766c..0000000000
--- a/meta/packages/intltool/intltool-native_0.40.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require intltool_${PV}.bb
2
3PR = "r2"
4
5inherit native
6DEPENDS = "libxml-parser-perl-native"
7
8export PERL = "/usr/bin/env perl"
9SRC_URI_append = " file://intltool-nowarn-0.40.0.patch;patch=1"
10
11RRECOMMENDS = ""
diff --git a/meta/packages/intltool/intltool.inc b/meta/packages/intltool/intltool.inc
index 410a89cfa3..a3057c61cf 100644
--- a/meta/packages/intltool/intltool.inc
+++ b/meta/packages/intltool/intltool.inc
@@ -7,8 +7,17 @@ URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
7SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" 7SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
8S = "${WORKDIR}/intltool-${PV}" 8S = "${WORKDIR}/intltool-${PV}"
9 9
10PR = "r3"
11
12DEPENDS = "libxml-parser-perl-native"
13#RDEPENDS = "libxml-parser-perl"
14RRECOMMENDS = "perl-modules"
15
10inherit autotools pkgconfig 16inherit autotools pkgconfig
11 17
12do_stage() { 18do_stage() {
13 install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ 19 install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
14} 20}
21
22export PERL_virtclass-native = "/usr/bin/env perl"
23BBCLASSEXTEND = "native"
diff --git a/meta/packages/intltool/intltool_0.40.5.bb b/meta/packages/intltool/intltool_0.40.5.bb
index 6626ed54fe..fe700f21ed 100644
--- a/meta/packages/intltool/intltool_0.40.5.bb
+++ b/meta/packages/intltool/intltool_0.40.5.bb
@@ -1,8 +1,3 @@
1require intltool.inc 1require intltool.inc
2 2
3DEPENDS = "libxml-parser-perl-native" 3SRC_URI_append = " file://intltool-nowarn-0.40.0.patch;patch=1"
4#RDEPENDS = "libxml-parser-perl"
5
6PR = "r0"
7
8RRECOMMENDS = "perl-modules"