[dia/cairo-port] We can render text!

[Zander <zbrown src gnome org>]

commit fb9b88bb4d088e6733f2d6ffa14aded9ec8ec6b0
Author: Zander Brown <zbrown gnome org>
Date:   Thu Dec 6 20:25:12 2018 +0000

    We can render text!
    
    That was unexpectedly simple

 app/renderer/diacairo-interactive.c   | 7 +++----
 config.h.win32                        | 3 ---
 configure.ac                          | 2 +-
 plug-ins/cairo/diacairo-interactive.c | 2 --
 4 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/app/renderer/diacairo-interactive.c b/app/renderer/diacairo-interactive.c
index 7162c40d..e8a31b0b 100644
--- a/app/renderer/diacairo-interactive.c
+++ b/app/renderer/diacairo-interactive.c
@@ -363,9 +363,7 @@ begin_render(DiaRenderer *self, const Rectangle *update)
     cairo_rectangle (base_renderer->cr, update->left, update->top, width, height);
     cairo_clip (base_renderer->cr);
   }
-#ifdef HAVE_PANGOCAIRO_H
   base_renderer->layout = pango_cairo_create_layout (base_renderer->cr);
-#endif
 
   cairo_set_fill_rule (base_renderer->cr, CAIRO_FILL_RULE_EVEN_ODD);
 
@@ -666,10 +664,11 @@ fill_pixel_rect(DiaRenderer *object,
 DiaRenderer *
 dia_cairo_interactive_renderer_new (DDisplay *ddisp)
 {
-  DiaCairoRenderer *renderer;
+  DiaCairoInteractiveRenderer *renderer;
 
   renderer = g_object_new (DIA_TYPE_CAIRO_INTERACTIVE_RENDERER, NULL);
-  /* CP: renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor); */
+  renderer->visible = &ddisp->visible;
+  renderer->zoom_factor = &ddisp->zoom_factor;
 
   return DIA_RENDERER(renderer);
 }
\ No newline at end of file
diff --git a/config.h.win32 b/config.h.win32
index 37f9a37d..89801cbf 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -9,9 +9,6 @@
 #define HAVE_FCNTL_H 1
 #define HAVE_GDK_PIXBUF 1
 
-/* #undef HAVE_CAIRO */
-#define HAVE_CAIRO 1
-
 #define ENABLE_NLS
 #define HAVE_BIND_TEXTDOMAIN_CODESET
 #define GETTEXT_PACKAGE "dia"
diff --git a/configure.ac b/configure.ac
index 6cf912e6..72740c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this -*- autoconf -*- file with autoconf to produce a
 dnl configure script.
 AC_INIT(dia, 0.97+git, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([subdir-objects])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_PREREQ(2.50)
diff --git a/plug-ins/cairo/diacairo-interactive.c b/plug-ins/cairo/diacairo-interactive.c
index 094cbcc1..b670ac03 100644
--- a/plug-ins/cairo/diacairo-interactive.c
+++ b/plug-ins/cairo/diacairo-interactive.c
@@ -363,9 +363,7 @@ begin_render(DiaRenderer *self, const Rectangle *update)
     cairo_rectangle (base_renderer->cr, update->left, update->top, width, height);
     cairo_clip (base_renderer->cr);
   }
-#ifdef HAVE_PANGOCAIRO_H
   base_renderer->layout = pango_cairo_create_layout (base_renderer->cr);
-#endif
 
   cairo_set_fill_rule (base_renderer->cr, CAIRO_FILL_RULE_EVEN_ODD);