[oe-commits] Koen Kooi : libsoup: fix packaging to keep upgrade paths sane, bump PR on affected packages

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 90d550951a4b6b92881caa56c2f309847ee5d626
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=90d550951a4b6b92881caa56c2f309847ee5d626

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Mar 24 18:12:24 2009 +0100

libsoup: fix packaging to keep upgrade paths sane, bump PR on affected packages

---

 recipes/gnome/epiphany_2.24.2.bb    |    1 +
 recipes/gnome/libsoup-2.4_2.26.0.bb |    6 +++++-
 recipes/gtk-webcore/midori_git.bb   |   33 +++++++++++++++++++++++++++++++++
 recipes/webkit/webkit-gtk_svn.bb    |    2 +-
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/recipes/gnome/epiphany_2.24.2.bb b/recipes/gnome/epiphany_2.24.2.bb
index d2d4547..a5ad6be 100644
--- a/recipes/gnome/epiphany_2.24.2.bb
+++ b/recipes/gnome/epiphany_2.24.2.bb
@@ -4,6 +4,7 @@ RDEPENDS = "gnome-vfs-plugin-http"
 
 inherit gnome
 
+PR = "r1"
 
 EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
 
diff --git a/recipes/gnome/libsoup-2.4_2.26.0.bb b/recipes/gnome/libsoup-2.4_2.26.0.bb
index 5f7fe4c..5413d49 100644
--- a/recipes/gnome/libsoup-2.4_2.26.0.bb
+++ b/recipes/gnome/libsoup-2.4_2.26.0.bb
@@ -3,6 +3,8 @@ SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
 DEPENDS = "libproxy glib-2.0 gnutls libxml2"
 
+Pr = "r1"
+
 inherit gnome
 
 SRC_URI = "${GNOME_MIRROR}/libsoup/${@gnome_verdir("${PV}")}/libsoup-${PV}.tar.bz2"
@@ -12,6 +14,8 @@ do_stage() {
 	autotools_stage_all
 }
 
-FILES_${PN} = "${libdir}/lib*.so.*"
+PACKAGES =+ "libsoup-gnome"
+FILES_libsoup-gnome = "${libdir}/libsoup-gnome*.so.*"
+FILES_${PN} = "${libdir}/libsoup-2*.so.*"
 FILES_${PN}-dev = "${includedir}/ ${libdir}/"
 FILES_${PN}-doc = "${datadir}/"
diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb
new file mode 100644
index 0000000..5d08f1b
--- /dev/null
+++ b/recipes/gtk-webcore/midori_git.bb
@@ -0,0 +1,33 @@
+require midori.inc
+
+DEPENDS += "python-native python-docutils-native"
+
+# increment PR every time SRCREV is updated!
+PR = "r2"
+PV = "0.1.2+${PR}+gitr${SRCREV}"
+
+SRC_URI = "http://git.xfce.org/kalikiana/midori/snapshot/midori-${SRCREV}.tar.bz2"
+S = "${WORKDIR}/midori-${SRCREV}"
+
+do_configure() {
+	./configure \
+            --prefix=${prefix} \
+            --bindir=${bindir} \
+            --sbindir=${sbindir} \
+            --libexecdir=${libexecdir} \
+            --datadir=${datadir} \
+            --sysconfdir=${sysconfdir} \
+            --sharedstatedir=${sharedstatedir} \
+            --localstatedir=${localstatedir} \
+            --libdir=${libdir} \
+            --includedir=${includedir} \
+            --infodir=${infodir} \
+            --mandir=${mandir} \
+            ${EXTRA_OECONF} 
+ 
+	sed -i /LINK_CC/d ./_build_/c4che/default.cache.py 
+	echo "LINK_CC = '${CXX}'" >>  ./_build_/c4che/default.cache.py
+}
+
+
+
diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb
index 96ef562..49653b0 100644
--- a/recipes/webkit/webkit-gtk_svn.bb
+++ b/recipes/webkit/webkit-gtk_svn.bb
@@ -5,7 +5,7 @@ SRCREV_FORMAT = "webcore-rwebkit"
 
 # Yes, this is wrong...
 PV = "0.1+svnr${SRCREV}"
-PR = "r7"
+PR = "r9"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \