[oe-commits] org.oe.dev libsoup: modify staging funciton to not symlink, we don't want libsoup.pc, but libsoup-2.x.pc

[koen commit]

libsoup: modify staging funciton to not symlink, we don't want libsoup.pc, but libsoup-2.x.pc
epiphany: depend on libsoup-2.4

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 516e70a567c4cbd2773ffd5f9b0eb52461af1b8d
ViewMTN: http://monotone.openembedded.org/revision/info/516e70a567c4cbd2773ffd5f9b0eb52461af1b8d
Files:
1
packages/gnome/libsoup_2.4.1.bb
packages/gnome/libsoup-2.4_2.4.1.bb
packages/gnome/epiphany_2.22.1.bb
packages/gnome/libsoup_2.2.100.bb
Diffs:

#
# mt diff -r057aae3f21d16e159e1c03e8aa4b19ab8b9e241c -r516e70a567c4cbd2773ffd5f9b0eb52461af1b8d
#
#
#
# rename "packages/gnome/libsoup_2.4.1.bb"
#     to "packages/gnome/libsoup-2.4_2.4.1.bb"
# 
# patch "packages/gnome/epiphany_2.22.1.bb"
#  from [e11dacf27365b72ec178166a6d92a04de4366667]
#    to [1e6b895420d7e243deb29a27ffcdafcf97b83683]
# 
# patch "packages/gnome/libsoup-2.4_2.4.1.bb"
#  from [e6b86e13ebc986c00649745b8980213d3a4641d2]
#    to [af7d89c625934745c35e0d50fded936ac1f11fcb]
# 
# patch "packages/gnome/libsoup_2.2.100.bb"
#  from [cd6bfacb2c7ed54444732204ccc031851510098f]
#    to [e1876855dc8a745f63fb41a39745778242a5f7a9]
#
============================================================
--- packages/gnome/epiphany_2.22.1.bb	e11dacf27365b72ec178166a6d92a04de4366667
+++ packages/gnome/epiphany_2.22.1.bb	1e6b895420d7e243deb29a27ffcdafcf97b83683
@@ -1,5 +1,5 @@ DESCRIPTION = "GNOME default webbrowser"
 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
============================================================
--- packages/gnome/libsoup_2.4.1.bb	e6b86e13ebc986c00649745b8980213d3a4641d2
+++ packages/gnome/libsoup-2.4_2.4.1.bb	af7d89c625934745c35e0d50fded936ac1f11fcb
@@ -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"
 
-inherit autotools pkgconfig
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/libsoup-${PV}.tar.bz2"
+S = "${WORKDIR}/libsoup-${PV}"
 
+inherit autotools
+
+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.*"
============================================================
--- packages/gnome/libsoup_2.2.100.bb	cd6bfacb2c7ed54444732204ccc031851510098f
+++ packages/gnome/libsoup_2.2.100.bb	e1876855dc8a745f63fb41a39745778242a5f7a9
@@ -2,11 +2,13 @@ SECTION = "x11/gnome/libs"
 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 @@ do_stage() {
 
 do_stage() {
 	autotools_stage_all
-	ln -sf libsoup-2.2.pc ${PKG_CONFIG_DIR}/libsoup.pc
 }