[fawkes] Update graphviz patch

[rmattes]

commit dabb5e7410b166546ed29d3fe170eca383314890
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Jun 22 14:45:09 2014 -0400

    Update graphviz patch

 fawkes-0.5.0-graphviz.patch |   49 +++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 13 deletions(-)
---
diff --git a/fawkes-0.5.0-graphviz.patch b/fawkes-0.5.0-graphviz.patch
index c6b987f..e6e7f97 100644
--- a/fawkes-0.5.0-graphviz.patch
+++ b/fawkes-0.5.0-graphviz.patch
@@ -1,6 +1,19 @@
+diff -up ./src/tools/skillgui/Makefile.graphviz ./src/tools/skillgui/Makefile
+--- ./src/tools/skillgui/Makefile.graphviz	2012-09-26 18:55:32.000000000 -0400
++++ ./src/tools/skillgui/Makefile	2014-06-22 14:18:35.829316413 -0400
+@@ -44,7 +44,8 @@ ifneq ($(PKGCONFIG),)
+   endif
+   ifeq ($(HAVE_GRAPHVIZ),1)
+     CFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --cflags 'libgvc') -DWITH_CODEGENS
+-    LDFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --libs 'libgvc')
++    LDFLAGS_GRAPHVIZ = -lgvc -lcgraph -lcdt
++#    LDFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --libs 'libgvc')
+   endif
+ endif
+ 
 diff -up ./src/tools/skillgui/batch_render.cpp.graphviz ./src/tools/skillgui/batch_render.cpp
 --- ./src/tools/skillgui/batch_render.cpp.graphviz	2012-09-26 18:55:32.000000000 -0400
-+++ ./src/tools/skillgui/batch_render.cpp	2013-04-02 18:04:50.778425089 -0400
++++ ./src/tools/skillgui/batch_render.cpp	2014-06-22 14:18:35.829316413 -0400
 @@ -215,7 +215,7 @@ class SkillGuiBatchRenderer
    {
  
@@ -10,16 +23,26 @@ diff -up ./src/tools/skillgui/batch_render.cpp.graphviz ./src/tools/skillgui/bat
      if (g) {
        gvLayout(gvc, g, (char *)"dot");
        gvRender(gvc, g, (char *)"skillguicairo", NULL);
-diff -up ./src/tools/skillgui/Makefile.graphviz ./src/tools/skillgui/Makefile
---- ./src/tools/skillgui/Makefile.graphviz	2013-04-02 18:37:37.299752601 -0400
-+++ ./src/tools/skillgui/Makefile	2013-04-02 18:38:20.275457771 -0400
-@@ -44,7 +44,8 @@ ifneq ($(PKGCONFIG),)
-   endif
-   ifeq ($(HAVE_GRAPHVIZ),1)
-     CFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --cflags 'libgvc') -DWITH_CODEGENS
--    LDFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --libs 'libgvc')
-+    LDFLAGS_GRAPHVIZ = -lgvc -lcgraph -lcdt
-+#    LDFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --libs 'libgvc')
-   endif
- endif
+diff -up ./src/tools/skillgui/gvplugin_skillgui_cairo.cpp.graphviz ./src/tools/skillgui/gvplugin_skillgui_cairo.cpp
+--- ./src/tools/skillgui/gvplugin_skillgui_cairo.cpp.graphviz	2012-09-26 18:55:32.000000000 -0400
++++ ./src/tools/skillgui/gvplugin_skillgui_cairo.cpp	2014-06-22 14:27:44.512629132 -0400
+@@ -267,7 +267,7 @@ skillgui_cairo_render_end_page(GVJ_t * j
+ }
+ 
+ static void
+-skillgui_cairo_render_textpara(GVJ_t *job, pointf p, textpara_t *para)
++skillgui_cairo_render_textpara(GVJ_t *job, pointf p, textspan_t *para)
+ {
+ #ifdef USE_GVPLUGIN_TIMETRACKER
+   __tt.ping_start(__ttc_text);
+@@ -330,8 +330,8 @@ skillgui_cairo_render_textpara(GVJ_t *jo
+   Cairo::Matrix old_matrix;
+   cairo->get_matrix(old_matrix);
+ 
+-  cairo->select_font_face(para->fontname, slant, weight);
+-  cairo->set_font_size(para->fontsize);
++  cairo->select_font_face(para->font->name, slant, weight);
++  cairo->set_font_size(para->font->size);
+   //cairo->set_font_options ( Cairo::FontOptions() );
+   //cairo->set_line_width(1.0);