gnumeric: updated devel version to 1.5.3

goffice: Updated to 0.0.3 as required by gnumeric
libgsf: Updated to 1.12.2 as required by gnumeric

6 files changed, 77 insertions, 17 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.3/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty
diff --git a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch
new file mode 100644
index 0000000000..4a9108bd4e
--- /dev/null
+++ b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch
@@ -0,0 +1,8 @@
+--- gnumeric-1.5.2/Makefile.am.orig	2005-08-01 11:32:36.119921544 +0000
++++ gnumeric-1.5.2/Makefile.am	2005-08-01 11:32:44.689618752 +0000
+@@ -1,4 +1,4 @@
+-SUBDIRS = . po po-functions src plugins icons templates doc schemas
++SUBDIRS = . po po-functions src plugins icons templates schemas
+ if WITH_WIN32
+   SUBDIRS += tools
+ endif
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
+}