abiword-goffice03.patch

   1 diff -aurN abiword-plugins.orig/tools/abigochart/plugin.m4 abiword-plugins/tools/abigochart/plugin.m4
   2 --- abiword-plugins.orig/tools/abigochart/plugin.m4     2005-12-27 12:09:54.000000000 +0100
   3 +++ abiword-plugins/tools/abigochart/plugin.m4  2006-06-11 19:18:51.900687200 +0200
   4 @@ -23,7 +23,7 @@
   5
   6  LIBGOffice_REQUIRED_VERSION=0.1.0
   7
   8 -PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[
   9 +PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.3 >= $LIBGOffice_REQUIRED_VERSION],[
  10          ABI_PLUGIN_REPORT([abigochart: okay])
  11  ],[        ABI_PLUGIN_REPORT([abigochart: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required])
  12          abi_plugin_disable=yes
  13 diff -aurN abiword-plugins.orig/tools/abigochart/unix/AbiGOChart.cpp abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp
  14 --- abiword-plugins.orig/tools/abigochart/unix/AbiGOChart.cpp   2006-03-26 15:28:54.000000000 +0200
  15 +++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp        2006-10-26 22:36:49.179956728 +0200
  16 @@ -72,7 +72,7 @@
  17  #include <goffice/graph/gog-data-allocator.h>
  18  #include <goffice/graph/gog-series.h>
  19  #include <goffice/graph/gog-guru.h>
  20 -#include <goffice/graph/gog-renderer-pixbuf.h>
  21 +#include <goffice/graph/gog-renderer-cairo.h>
  22  #include <goffice/graph/gog-data-set.h>
  23  #include <goffice/graph/gog-object-xml.h>
  24  #include <goffice/data/go-data-simple.h>
  25 @@ -1102,7 +1102,7 @@
  26  {
  27         m_Graph = NULL;
  28         m_Image = NULL;
  29 -       m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_PIXBUF_TYPE, NULL));
  30 +       m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_CAIRO_TYPE, NULL));
  31         width = height = 0;
  32         m_Guru = NULL;
  33  }
  34 @@ -1157,10 +1157,10 @@
  35                         GdkPixbuf *pixbuf;
  36                         width = _width;
  37                         height = _height;
  38 -                       gog_renderer_pixbuf_update (GOG_RENDERER_PIXBUF (m_Renderer), _width, _height, 1.0);
  39 +                       gog_renderer_cairo_update (GOG_RENDERER_CAIRO (m_Renderer), _width, _height, 1.0);
  40                         if (m_Image)
  41                                 delete m_Image;
  42 -                       pixbuf = gog_renderer_pixbuf_get (GOG_RENDERER_PIXBUF (m_Renderer));
  43 +                       pixbuf = gog_renderer_cairo_get_pixbuf (GOG_RENDERER_CAIRO (m_Renderer));
  44                         m_Image = new GR_UnixImage(NULL, pixbuf);
  45                         g_object_ref(pixbuf);
  46                         m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec);
  47 @@ -1256,7 +1256,7 @@
  48         /* the resolution of symbols in libgoffice must be forced because when
  49         creating the guru window, libglade needs foo_canvas_new. There might
  50         be a better solution..., I could not find one */
  51 -       g_module_close (g_module_open ("libgoffice-1", (GModuleFlags)0));
  52 +       g_module_close (g_module_open ("libgoffice-0.3", (GModuleFlags)0));
  53     return 1;
  54  }
  55