Apply a patch for goffice-0.1.2, see bug #118290

Package-Manager: portage-2.1_pre3-r1

4 files changed, 85 insertions, 16 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index 8d38936b8a80..4a9eb9a36f39 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword-plugins
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.8 2005/12/20 03:55:59 hanno Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.9 2006/01/10 01:38:02 obz Exp $
+
+  10 Jan 2006; Mike Gardiner <obz@gentoo.org>
+  +files/abiword-plugins-2.4.1-goffice.patch,
+  abiword-plugins-2.4.1-r2.ebuild:
+  Apply a patch for goffice-0.1.2, see bug #118290
 
   20 Dec 2005; Hanno Boeck <hanno@gentoo.org>
   +files/abiword-plugins-2.4.2-gcc41.patch, abiword-plugins-2.4.1-r2.ebuild:
diff --git a/app-office/abiword-plugins/Manifest b/app-office/abiword-plugins/Manifest
index 6dd74da27fe7..92ce3864e824 100644
--- a/app-office/abiword-plugins/Manifest
+++ b/app-office/abiword-plugins/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9531ef83c9dffd86a51bf2c713239c91 ChangeLog 1744
+MD5 33ac12e949667cbb2a93307d7d0da7d2 ChangeLog 1921
 MD5 e88aea36421897bd94592e363e18ef69 abiword-plugins-2.4.1-r1.ebuild 1638
-MD5 022e8779680a274f4a3edf5b6daa893c abiword-plugins-2.4.1-r2.ebuild 2142
+MD5 611125dc4e37101c182f962cb89bd6f4 abiword-plugins-2.4.1-r2.ebuild 2269
+MD5 d24a48680d49eefc71e38167a3a5c1e3 files/abiword-plugins-2.4.1-goffice.patch 2837
 MD5 221600d690252654411fd4651bdf8ef6 files/abiword-plugins-2.4.2-gcc41.patch 581
 MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-plugins-2.4.1-r1 68
 MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-plugins-2.4.1-r2 68
 MD5 48bd81fe7d336ec791cfef178ede4ed3 metadata.xml 349
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDp4E7r2QksT29OyARAqfXAJ9E0tFKy6sLZTADAd0vdw6nm8DUXACfbYBV
-2YjPQ2Z6jg2Nkng7yceOjb8=
-=Ird5
------END PGP SIGNATURE-----
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild
index 292edfb262f2..04f2a18106f3 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild,v 1.3 2005/12/20 03:55:59 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild,v 1.4 2006/01/10 01:38:02 obz Exp $
 
 inherit eutils
 
@@ -44,6 +44,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/abiword-plugins-2.4.2-gcc41.patch
+	# Patch for newer goffice, see bug #118290
+	has_version ">=x11-libs/goffice-0.1.2" && \
+		epatch ${FILESDIR}/${P}-goffice.patch
 }
 
 src_compile() {
diff --git a/app-office/abiword-plugins/files/abiword-plugins-2.4.1-goffice.patch b/app-office/abiword-plugins/files/abiword-plugins-2.4.1-goffice.patch
new file mode 100644
index 000000000000..67956aeb563b
--- /dev/null
+++ b/app-office/abiword-plugins/files/abiword-plugins-2.4.1-goffice.patch
@@ -0,0 +1,70 @@
+diff -ur abiword-2.4.1/abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp abiword-2.4.1-patched/abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp
+--- abiword-2.4.1/abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp	2005-09-06 22:56:27.000000000 +0800
++++ abiword-2.4.1-patched/abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp	2006-01-10 09:24:42.000000000 +0800
+@@ -78,6 +78,8 @@
+ #include <goffice/graph/gog-renderer-gnome-print.h>
+ #include <goffice/utils/go-format.h>
+ #include <gsf/gsf-impl-utils.h>
++#include <gsf/gsf-output-memory.h>
++#include <gsf/gsf-libxml.h>
+ 
+ #include "ut_sleep.h"
+ #include <sys/types.h>  
+@@ -759,15 +761,14 @@
+ {
+ 	g_return_if_fail (IS_GOG_GRAPH (graph));
+ 	AbiControlGUI *acg = ABI_CONTROL_GUI (data);
+-	xmlDocPtr pDoc = xmlNewDoc ((xmlChar const*)"1.0");
+-	xmlChar *mem;
+-	int size;
+ 	AbiGO_LocaleTransactor tn(LC_NUMERIC, "C");
+ 	AbiGO_LocaleTransactor tm(LC_MONETARY, "C");
+-	pDoc->children = gog_object_write_xml (GOG_OBJECT (graph), pDoc);
+-	xmlDocDumpMemory (pDoc, &mem, &size);
++	GsfOutput* output = gsf_output_memory_new ();
++	GsfXMLOut* xml = gsf_xml_out_new (output);
++	gog_object_write_xml_sax (GOG_OBJECT (graph), xml);
++	UT_Byte const *bytes = gsf_output_memory_get_bytes (GSF_OUTPUT_MEMORY (output));
+ 	UT_ByteBuf myByteBuf;
+-	myByteBuf.append((UT_Byte*)mem, size);
++	myByteBuf.append (bytes, strlen ((char const*) bytes));
+ 	XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
+ 	FV_View* pView = static_cast<FV_View*>(pFrame->getCurrentView());
+ 
+@@ -776,8 +777,8 @@
+ 	UT_DEBUGMSG(("Doing Embed Update from GOG callback \n"));
+ 	pView->cmdUpdateEmbed(&myByteBuf,mimetypeGOChart,szProps);
+ 
+-	xmlFree (mem);
+-	xmlFreeDoc (pDoc);
++	g_object_unref (xml);
++	g_object_unref (output);
+ 	g_object_unref (acg);
+ }
+ 
+@@ -798,18 +799,17 @@
+ 	GogGraph *graph = (GogGraph *) g_object_new (GOG_GRAPH_TYPE, NULL);
+ 	/* by default, create one chart and add it to the graph */
+ 	gog_object_add_by_name (GOG_OBJECT (graph), "Chart", NULL);
+-	xmlDocPtr xml = xmlNewDoc ((xmlChar const*)"1.0");
+-	xmlChar *mem;
+-	int size;
++	GsfOutput* output = gsf_output_memory_new ();
++	GsfXMLOut* xml = gsf_xml_out_new (output);
+ 	{
+ 		AbiGO_LocaleTransactor tn(LC_NUMERIC, "C");
+ 		AbiGO_LocaleTransactor tm(LC_NUMERIC, "C");
+-		xml->children = gog_object_write_xml (GOG_OBJECT (graph), xml);
++		gog_object_write_xml_sax (GOG_OBJECT (graph), xml);
+ 	}
+-	xmlDocDumpMemory (xml, &mem, &size);
+-	myByteBuf.append((UT_Byte*)mem, size);
+-	xmlFree (mem);
+-	xmlFreeDoc (xml);
++	UT_Byte const *bytes = gsf_output_memory_get_bytes (GSF_OUTPUT_MEMORY (output));
++	myByteBuf.append(bytes, strlen ((char const*) bytes));
++	g_object_unref (xml);
++	g_object_unref (output);
+ 
+ 	const char* mimetypeGOChart = "application/x-goffice-graph";
+ 	const char * szProps="embed-type: GOChart; width:2.5in; height:2.5in";