summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-02 15:01:41 +0000
committerRoss Burton <ross@openedhand.com>2007-08-02 15:01:41 +0000
commit65305236fc807f0bf6623e580009852cd0156ae7 (patch)
tree8ba87899dc425c41ab8774dc2935eb8bca8a9f7c
parent7537de5c06eb54249d497d76919a9969c3635c6c (diff)
downloadpoky-65305236fc807f0bf6623e580009852cd0156ae7.tar.gz
Upgrade intltool to 0.35.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2336 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/intltool/files/intltool-nowarn.patch40
-rw-r--r--meta/packages/intltool/intltool-native_0.35.2.bb4
-rw-r--r--meta/packages/intltool/intltool-native_0.35.5.bb9
-rw-r--r--meta/packages/intltool/intltool.inc (renamed from meta/packages/intltool/intltool_0.35.2.bb)7
-rw-r--r--meta/packages/intltool/intltool_0.35.5.bb10
5 files changed, 63 insertions, 7 deletions
diff --git a/meta/packages/intltool/files/intltool-nowarn.patch b/meta/packages/intltool/files/intltool-nowarn.patch
new file mode 100644
index 0000000000..546db5f119
--- /dev/null
+++ b/meta/packages/intltool/files/intltool-nowarn.patch
@@ -0,0 +1,40 @@
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.35.2.bb b/meta/packages/intltool/intltool-native_0.35.2.bb
deleted file mode 100644
index 7cf3c4e11f..0000000000
--- a/meta/packages/intltool/intltool-native_0.35.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1SECTION = "devel"
2require intltool_${PV}.bb
3inherit native
4DEPENDS = "libxml-parser-perl-native"
diff --git a/meta/packages/intltool/intltool-native_0.35.5.bb b/meta/packages/intltool/intltool-native_0.35.5.bb
new file mode 100644
index 0000000000..ba9b90c07a
--- /dev/null
+++ b/meta/packages/intltool/intltool-native_0.35.5.bb
@@ -0,0 +1,9 @@
1require intltool_${PV}.bb
2
3inherit native
4DEPENDS = "libxml-parser-perl-native"
5
6export PERL = "/usr/bin/env perl"
7SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
8
9DEFAULT_PREFERENCE = "-1"
diff --git a/meta/packages/intltool/intltool_0.35.2.bb b/meta/packages/intltool/intltool.inc
index 487f69361d..410a89cfa3 100644
--- a/meta/packages/intltool/intltool_0.35.2.bb
+++ b/meta/packages/intltool/intltool.inc
@@ -1,9 +1,10 @@
1SECTION = "devel"
2DESCRIPTION = "Utility scripts for internationalizing XML" 1DESCRIPTION = "Utility scripts for internationalizing XML"
3DEPENDS = "libxml-parser-perl" 2PRIORITY = "optional"
3SECTION = "devel"
4LICENSE = "GPL" 4LICENSE = "GPL"
5 5
6SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" 6URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
7SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
7S = "${WORKDIR}/intltool-${PV}" 8S = "${WORKDIR}/intltool-${PV}"
8 9
9inherit autotools pkgconfig 10inherit autotools pkgconfig
diff --git a/meta/packages/intltool/intltool_0.35.5.bb b/meta/packages/intltool/intltool_0.35.5.bb
new file mode 100644
index 0000000000..e13e376f12
--- /dev/null
+++ b/meta/packages/intltool/intltool_0.35.5.bb
@@ -0,0 +1,10 @@
1require intltool.inc
2
3DEPENDS = "libxml-parser-perl-native"
4#RDEPENDS = "libxml-parser-perl"
5
6PR = "r0"
7
8RRECOMMENDS = "perl-modules"
9
10DEFAULT_PREFERENCE = "-1"