merge of 024765e1dedb38db9ab1fa38f91d192e8c340dfb

     and 3fc63b4e706cb671fbd1f5a6170be7a7a3473c92

7 files changed, 73 insertions, 19 deletions

diff --git a/packages/gnome/goffice_0.0.3.bb b/packages/gnome/goffice_0.0.3.bb
new file mode 100644
index 0000000000..db26a617a5
--- /dev/null
+++ b/packages/gnome/goffice_0.0.3.bb
@@ -0,0 +1,21 @@
+DESCRIPTION="Gnome Office Library"
+LICENSE="GPLv2"
+PR="r0"
+
+DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
+
+inherit gnome pkgconfig
+
+
+
+do_stage() {
+        gnome_stage_includes
+	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
+
+        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
+}
+
diff --git a/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty
+++ b/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty
diff --git a/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch
index 4a9108bd4e..4a9108bd4e 100644
--- a/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch
+++ b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch
diff --git a/packages/gnumeric/gnumeric_1.5.1.bb b/packages/gnumeric/gnumeric_1.5.1.bb
deleted file mode 100644
index 42552ae45e..0000000000
--- a/packages/gnumeric/gnumeric_1.5.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r0"
-S = "${WORKDIR}/gnumeric-${PV}"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` '
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/gnumeric/gnumeric_1.5.2.bb b/packages/gnumeric/gnumeric_1.5.3.bb
index 03b42fc86a..07960b1277 100644
--- a/packages/gnumeric/gnumeric_1.5.2.bb
+++ b/packages/gnumeric/gnumeric_1.5.3.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "x11/utils"
 PR = "r0"
 S = "${WORKDIR}/gnumeric-${PV}"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui"
+DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
 DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
 inherit gnome flow-lossage
diff --git a/packages/libgsf/libgsf_1.12.2.bb b/packages/libgsf/libgsf_1.12.2.bb
new file mode 100644
index 0000000000..02e95718dd
--- /dev/null
+++ b/packages/libgsf/libgsf_1.12.2.bb
@@ -0,0 +1,47 @@
+LICENSE = "GPL"
+SECTION = "libs"
+PR = "r0"
+
+DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
+
+PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
+
+FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
+FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
+
+inherit autotools pkgconfig gnome
+
+libgsf_includes = "gsf-doc-meta-data.h gsf-infile.h gsf-input-textline.h \
+		   gsf-outfile-zip.h gsf-output-stdio.h gsf-impl-utils.h \
+		   gsf-input-bzip.h gsf-input.h gsf-outfile.h gsf-output.h \
+		   gsf-infile-impl.h gsf-input-gzip.h gsf-libxml.h \
+		   gsf-output-bzip.h gsf-structured-blob.h gsf-infile-msole.h \
+		   gsf-input-impl.h gsf-msole-utils.h gsf-output-gzip.h \
+		   gsf-timestamp.h gsf-infile-msvba.h gsf-input-iochannel.h \
+		   gsf-outfile-impl.h gsf-output-impl.h gsf-utils.h \
+		   gsf-infile-stdio.h gsf-input-memory.h gsf-outfile-msole.h \
+		   gsf-output-iochannel.h gsf.h gsf-infile-zip.h gsf-input-stdio.h \
+		   gsf-outfile-stdio.h gsf-output-memory.h gsf-output-csv.h \
+		   gsf-output-iconv.h gsf-meta-names.h "
+
+libgsf_gnome_includes = "gsf-input-gnomevfs.h \
+			 gsf-output-gnomevfs.h \
+			 gsf-input-bonobo.h \
+			 gsf-output-bonobo.h \
+			 gsf-shared-bonobo-stream.h"
+
+do_stage() {
+	oe_libinstall -so -C gsf libgsf-1 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf/
+	for i in ${libgsf_includes}; do
+		install -m 0644 gsf/$i ${STAGING_INCDIR}/libgsf-1/gsf/$i
+	done
+
+	oe_libinstall -so -C gsf-gnome libgsf-gnome-1 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf-gnome/
+	for i in ${libgsf_gnome_includes}; do
+		install -m 0644 gsf-gnome/$i ${STAGING_INCDIR}/libgsf-1/gsf-gnome/$i
+	done
+}
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 62d6350e16..76f217d74e 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r9"
+PR = "r10"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -80,13 +80,15 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${RPSRC}/pxa27x_extraregs-r2.patch;patch=1 \
-           ${RPSRC}/spitzbase-r4.patch;patch=1 \
+           ${RPSRC}/spitzbase-r5.patch;patch=1 \
            ${RPSRC}/spitzkbd-r1.patch;patch=1 \
            ${RPSRC}/spitzssp-r4.patch;patch=1 \
            ${RPSRC}/spitzbl-r1.patch;patch=1 \
            ${RPSRC}/spitzts-r1.patch;patch=1 \
            ${RPSRC}/spitzcf-r1.patch;patch=1 \
            ${RPSRC}/spitz_power-r1.patch;patch=1 \
+           ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
+           ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
            ${RPSRC}/scoop_susres-r0.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \