[packages/abiword.git] / abiword-goffice03.patch

--- abiword-plugins/tools/abigochart/plugin.m4~	2006-10-31 22:25:11.000000000 +0100
+++ abiword-plugins/tools/abigochart/plugin.m4	2006-11-17 13:33:03.318315000 +0100
@@ -23,7 +23,7 @@
 
 LIBGOffice_REQUIRED_VERSION=0.2.1
 
-PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[
+PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION],[
         ABI_PLUGIN_REPORT([abigochart: okay])
 ],[        ABI_PLUGIN_REPORT([abigochart: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required])
         abi_plugin_disable=yes
--- abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp~	2006-10-31 22:25:12.000000000 +0100
+++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp	2006-11-17 13:35:44.258315000 +0100
@@ -72,7 +72,7 @@
 #include <goffice/graph/gog-data-allocator.h>
 #include <goffice/graph/gog-series.h>
 #include <goffice/graph/gog-guru.h>
-#include <goffice/graph/gog-renderer-pixbuf.h>
+#include <goffice/graph/gog-renderer-cairo.h>
 #include <goffice/graph/gog-data-set.h>
 #include <goffice/graph/gog-object-xml.h>
 #include <goffice/data/go-data-simple.h>
@@ -1119,7 +1119,7 @@
 {
 	m_Graph = NULL;
 	m_Image = NULL;
-	m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_PIXBUF_TYPE, NULL));
+	m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_CAIRO_TYPE, NULL));
 	pix_width = pix_height = 0;
 	width = height = 0;
 	m_Guru = NULL;
@@ -1189,10 +1189,10 @@
 			GdkPixbuf *pixbuf;
 			pix_width = _width;
 			pix_height = _height;
-			gog_renderer_pixbuf_update (GOG_RENDERER_PIXBUF (m_Renderer), _width, _height, 1.0);	
+			gog_renderer_cairo_update (GOG_RENDERER_CAIRO (m_Renderer), _width, _height, 1.0);	
 			if (m_Image)
 				delete m_Image;
-			pixbuf = gog_renderer_pixbuf_get (GOG_RENDERER_PIXBUF (m_Renderer));
+			pixbuf = gog_renderer_cairo_get_pixbuf (GOG_RENDERER_CAIRO (m_Renderer));
 			m_Image = new GR_UnixImage(NULL, pixbuf);
 			g_object_ref(pixbuf);
 			m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec);
--- abiword-plugins/configure~	2006-11-17 13:08:32.000000000 +0100
+++ abiword-plugins/configure	2006-11-17 13:51:20.348315000 +0100
@@ -24074,12 +24074,12 @@
         pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -24092,12 +24092,12 @@
         pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -24116,9 +24116,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"`
+	        GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"`
         else
-	        GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"`
+	        GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GOFFICE_PKG_ERRORS" >&5
Commit	Line	Data
c6f41f57 PZ	1	--- abiword-plugins/tools/abigochart/plugin.m4~ 2006-10-31 22:25:11.000000000 +0100
c6f41f57 PZ	2	+++ abiword-plugins/tools/abigochart/plugin.m4 2006-11-17 13:33:03.318315000 +0100
7a9c19f0	3	@@ -23,7 +23,7 @@
7a9c19f0	4
c6f41f57	5	LIBGOffice_REQUIRED_VERSION=0.2.1
7a9c19f0	6
	7	-PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[
	8	+PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION],[
	9	ABI_PLUGIN_REPORT([abigochart: okay])
	10	],[ ABI_PLUGIN_REPORT([abigochart: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required])
	11	abi_plugin_disable=yes
c6f41f57 PZ	12	--- abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp~ 2006-10-31 22:25:12.000000000 +0100
c6f41f57 PZ	13	+++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp 2006-11-17 13:35:44.258315000 +0100
37117c81	14	@@ -72,7 +72,7 @@
	15	#include <goffice/graph/gog-data-allocator.h>
	16	#include <goffice/graph/gog-series.h>
	17	#include <goffice/graph/gog-guru.h>
	18	-#include <goffice/graph/gog-renderer-pixbuf.h>
	19	+#include <goffice/graph/gog-renderer-cairo.h>
	20	#include <goffice/graph/gog-data-set.h>
	21	#include <goffice/graph/gog-object-xml.h>
	22	#include <goffice/data/go-data-simple.h>
c6f41f57	23	@@ -1119,7 +1119,7 @@
37117c81	24	{
	25	m_Graph = NULL;
	26	m_Image = NULL;
	27	- m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_PIXBUF_TYPE, NULL));
	28	+ m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_CAIRO_TYPE, NULL));
c6f41f57	29	pix_width = pix_height = 0;
37117c81	30	width = height = 0;
37117c81	31	m_Guru = NULL;
c6f41f57	32	@@ -1189,10 +1189,10 @@
37117c81	33	GdkPixbuf *pixbuf;
c6f41f57 PZ	34	pix_width = _width;
c6f41f57 PZ	35	pix_height = _height;
37117c81	36	- gog_renderer_pixbuf_update (GOG_RENDERER_PIXBUF (m_Renderer), _width, _height, 1.0);
	37	+ gog_renderer_cairo_update (GOG_RENDERER_CAIRO (m_Renderer), _width, _height, 1.0);
	38	if (m_Image)
	39	delete m_Image;
	40	- pixbuf = gog_renderer_pixbuf_get (GOG_RENDERER_PIXBUF (m_Renderer));
	41	+ pixbuf = gog_renderer_cairo_get_pixbuf (GOG_RENDERER_CAIRO (m_Renderer));
	42	m_Image = new GR_UnixImage(NULL, pixbuf);
	43	g_object_ref(pixbuf);
	44	m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec);
c6f41f57 PZ	45	--- abiword-plugins/configure~ 2006-11-17 13:08:32.000000000 +0100
	46	+++ abiword-plugins/configure 2006-11-17 13:51:20.348315000 +0100
	47	@@ -24074,12 +24074,12 @@
	48	pkg_cv_GOFFICE_CFLAGS="$GOFFICE_CFLAGS"
	49	else
	50	if test -n "$PKG_CONFIG" && \
	51	- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
	52	- ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
	53	+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
	54	+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
	55	ac_status=$?
	56	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	57	(exit $ac_status); }; then
	58	- pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
	59	+ pkg_cv_GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
	60	else
	61	pkg_failed=yes
	62	fi
	63	@@ -24092,12 +24092,12 @@
	64	pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
	65	else
	66	if test -n "$PKG_CONFIG" && \
	67	- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-1 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
	68	- ($PKG_CONFIG --exists --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
	69	+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgoffice-0.3 >= \$LIBGOffice_REQUIRED_VERSION\"") >&5
	70	+ ($PKG_CONFIG --exists --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION") 2>&5
	71	ac_status=$?
	72	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	73	(exit $ac_status); }; then
	74	- pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
	75	+ pkg_cv_GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION" 2>/dev/null`
	76	else
	77	pkg_failed=yes
	78	fi
	79	@@ -24116,9 +24116,9 @@
	80	_pkg_short_errors_supported=no
	81	fi
	82	if test $_pkg_short_errors_supported = yes; then
	83	- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"`
	84	+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"`
	85	else
	86	- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"`
	87	+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION"`
	88	fi
	89	# Put the nasty error message in config.log where it belongs
	90	echo "$GOFFICE_PKG_ERRORS" >&5