From 1f25670869fdf0014ad575f58e36b2a7c58847a8 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 16 Jun 2007 22:03:02 +0000
Subject: intltool: cut the versioning in SRC_URI and close #2494

---
 packages/intltool/intltool.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From c89ee09bb7c25dbc6b27bc2eba8422d2938a6b7c Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 16 Jun 2007 22:11:41 +0000
Subject: intltool: and while we're at it, here goes 0.35.5 with defpref of -1

---
 packages/intltool/intltool-native_0.35.5.bb |  9 +++++++++
 packages/intltool/intltool_0.35.5.bb        | 10 ++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 packages/intltool/intltool-native_0.35.5.bb
 create mode 100644 packages/intltool/intltool_0.35.5.bb

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_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"
-- 
cgit v1.2.3


From 0dcd6cb582a839a8ba43ef3c1741cae293833c63 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 16 Jun 2007 22:15:54 +0000
Subject: conf/checksums.ini: checksums for intltool-0.35.5

---
 conf/checksums.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 175a4ec09d..dbd255ea49 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4258,6 +4258,10 @@ sha256=4ebece4bb752e22b2f15a9fe24e83aec59a3a41b67a9fa9ffd6b805c519e90ba
 md5=7cf1a436882a62d420a0fa00ace02a55
 sha256=04aed43abc77fccf20e91b1ba3659c0870c50091d9ce3472ac73a40a704c2fe2
 
+[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.35/intltool-0.35.5.tar.bz2]
+md5=f52d5fa7f128db94e884cd21dd45d2e2
+sha256=38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8
+
 [http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.3.tar.bz2]
 md5=39640ea026d81e721b0c78a8aaeb7d59
 sha256=808cd8e7b499a3519f8492a5bda75c55e770f976c98b2c2c21edcca4b9c30168
-- 
cgit v1.2.3


From ec629463a3f3731653e1eb723e7d5174a9ae1679 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 16 Jun 2007 23:05:11 +0000
Subject: konqueror-embedded 20070212: adjust dont-use-kde-config.patch to not
 use kde-config ;-)

---
 .../konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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})
  
-- 
cgit v1.2.3