libsoup: modify staging funciton to not symlink, we don't want libsoup.pc, but libsou...

epiphany: depend on libsoup-2.4

diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb
index 82f158e..d2d4547 100644 (file)
--- a/packages/gnome/epiphany_2.22.1.bb
+++ b/packages/gnome/epiphany_2.22.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GNOME default webbrowser"
-DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
 RDEPENDS = "gnome-vfs-plugin-http"
 
 inherit gnome

diff --git a/packages/gnome/libsoup_2.4.1.bb b/packages/gnome/libsoup-2.4_2.4.1.bb
similarity index 52%
rename from packages/gnome/libsoup_2.4.1.bb
rename to packages/gnome/libsoup-2.4_2.4.1.bb
index 42e5dec..24de169 100644 (file)
--- a/packages/gnome/libsoup_2.4.1.bb
+++ b/packages/gnome/libsoup-2.4_2.4.1.bb
@@ -1,17 +1,19 @@
-DEFAULT_PREFERENCE = "-1"
-
 DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gnutls libxml2"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2"
+PR = "r1"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/libsoup-${PV}.tar.bz2"
+S = "${WORKDIR}/libsoup-${PV}"
+
+inherit autotools
 
-inherit autotools pkgconfig
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 do_stage() {
-        autotools_stage_all
-        cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc
+       autotools_stage_all
 }
 
 FILES_${PN} = "${libdir}/lib*.so.*"

diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index 0193f91..d69a985 100644 (file)
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "An HTTP library implementation in C"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
 
+PR = "r1"
+
 DEPENDS = "glib-2.0 gnutls libxml2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools 
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev = "${includedir}/ ${libdir}/"
@@ -16,5 +18,4 @@ AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 do_stage() {
        autotools_stage_all
-       ln -sf libsoup-2.2.pc ${PKG_CONFIG_DIR}/libsoup.pc
 }