merge of 2eb3e554331d55cc0f7d813dca896a891a88eead

     and a94af4911a294bcdb04e177bd028dd19a7a36edb

4 files changed, 96 insertions, 1 deletions

diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb
index 444b0a43c7..567cc3a414 100644
--- a/packages/abiword/abiword-plugins_2.4.5.bb
+++ b/packages/abiword/abiword-plugins_2.4.5.bb
@@ -4,12 +4,13 @@ HOMEPAGE="http://www.abiword.org""
 MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE="GPLv2"
 
-DEPENDS     = "abiword libwpd librsvg goffice poppler"
+DEPENDS     = "libwpd librsvg goffice poppler"
 PR="r1"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
            file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
 S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
+RDEPENDS='abiword'
 
 inherit autotools
 
diff --git a/packages/gnome/libbonoboui_2.14.0.bb b/packages/gnome/libbonoboui_2.14.0.bb
new file mode 100644
index 0000000000..049eb135ad
--- /dev/null
+++ b/packages/gnome/libbonoboui_2.14.0.bb
@@ -0,0 +1,58 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r0"
+
+inherit gnome pkgconfig
+
+FILES_${PN} += "${libdir}/libglade/2.0/*.so"
+FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
+	${libdir}/bonobo-2.0/samples"
+FILES_${PN}-dbg += "${libdir}/libglade/2.0/.debug/*.so"
+
+DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+HEADERS = " \
+bonobo/bonobo-zoomable.h \
+bonobo/bonobo-ui-component.h \
+bonobo/bonobo-dock-layout.h \
+bonobo/bonobo-ui-type-builtins.h \
+bonobo/bonobo-canvas-component.h \
+bonobo/bonobo-widget.h \
+bonobo/bonobo-ui-engine.h \
+bonobo/bonobo-window.h \
+bonobo/bonobo-ui-toolbar.h \
+bonobo/bonobo-dock-band.h \
+bonobo/bonobo-ui-toolbar-item.h \
+bonobo/bonobo-control.h \
+bonobo/bonobo-dock-item.h \
+bonobo/bonobo-ui-config-widget.h \
+bonobo/bonobo-zoomable-frame.h \
+bonobo/bonobo-control-frame.h \
+bonobo/bonobo-dock.h \
+bonobo/bonobo-ui-main.h \
+bonobo/bonobo-canvas-item.h \
+bonobo/bonobo-ui-node.h \
+bonobo/bonobo-socket.h \
+bonobo/bonobo-selector.h \
+bonobo/bonobo-ui-sync.h \
+bonobo/bonobo-ui-util.h \
+bonobo/bonobo-plug.h \
+bonobo/bonobo-ui-toolbar-button-item.h \
+bonobo/bonobo-ui-toolbar-toggle-button-item.h \
+bonobo/bonobo-ui-container.h \
+bonobo/bonobo-file-selector-util.h \
+bonobo/bonobo-property-control.h \
+bonobo/bonobo-selector-widget.h \
+libbonoboui.h \
+bonobo.h \
+"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo
+	for i in ${HEADERS}; do
+		install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i
+	done
+	oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR}
+}
diff --git a/packages/gnome/libgnome_2.14.1.bb b/packages/gnome/libgnome_2.14.1.bb
new file mode 100644
index 0000000000..e5a681ab54
--- /dev/null
+++ b/packages/gnome/libgnome_2.14.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Gnome application programming libraries"
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r0"
+
+inherit gnome
+
+DEPENDS = "gconf-native gnome-vfs libbonobo"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+autotools_stage_all
+}
diff --git a/packages/gnome/libgnomeui_2.15.2.bb b/packages/gnome/libgnomeui_2.15.2.bb
new file mode 100644
index 0000000000..8f3e0a725c
--- /dev/null
+++ b/packages/gnome/libgnomeui_2.15.2.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r0"
+DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+DESCRIPTION = "GNOME User Interface Library"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
+	${libdir}/libglade/*/lib*.so"
+
+inherit gnome
+
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
+}
+
+do_stage() {
+autotools_stage_all
+}