7 files changed, 118 insertions, 69 deletions
diff --git a/recipes/gnome/libbonoboui_2.24.1.bb b/recipes/gnome/libbonoboui_2.24.1.bb
new file mode 100644
index 0000000000..447dc2e8ae
--- /dev/null
+++ b/recipes/gnome/libbonoboui_2.24.1.bb
@@ -0,0 +1,61 @@
+#DEFAULT_PREFERENCE = "-1"
+
+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}/bonobo-2.0/samples/.debug \
+	${libdir}/libglade/2.0/.debug"
+
+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/recipes/gnome/libgnomeui.inc b/recipes/gnome/libgnomeui.inc
new file mode 100644
index 0000000000..6cde2362d2
--- /dev/null
+++ b/recipes/gnome/libgnomeui.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "GNOME User Interface Library"
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+
+inherit gnome 
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
+                ${libdir}/libglade/*/lib*.so \
+                ${datadir}/pixmaps/gnome-about-logo.png"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
+
+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
+}
diff --git a/recipes/gnome/libgnomeui_2.18.1.bb b/recipes/gnome/libgnomeui_2.18.1.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.18.1.bb
+++ b/recipes/gnome/libgnomeui_2.18.1.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
 
-inherit gnome 
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
-                ${libdir}/libglade/*/lib*.so \
-                ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-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
-}
diff --git a/recipes/gnome/libgnomeui_2.23.90.bb b/recipes/gnome/libgnomeui_2.23.90.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.23.90.bb
+++ b/recipes/gnome/libgnomeui_2.23.90.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
 
-inherit gnome 
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
-                ${libdir}/libglade/*/lib*.so \
-                ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-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
-}
diff --git a/recipes/gnome/libgnomeui_2.24.0.bb b/recipes/gnome/libgnomeui_2.24.0.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.24.0.bb
+++ b/recipes/gnome/libgnomeui_2.24.0.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
 
-inherit gnome 
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
-                ${libdir}/libglade/*/lib*.so \
-                ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-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
-}
diff --git a/recipes/gnome/libgnomeui_2.24.1.bb b/recipes/gnome/libgnomeui_2.24.1.bb
new file mode 100644
index 0000000000..3e848aefa9
--- /dev/null
+++ b/recipes/gnome/libgnomeui_2.24.1.bb
@@ -0,0 +1,2 @@
+require libgnomeui.inc
+
diff --git a/recipes/gnome/libgweather_2.26.2.1.bb b/recipes/gnome/libgweather_2.26.2.1.bb
new file mode 100644
index 0000000000..e97bff1aee
--- /dev/null
+++ b/recipes/gnome/libgweather_2.26.2.1.bb
@@ -0,0 +1,28 @@
+LICENSE = "LGPL"
+DEPENDS = "libgnome libsoup-2.4 gtk+"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_configure_prepend() {
+        sed -i -e 's:help::'    ${S}/Makefile.am
+	sed -i -e 's: doc : :g' ${S}/Makefile.am
+}
+
+do_stage() {
+        autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gnome* \
+                ${datadir}/icons"
+
+PACKAGES =+ "${PN}-locationdata"
+FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*"
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+