add patch to adapt to libgsf api change

(Portage version: 2.0.51.22-r2)

5 files changed, 220 insertions, 11 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 7a15bd216e6e..ce22960001b2 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.96 2005/06/18 11:40:13 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.97 2005/07/22 16:26:55 foser Exp $
+
+*gnumeric-1.4.3-r1 (22 Jul 2005)
+
+  22 Jul 2005; Marinus Schraal <foser@gentoo.org> gnumeric-1.4.3-r1.ebuild :
+  Add patch to work with newer libgsf (#96590)
 
   18 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> gnumeric-1.4.3.ebuild:
   Stable on alpha
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 53f1a4abd750..cd4700ab1783 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4efb73ab43f974bc41253cede90fa6ad gnumeric-1.4.2.ebuild 2536
+MD5 8736d05cc4221bf7bd7d3ea629cdfae8 gnumeric-1.4.3-r1.ebuild 2585
 MD5 d9d2577f6a3b23dac47c3d4eaaa1b9fc ChangeLog 12982
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a3b43a1e9be8b477e946d20839b7e627 gnumeric-1.4.3.ebuild 2509
 MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591
+MD5 3fab812a68d5849434ba8d7ee3ef2887 files/gnumeric-1.4.3-new_gsf_api.patch 3308
 MD5 f7eb652589a8e0103264b9d828cf4046 files/digest-gnumeric-1.4.2 69
 MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3 69
+MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r1 69
 MD5 b1c7dc9c30396b4fad208b985e9ade9d files/gnumeric-1.4.2-sheet_object_scroll.patch 3295
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCtAhNViELBEf1JB0RAgjKAKCBl7g5DAG4mLP3OtsIP5S12SSm2wCfc2Vk
-pwsNlEf6j1eC+SGsnAk2xe8=
-=crTu
------END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r1 b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r1
new file mode 100644
index 000000000000..b63fff8bda02
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r1
@@ -0,0 +1 @@
+MD5 b684eec48b1696d7a8d7152d1e17741c gnumeric-1.4.3.tar.bz2 13756646
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-new_gsf_api.patch b/app-office/gnumeric/files/gnumeric-1.4.3-new_gsf_api.patch
new file mode 100644
index 000000000000..96cf096905df
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.4.3-new_gsf_api.patch
@@ -0,0 +1,95 @@
+===================================================================
+RCS file: /cvs/gnome/gnumeric/plugins/excel/boot.c,v
+retrieving revision 1.122
+retrieving revision 1.122.2.1
+diff -u -r1.122 -r1.122.2.1
+--- boot.c	2005/01/17 04:37:25	1.122
++++ boot.c	2005/07/04 20:00:58	1.122.2.1
+@@ -117,22 +117,19 @@
+ }
+ 
+ static void
+-excel_read_metadata (Workbook  *wb, GsfInfile *ole, char const *name,
++excel_read_metadata (GsfDocMetaData *meta_data, GsfInfile *ole, char const *name,
+ 		     IOContext *context)
+ {
+-	GError   *err = NULL;
+ 	GsfInput *stream = gsf_infile_child_by_name (ole, name);
+ 
+ 	if (stream != NULL) {
+-		gsf_msole_metadata_read (stream, &err);
++		GError *err = gsf_msole_metadata_read (stream, meta_data);
+ 		if (err != NULL) {
+ 			gnm_io_warning (context, err->message);
+ 			g_error_free (err);
+ 		}
+-		gsf_input_seek (stream, 0, G_SEEK_SET);
+-		g_object_set_data_full (G_OBJECT (wb), name,
+-			gsf_structured_blob_read (stream), g_object_unref);
+-		g_object_unref (G_OBJECT (stream));
++
++		g_object_unref (stream);
+ 	}
+ }
+ 
+@@ -154,6 +151,7 @@
+ 	GsfInfile *ole = gsf_infile_msole_new (input, &err);
+ 	Workbook  *wb = wb_view_workbook (wbv);
+ 	gboolean   is_double_stream_file, is_97;
++	GsfDocMetaData *meta_data;
+ 
+ 	if (ole == NULL) {
+ 		guint8 const *data;
+@@ -188,8 +186,11 @@
+ 	excel_read_workbook (context, wbv, stream, &is_double_stream_file);
+ 	g_object_unref (G_OBJECT (stream));
+ 
+-	excel_read_metadata (wb, ole, "\05SummaryInformation", context);
+-	excel_read_metadata (wb, ole, "\05DocumentSummaryInformation", context);
++	meta_data = gsf_doc_meta_data_new ();
++	excel_read_metadata (meta_data, ole, "\05DocumentSummaryInformation", context);
++	excel_read_metadata (meta_data, ole, "\05SummaryInformation", context);
++	g_object_set_data_full (G_OBJECT (wb), "GsfDocMetaData",
++		meta_data, g_object_unref);
+ 
+ 	/* See if there are any macros to keep around */
+ 	stream = gsf_infile_child_by_name (ole, "\01CompObj");
+@@ -228,6 +229,7 @@
+ 	GsfOutfile *outfile;
+ 	ExcelWriteState *ewb = NULL;
+ 	GsfStructuredBlob *blob;
++	GsfDocMetaData *meta_data;
+ 
+ 	io_progress_message (context, _("Preparing to save..."));
+ 	io_progress_range_push (context, 0.0, 0.1);
+@@ -250,25 +252,20 @@
+ 	excel_write_state_free (ewb);
+ 	io_progress_range_pop (context);
+ 
+-	blob = g_object_get_data (G_OBJECT (wb), "\05DocumentSummaryInformation");
+-	if (blob == NULL) {
++	meta_data = g_object_get_data (G_OBJECT (wb), "GsfDocMetaData");
++	if (meta_data != NULL) {
+ 		content = gsf_outfile_new_child (outfile,
+ 			"\05DocumentSummaryInformation", FALSE);
+-		gsf_msole_metadata_write (content, TRUE, NULL);
++		gsf_msole_metadata_write (content, meta_data, TRUE);
+ 		gsf_output_close (content);
+ 		g_object_unref (G_OBJECT (content));
+-	} else
+-		gsf_structured_blob_write (blob, outfile);
+ 
+-	blob = g_object_get_data (G_OBJECT (wb), "\05SummaryInformation");
+-	if (blob == NULL) {
+ 		content = gsf_outfile_new_child (outfile,
+ 			"\05SummaryInformation", FALSE);
+-		gsf_msole_metadata_write (content, FALSE, NULL);
++		gsf_msole_metadata_write (content, meta_data, FALSE);
+ 		gsf_output_close (content);
+ 		g_object_unref (G_OBJECT (content));
+-	} else
+-		gsf_structured_blob_write (blob, outfile);
++	}
+ 
+ 	/* restore the macros we loaded */
+ 	blob = g_object_get_data (G_OBJECT (wb), "MS_EXCEL_COMPOBJ");
diff --git a/app-office/gnumeric/gnumeric-1.4.3-r1.ebuild b/app-office/gnumeric/gnumeric-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..23a1776b421f
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.4.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3-r1.ebuild,v 1.1 2005/07/22 16:26:55 foser Exp $
+
+inherit virtualx gnome2 eutils flag-o-matic
+
+DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
+HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+#IUSE="libgda gnomedb python bonobo"
+IUSE="libgda python gnome"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=gnome-extra/libgsf-1.12
+	>=dev-libs/libxml2-2.4.12
+	>=x11-libs/pango-1.4
+
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libgnomeprint-2.6
+	>=gnome-base/libgnomeprintui-2.6
+	>=media-libs/libart_lgpl-2.3.11
+
+	gnome? ( >=x11-libs/gtk+-2.4
+		>=gnome-base/libglade-2.4
+		>=gnome-base/libgnomecanvas-2
+		>=gnome-base/libgnomeprint-2.6
+		>=gnome-base/libgnomeprintui-2.6
+		>=media-libs/libart_lgpl-2.3.11
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonobo-2.2
+		>=gnome-base/libbonoboui-2.2
+		dev-util/pkgconfig )
+	python? ( >=dev-lang/python-2
+		>=dev-python/pygtk-2 )
+	libgda? ( >=gnome-extra/libgda-1.0.1 )
+	dev-util/pkgconfig" # see #67107
+#	gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	dev-util/pkgconfig
+	app-text/scrollkeeper"
+
+pkg_setup() {
+
+	if use gnome; then
+		if ! pkg-config --exists libgsf-gnome-1; then
+			einfo "libgsf needs to be compiled with gnome in USE"
+			einfo "for this version of gnumeric to work. Rebuild"
+			einfo "libgsf first like this :"
+			einfo "USE=gnome emerge libgsf -vp"
+			die "libgsf was built without gnome support..."
+		fi
+	fi
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+	gnome2_omf_fix
+
+	cd ${S}/plugins/corba
+	# makejobs proposed patch (#78828)
+	epatch ${FILESDIR}/${PN}-1.4.3-makejobs.patch
+	# use newer libgsf api (#96179)
+	cd ${S}/plugins/excel
+	epatch ${FILESDIR}/${P}-new_gsf_api.patch
+
+	cd ${S}
+	automake || die
+
+}
+
+src_compile() {
+
+	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
+	replace-flags "-Os" "-O2"
+
+	econf \
+		`use_with python` \
+		`use_with libgda gda` \
+		`use_with gnome` \
+		|| die
+# building nogui is still too problematic
+#		`use_with gtk` \
+	# `use_with gnomedb gda`
+
+	# the build process has to be able to connect to X
+	Xemake || die
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# make gnumeric find it's help
+	dosym \
+		/usr/share/gnome/help/gnumeric \
+		/usr/share/${PN}/${PV}/doc
+
+}
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
+
+USE_DESTDIR="1"