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.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
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~ 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"
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
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`
63 @@ -24092,12 +24092,12 @@
64 pkg_cv_GOFFICE_LIBS="$GOFFICE_LIBS"
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
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`
79 @@ -24116,9 +24116,9 @@
80 _pkg_short_errors_supported=no
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"`
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"`
89 # Put the nasty error message in config.log where it belongs
90 echo "$GOFFICE_PKG_ERRORS" >&5