aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-03-24 18:12:24 +0100
committerKoen Kooi <koen@openembedded.org>2009-03-24 18:12:24 +0100
commit1e56480635748d683842ba1fc8df31ed7bca4804 (patch)
tree20ce7f0c0301ce7a79f4449f3416fe0d4ed6d174
parent20ad023c27df9817513e0a15d173901720288df6 (diff)
downloadopenembedded-1e56480635748d683842ba1fc8df31ed7bca4804.tar.gz
openembedded-1e56480635748d683842ba1fc8df31ed7bca4804.tar.bz2
openembedded-1e56480635748d683842ba1fc8df31ed7bca4804.zip
libsoup: fix packaging to keep upgrade paths sane, bump PR on affected packages
-rw-r--r--recipes/gnome/epiphany_2.24.2.bb1
-rw-r--r--recipes/gnome/libsoup-2.4_2.26.0.bb6
-rw-r--r--recipes/gtk-webcore/midori_git.bb2
-rw-r--r--recipes/webkit/webkit-gtk_svn.bb2
4 files changed, 8 insertions, 3 deletions
diff --git a/recipes/gnome/epiphany_2.24.2.bb b/recipes/gnome/epiphany_2.24.2.bb
index d2d45475b7..a5ad6bef22 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 5f7fe4c6ca..5413d49bf8 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
index c22f00aff3..5d08f1b6b7 100644
--- a/recipes/gtk-webcore/midori_git.bb
+++ b/recipes/gtk-webcore/midori_git.bb
@@ -3,7 +3,7 @@ require midori.inc
DEPENDS += "python-native python-docutils-native"
# increment PR every time SRCREV is updated!
-PR = "r1"
+PR = "r2"
PV = "0.1.2+${PR}+gitr${SRCREV}"
SRC_URI = "http://git.xfce.org/kalikiana/midori/snapshot/midori-${SRCREV}.tar.bz2"
diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb
index 98926727fe..729011515e 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 = "r8"
+PR = "r9"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \