diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-06-17 00:27:06 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-06-17 00:27:06 +0000 |
| commit | a01260fee1469285b60132bef06c31f5e6aa0090 (patch) | |
| tree | f23101640d5303d3df657db308b7dc2331bc4050 /packages | |
| parent | de3073497ca3c12f3fddb8aab7e039b7bf4bf667 (diff) | |
| parent | ec629463a3f3731653e1eb723e7d5174a9ae1679 (diff) | |
merge of '2a4827e0d2f1c33bb0ef3c1c3722a53d40a6795e'
and '8a9c646c76fe6bd1033098872e6a08b1376f0be9'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/intltool/intltool-native_0.35.5.bb | 9 | ||||
| -rw-r--r-- | packages/intltool/intltool.inc | 3 | ||||
| -rw-r--r-- | packages/intltool/intltool_0.35.5.bb | 10 | ||||
| -rw-r--r-- | packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch | 6 |
4 files changed, 23 insertions, 5 deletions
diff --git a/packages/intltool/intltool-native_0.35.5.bb b/packages/intltool/intltool-native_0.35.5.bb new file mode 100644 index 0000000000..ba9b90c07a --- /dev/null +++ b/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/packages/intltool/intltool.inc b/packages/intltool/intltool.inc index f4de1ff4aa..410a89cfa3 100644 --- a/packages/intltool/intltool.inc +++ b/packages/intltool/intltool.inc @@ -3,7 +3,8 @@ PRIORITY = "optional" SECTION = "devel" LICENSE = "GPL" -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/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/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb new file mode 100644 index 0000000000..e13e376f12 --- /dev/null +++ b/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" diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch index a5e8b847c5..c9f40c8a5f 100644 --- a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch +++ b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch @@ -1,7 +1,5 @@ -diff --git a/devscripts/acinclude.m4.in.qt2 b/devscripts/acinclude.m4.in.qt2 -index 500e75f..e8d9758 100644 ---- a/devscripts/acinclude.m4.in.qt2 -+++ b/devscripts/acinclude.m4.in.qt2 +--- ./acinclude.m4 ++++ ./acinclude.m4 @@ -4937,31 +4937,11 @@ AC_DEFUN([KDE_SET_PREFIX], AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) |