diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-07 00:16:45 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-07 00:16:45 +0000 |
| commit | 3add927f0dff99991a2fa04954ddb4b3cf6de93b (patch) | |
| tree | 39a06bf83ec941ba72c5e5506728d3b3af285bb8 /packages/gnumeric | |
| parent | 5bf32077166ced5bb9d528ea15f4e0c8f8a73134 (diff) | |
| parent | e6de8a447dc94e80138ee405299a90765cd35871 (diff) | |
merge of 'ac891e557582299a2c482837fc1a4741608997eb'
and 'c7dd0d08fe79367defca06f3c2108b3dae4fead1'
Diffstat (limited to 'packages/gnumeric')
| -rw-r--r-- | packages/gnumeric/files/remove-docs.patch | 16 | ||||
| -rw-r--r-- | packages/gnumeric/gnumeric_1.8.2.bb (renamed from packages/gnumeric/gnumeric_1.6.3.bb) | 9 |
2 files changed, 16 insertions, 9 deletions
diff --git a/packages/gnumeric/files/remove-docs.patch b/packages/gnumeric/files/remove-docs.patch index 4a9108bd4e..650ad6f4fa 100644 --- a/packages/gnumeric/files/remove-docs.patch +++ b/packages/gnumeric/files/remove-docs.patch @@ -1,8 +1,10 @@ ---- 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 +Index: gnumeric-1.8.2/Makefile.am +=================================================================== +--- gnumeric-1.8.2.orig/Makefile.am 2008-01-15 02:53:04.000000000 +0000 ++++ gnumeric-1.8.2/Makefile.am 2008-04-01 22:44:44.000000000 +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 +-SUBDIRS = . po po-functions src plugins icons templates doc tools schemas test ++SUBDIRS = . po po-functions src plugins icons templates tools schemas test + + XML_I18N_XML_KIND = --pass-through + diff --git a/packages/gnumeric/gnumeric_1.6.3.bb b/packages/gnumeric/gnumeric_1.8.2.bb index 9c757fb7ff..f7654117d7 100644 --- a/packages/gnumeric/gnumeric_1.6.3.bb +++ b/packages/gnumeric/gnumeric_1.8.2.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "x11/utils" S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" +DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native" DESCRIPTION = "Gnumeric spreadsheet for GNOME" PR = "r1" @@ -14,9 +14,14 @@ EXTRA_OECONF=" --without-perl " PACKAGES_DYNAMIC = "gnumeric-plugin-*" -FILES_${PN}-dbg += "${libdir}/gnumeric/1.6.3/plugins/*/.debug" +FILES_${PN}-dbg += "${libdir}/gnumeric/1.8.2/plugins/*/.debug" FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so " +# We need native orbit-idl with target idl files. No way to say it in a clean way: +do_configure_append () { + find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; +} + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) |