diff options
| author | Phil Blundell <philb@gnu.org> | 2004-07-28 17:42:57 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-07-28 17:42:57 +0000 |
| commit | 3f10ae387d90e9b93482d5cbda904915cdc68fd2 (patch) | |
| tree | 28f861c20038221752c32691c7339787e1099202 | |
| parent | 5ad547d47b8ddccb9411f66034a5a380075d9303 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages
2004/07/28 18:42:35+01:00 (none)!pb
apply build fixes for gnumeric and libgsf, courtesy Rob McQueen
BKrev: 4107e5a1qJWLIWakLoEpKFxvU9gMWg
| -rw-r--r-- | gnumeric/gnumeric_1.3.1.oe | 16 | ||||
| -rw-r--r-- | libgsf/libgsf_1.10.0.oe | 45 |
2 files changed, 61 insertions, 0 deletions
diff --git a/gnumeric/gnumeric_1.3.1.oe b/gnumeric/gnumeric_1.3.1.oe index e69de29bb2..d4057183c7 100644 --- a/gnumeric/gnumeric_1.3.1.oe +++ b/gnumeric/gnumeric_1.3.1.oe @@ -0,0 +1,16 @@ +PR = "r1" +S = "${WORKDIR}/gnumeric-${PV}" +DEPENDS = "libgsf gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" +DESCRIPTION = "Gnumeric spreadsheet for GNOME" + +inherit gnome + +SRC_URI += 'file://workbook-control-gui-priv.h.patch;patch=1' + +EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` ' + +python populate_packages_prepend () { + gnumeric_libdir = oe.data.expand('${libdir}/gnumeric/${PV}', d) + + do_split_packages(d, gnumeric_libdir, '^([^/])/', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s') +} diff --git a/libgsf/libgsf_1.10.0.oe b/libgsf/libgsf_1.10.0.oe index e69de29bb2..794785ecd0 100644 --- a/libgsf/libgsf_1.10.0.oe +++ b/libgsf/libgsf_1.10.0.oe @@ -0,0 +1,45 @@ +PR = "r1" + +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" + +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 +} + |