merge of 'ac891e557582299a2c482837fc1a4741608997eb'

     and 'c7dd0d08fe79367defca06f3c2108b3dae4fead1'

9 files changed, 48 insertions, 59 deletions

diff --git a/packages/gnome/goffice_0.2.1.bb b/packages/gnome/goffice_0.2.1.bb
deleted file mode 100644
index 2048cdd34d..0000000000
--- a/packages/gnome/goffice_0.2.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r1"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-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/gnome/goffice_0.3.2.bb b/packages/gnome/goffice_0.6.2.bb
index a81f96910c..95e64a508e 100644
--- a/packages/gnome/goffice_0.3.2.bb
+++ b/packages/gnome/goffice_0.6.2.bb
@@ -4,7 +4,7 @@ PR="r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libxml2 libart-lgpl"
+DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl"
 
 FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
 
@@ -12,7 +12,7 @@ inherit gnome pkgconfig
 
 do_stage() {
         gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C goffice libgoffice-0.6 ${STAGING_LIBDIR}
 }
 
 PACKAGES_DYNAMIC = "goffice-plugin-*"
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)
 
diff --git a/packages/libgsf/libgsf_1.14.2.bb b/packages/libgsf/libgsf_1.14.8.bb
index 43fd3ab9c7..43fd3ab9c7 100644
--- a/packages/libgsf/libgsf_1.14.2.bb
+++ b/packages/libgsf/libgsf_1.14.8.bb
diff --git a/packages/libpcre/files/native-rpath-link.patch b/packages/libpcre/files/native-rpath-link.patch
deleted file mode 100644
index 69de2bea64..0000000000
--- a/packages/libpcre/files/native-rpath-link.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: pcre-4.4/Makefile.in
-===================================================================
---- pcre-4.4.orig/Makefile.in	2003-08-21 11:43:07.000000000 +0100
-+++ pcre-4.4/Makefile.in	2008-03-19 10:34:08.000000000 +0000
-@@ -107,12 +107,12 @@
- 
- libpcre.la:     $(OBJ)
- 		-rm -f libpcre.la
--		$(LINKLIB) -rpath $(LIBDIR) -version-info \
-+		$(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) -version-info \
- 		'$(PCRELIBVERSION)' -o libpcre.la $(LOBJ)
- 
- libpcreposix.la: pcreposix.@OBJEXT@
- 		-rm -f libpcreposix.la
--		$(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \
-+		$(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) libpcre.la -version-info \
- 		'$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo
- 
- pcre.@OBJEXT@:  $(top_srcdir)/chartables.c $(top_srcdir)/pcre.c \
diff --git a/packages/libpcre/files/pcre-cross.patch b/packages/libpcre/files/pcre-cross.patch
new file mode 100644
index 0000000000..0626fb347a
--- /dev/null
+++ b/packages/libpcre/files/pcre-cross.patch
@@ -0,0 +1,25 @@
+To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise
+it needs to pass special variables.
+
+It would be nice to implement per-target compiler specification to
+automake, as it is done for linker.
+
+Even better it would be nice to implement native build time targets in
+automake.
+
+Index: pcre-7.6/Makefile.am
+===================================================================
+--- pcre-7.6.orig/Makefile.am	2008-01-23 17:58:28.000000000 +0000
++++ pcre-7.6/Makefile.am	2008-04-03 22:32:00.000000000 +0000
+@@ -147,6 +147,11 @@
+ 
+ noinst_PROGRAMS += dftables
+ dftables_SOURCES = dftables.c
++dftables_LINK = $(LINK_FOR_BUILD) -o $@
++dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
++
++dftables.o: $(srcdir)/dftables.c
++	$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c
+ 
+ pcre_chartables.c: dftables$(EXEEXT)
+ 	./dftables$(EXEEXT) $@
diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_7.6.bb
index 1bbfde7f0a..20a4bdb978 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_7.6.bb
@@ -7,8 +7,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
 # NOTE: consider defining PREFERRED_PROVIDER_pcre
 PROVIDES = ""
 
-SRC_URI += "file://native-rpath-link.patch;patch=1"
-
 do_compile () {
 	# The generation of dftables can lead to timestamp problems with ccache
 	# because the generated config.h seems newer.  It is sufficient to ensure that the
diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_7.6.bb
index 517256a0ff..3171e10e68 100644
--- a/packages/libpcre/libpcre_4.4.bb
+++ b/packages/libpcre/libpcre_7.6.bb
@@ -5,9 +5,10 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r8"
+PR = "r1"
 LICENSE = "BSD"
-SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
+           file://pcre-cross.patch;patch=1"
 S = "${WORKDIR}/pcre-${PV}"
 
 PROVIDES = "pcre"
@@ -18,7 +19,7 @@ PARALLEL_MAKE = ""
 
 LEAD_SONAME = "libpcre.so"
 CFLAGS_append = " -D_REENTRANT"
-EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
+EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8"
 
 do_compile () {
 	# stop libtool from trying to link with host libraries - fix from #33
@@ -29,7 +30,7 @@ do_compile () {
 	# because the generated config.h seems newer.  It is sufficient to ensure that the
 	# attempt to build dftables inside make will actually work (foo_FOR_BUILD is
 	# only used for this).
-	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}"
+	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC} -L${S}/lib"
 }
 
 do_stage () {