1 --- abiword-plugins/tools/abigochart/plugin.m4~ 2006-10-31 22:25:11.000000000 +0100
2 +++ abiword-plugins/tools/abigochart/plugin.m4 2006-11-17 13:33:03.318315000 +0100
5 LIBGOffice_REQUIRED_VERSION=0.2.1
7 -PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[
8 +PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.5 >= $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
12 --- abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp~ 2006-10-31 22:25:12.000000000 +0100
13 +++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp 2006-11-17 13:35:44.258315000 +0100
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>
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));
29 pix_width = pix_height = 0;
32 @@ -1189,10 +1189,10 @@
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);
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);
44 m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec);
45 --- abiword-plugins/configure.orig 2006-11-17 15:05:35.228315000 +0100
46 +++ abiword-plugins/configure 2006-11-17 15:14:15.268315000 +0100
47 @@ -22834,23 +22834,23 @@
49 PKG_CONFIG_MIN_VERSION=0.9.0
50 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
51 - echo "$as_me:$LINENO: checking for libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" >&5
52 -echo $ECHO_N "checking for libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION... $ECHO_C" >&6
53 + echo "$as_me:$LINENO: checking for libgoffice-0.5 >= $LIBGOffice_REQUIRED_VERSION" >&5
54 +echo $ECHO_N "checking for libgoffice-0.5 >= $LIBGOffice_REQUIRED_VERSION... $ECHO_C" >&6
56 - if $PKG_CONFIG --exists "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" ; then
57 + if $PKG_CONFIG --exists "libgoffice-0.5 >= $LIBGOffice_REQUIRED_VERSION" ; then
58 echo "$as_me:$LINENO: result: yes" >&5
59 echo "${ECHO_T}yes" >&6
62 echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
63 echo $ECHO_N "checking GOFFICE_CFLAGS... $ECHO_C" >&6
64 - GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"`
65 + GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.5 >= $LIBGOffice_REQUIRED_VERSION"`
66 echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
67 echo "${ECHO_T}$GOFFICE_CFLAGS" >&6
69 echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
70 echo $ECHO_N "checking GOFFICE_LIBS... $ECHO_C" >&6
71 - GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"`
72 + GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.5 >= $LIBGOffice_REQUIRED_VERSION"`
73 echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
74 echo "${ECHO_T}$GOFFICE_LIBS" >&6
76 @@ -22858,7 +22858,7 @@
78 ## If we have a custom action on failure, don't print errors, but
79 ## do set a variable so people can do so.
80 - GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"`
81 + GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.5 >= $LIBGOffice_REQUIRED_VERSION"`