summaryrefslogtreecommitdiff
path: root/meta/packages
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 /meta/packages
parent7537de5c06eb54249d497d76919a9969c3635c6c (diff)
downloadopenembedded-core-65305236fc807f0bf6623e580009852cd0156ae7.tar.gz
openembedded-core-65305236fc807f0bf6623e580009852cd0156ae7.tar.bz2
openembedded-core-65305236fc807f0bf6623e580009852cd0156ae7.tar.xz
openembedded-core-65305236fc807f0bf6623e580009852cd0156ae7.zip
Upgrade intltool to 0.35.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2336 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-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 000000000..546db5f11
--- /dev/null
+++ b/meta/packages/intltool/files/intltool-nowarn.patch
@@ -0,0 +1,40 @@
+--- intltool-0.35.0/intltool-extract.in.in.orig 2006-06-16 15:49:14.000000000 -0600
++++ intltool-0.35.0/intltool-extract.in.in 2006-06-16 15:49:18.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ #
+--- intltool-0.35.0/intltool-merge.in.in.orig 2006-06-16 15:49:18.000000000 -0600
++++ intltool-0.35.0/intltool-merge.in.in 2006-06-16 15:49:23.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ #
+--- intltool-0.35.0/intltool-prepare.in.orig 2006-06-16 15:49:23.000000000 -0600
++++ intltool-0.35.0/intltool-prepare.in 2006-06-16 15:49:26.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ # Intltool .desktop, .directory Prepare Tool
+--- intltool-0.35.0/intltool-unicodify.in.orig 2006-06-16 15:49:26.000000000 -0600
++++ intltool-0.35.0/intltool-unicodify.in 2006-06-16 15:49:30.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+
+ #
+ # The i18n Unicode Encoding Utility
+--- intltool-0.35.0/intltool-update.in.in.orig 2006-06-16 15:49:30.000000000 -0600
++++ intltool-0.35.0/intltool-update.in.in 2006-06-16 15:49:35.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!@INTLTOOL_PERL@ -w
++#!@INTLTOOL_PERL@
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+ #
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 7cf3c4e11..000000000
--- a/meta/packages/intltool/intltool-native_0.35.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "devel"
-require intltool_${PV}.bb
-inherit native
-DEPENDS = "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 000000000..ba9b90c07
--- /dev/null
+++ b/meta/packages/intltool/intltool-native_0.35.5.bb
@@ -0,0 +1,9 @@
+require intltool_${PV}.bb
+
+inherit native
+DEPENDS = "libxml-parser-perl-native"
+
+export PERL = "/usr/bin/env perl"
+SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/meta/packages/intltool/intltool_0.35.2.bb b/meta/packages/intltool/intltool.inc
index 487f69361..410a89cfa 100644
--- a/meta/packages/intltool/intltool_0.35.2.bb
+++ b/meta/packages/intltool/intltool.inc
@@ -1,9 +1,10 @@
-SECTION = "devel"
DESCRIPTION = "Utility scripts for internationalizing XML"
-DEPENDS = "libxml-parser-perl"
+PRIORITY = "optional"
+SECTION = "devel"
LICENSE = "GPL"
-SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2"
+URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
+SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
S = "${WORKDIR}/intltool-${PV}"
inherit 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 000000000..e13e376f1
--- /dev/null
+++ b/meta/packages/intltool/intltool_0.35.5.bb
@@ -0,0 +1,10 @@
+require intltool.inc
+
+DEPENDS = "libxml-parser-perl-native"
+#RDEPENDS = "libxml-parser-perl"
+
+PR = "r0"
+
+RRECOMMENDS = "perl-modules"
+
+DEFAULT_PREFERENCE = "-1"