make gnome-vfs use the staging orbit-idl-2 and let

bonobo install .idl files into STAGING_DATADIR/idl/bonobo-activation-2.0
pending: tell pkgconfig to point to that directory for --variable=idldir bonobo-activation-2.0

BKrev: 40c86388vAJ2JKdFBk0zQH54pbN64w

diff --git a/gnome/gnome-vfs_2.6.0.oe b/gnome/gnome-vfs_2.6.0.oe
index 7f3474b..8493ac0 100644 (file)
--- a/gnome/gnome-vfs_2.6.0.oe
+++ b/gnome/gnome-vfs_2.6.0.oe
@@ -1,10 +1,12 @@
 PR = "r1"
 
-DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data"
+DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.6/${PN}-${PV}.tar.bz2 \
        file://gconftool-lossage.patch;patch=1;pnum=1"
 
+ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+
 inherit autotools pkgconfig
 
 FILES_${PN} += " ${libdir}/gnome-vfs-2.0/modules/*.so ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
@@ -56,6 +58,10 @@ gnome-vfs-module-callback-module-api.h \
 gnome-vfs-mime.h \
 gnome-vfs-socket-buffer.h"
 
+do_compile() {
+       oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
+}
+
 do_stage() {
        oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
        install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
@@ -63,3 +69,7 @@ do_stage() {
        install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
        for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
 }
+
+do_install() {
+       oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}

diff --git a/gnome/libbonobo_2.6.0.oe b/gnome/libbonobo_2.6.0.oe
index 91d00f2..d8086d6 100644 (file)
--- a/gnome/libbonobo_2.6.0.oe
+++ b/gnome/libbonobo_2.6.0.oe
@@ -40,6 +40,8 @@ do_stage() {
        install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
        for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
        install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
+       install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
+       install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
        oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
        oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
 }