Fix build, remove broken.

Approved by:	maintainer (impicit)
Feature safe:	yes

2 files changed, 40 insertions, 15 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index dfa888558207..9560408dbfd7 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.2.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/
@@ -29,8 +29,6 @@ RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
 		${SITE_PERL}/Finance/QuoteHist.pm:${PORTSDIR}/finance/p5-Finance-QuoteHist \
 		${LOCALBASE}/share/omf/gnucash-docs/gnucash-guide-C.omf:${PORTSDIR}/finance/gnucash-docs
 
-BROKEN=		does not compile
-
 OPTIONS=	AQBANKING	"AqBanking support (HBCI/OpenHBCI)"	off	\
 		OFX		"OFX support"				off	\
 		POSTGRESQL	"Enable Postgresql as Backend"		off
diff --git a/finance/gnucash/files/patch-src-gnome-utils-gnc-html-graph-gog.c b/finance/gnucash/files/patch-src-gnome-utils-gnc-html-graph-gog.c
index e2447be4ff7c..eee85f36bcaf 100644
--- a/finance/gnucash/files/patch-src-gnome-utils-gnc-html-graph-gog.c
+++ b/finance/gnucash/files/patch-src-gnome-utils-gnc-html-graph-gog.c
@@ -1,5 +1,5 @@
 --- src/gnome-utils/gnc-html-graph-gog.c.orig	2008-01-08 02:06:26.000000000 +0100
-+++ src/gnome-utils/gnc-html-graph-gog.c	2009-05-04 23:45:42.167617782 +0200
++++ src/gnome-utils/gnc-html-graph-gog.c	2009-09-21 10:43:38.000000000 +0200
 @@ -46,7 +46,22 @@
  #ifndef GTKHTML_USES_GTKPRINT
  #    include <goffice/graph/gog-renderer-gnome-print.h>
@@ -24,7 +24,7 @@
  #include <goffice/graph/gog-styled-object.h>
  #include <goffice/graph/gog-plot.h>
  #include <goffice/graph/gog-series.h>
-@@ -98,7 +113,7 @@
+@@ -98,7 +113,7 @@ gnc_html_graph_gog_init(void)
    libgoffice_init();
    
    /* Initialize plugins manager */
@@ -33,7 +33,7 @@
  
    gnc_html_register_object_handler( "gnc-guppi-pie", handle_piechart );
    gnc_html_register_object_handler( "gnc-guppi-bar", handle_barchart );
-@@ -189,7 +204,7 @@
+@@ -189,7 +204,7 @@ add_pixbuf_graph_widget( GtkHTMLEmbedded
    gog_object_update (GOG_OBJECT (graph));
  
  #if defined(HAVE_GOFFICE_0_5)
@@ -42,7 +42,7 @@
  					 "model", graph,
  					 NULL));
    update_status = gog_renderer_update (renderer, eb->width, eb->height);
-@@ -229,7 +244,7 @@
+@@ -229,7 +244,7 @@ create_basic_plot_elements(const char *p
                             GogObject **out_chart,
                             GogPlot **out_plot)
  {
@@ -51,7 +51,18 @@
    *out_chart = gog_object_add_by_name(*out_graph, "Chart", NULL);
    *out_plot = gog_plot_new_by_name(plot_type_name);
    if (!*out_plot)
-@@ -401,7 +416,7 @@
+@@ -363,8 +378,8 @@ handle_piechart(gnc_html * html, GtkHTML
+   }
+   gog_object_add_by_name(chart, "Legend", NULL);
+ 
+-  GOG_STYLED_OBJECT(graph)->style->outline.width = 5;
+-  GOG_STYLED_OBJECT(graph)->style->outline.color = RGBA_BLACK;
++  GOG_STYLED_OBJECT(graph)->style->line.width = 5;
++  GOG_STYLED_OBJECT(graph)->style->line.color = GO_COLOR_BLACK;
+ 
+   series = gog_plot_new_series(plot);
+   labelData = go_data_vector_str_new((char const * const *)labels, datasize, NULL);
+@@ -401,7 +416,7 @@ handle_barchart(gnc_html * html, GtkHTML
    GogObject *graph, *chart;
    GogPlot *plot;
    GogSeries *series;
@@ -60,7 +71,7 @@
    GOData *label_data, *slice_data;
    int data_rows, data_cols;
    double *data = NULL;
-@@ -489,8 +504,8 @@
+@@ -489,11 +504,11 @@ handle_barchart(gnc_html * html, GtkHTML
        gog_series_set_dim (series, 1, slice_data, NULL);
        go_data_emit_changed (GO_DATA (slice_data));
  
@@ -70,8 +81,12 @@
 +      style->fill.type = GO_STYLE_FILL_PATTERN; 
        if (gdk_color_parse (col_colors[i], &color)) {
             style->fill.auto_back = FALSE;
-            go_pattern_set_solid (&style->fill.pattern, GDK_TO_UINT (color));
-@@ -503,8 +518,8 @@
+-           go_pattern_set_solid (&style->fill.pattern, GDK_TO_UINT (color));
++           go_pattern_set_solid (&style->fill.pattern, GO_COLOR_FROM_GDK (color));
+       } else {
+            g_warning("cannot parse color [%s]", col_colors[i]);
+       }
+@@ -503,8 +518,8 @@ handle_barchart(gnc_html * html, GtkHTML
    if (rotate_row_labels) {
      GogObject *object = gog_object_get_child_by_role (
        chart, gog_object_find_role_by_name (chart, "X-Axis"));
@@ -82,7 +97,7 @@
    }
  
    set_chart_titles_from_hash (chart, eb);
-@@ -526,7 +541,7 @@
+@@ -526,7 +541,7 @@ handle_scatter(gnc_html * html, GtkHTMLE
    GogPlot *plot;
    GogSeries *series;
    GOData *sliceData;
@@ -91,7 +106,7 @@
    int datasize;
    double *xData, *yData;
    gchar *marker_str, *color_str;
-@@ -556,7 +571,7 @@
+@@ -556,7 +571,7 @@ handle_scatter(gnc_html * html, GtkHTMLE
    }
  
    series = gog_plot_new_series( plot );
@@ -100,7 +115,19 @@
  
    sliceData = go_data_vector_val_new( xData, datasize, NULL );
    gog_series_set_dim( series, 0, sliceData, NULL );
-@@ -602,15 +617,15 @@
+@@ -588,9 +603,9 @@ handle_scatter(gnc_html * html, GtkHTMLE
+     GdkColor color;
+     if (gdk_color_parse(color_str, &color)) {
+       style->marker.auto_outline_color = FALSE;
+-      go_marker_set_outline_color(style->marker.mark, GDK_TO_UINT(color));
++      go_marker_set_outline_color(style->marker.mark, GO_COLOR_FROM_GDK(color));
+       style->line.auto_color = FALSE;
+-      style->line.color = GDK_TO_UINT(color);
++      style->line.color = GO_COLOR_FROM_GDK(color);
+     } else {
+       g_warning("cannot parse color [%s]", color_str);
+     }
+@@ -602,15 +617,15 @@ handle_scatter(gnc_html * html, GtkHTMLE
      go_marker_set_fill_color(style->marker.mark,
                               go_marker_get_outline_color(style->marker.mark));
    } else {
@@ -120,7 +147,7 @@
                 && chart_style->fill.pattern.pattern
                 == GO_PATTERN_FOREGROUND_SOLID) {
        style->marker.auto_fill_color = FALSE;
-@@ -639,7 +654,7 @@
+@@ -639,7 +654,7 @@ draw_print_cb(GtkHTMLEmbedded *eb, cairo
  {
    GogGraph *graph = GOG_GRAPH(g_object_get_data(G_OBJECT(eb), "graph"));
  #    ifdef HAVE_GOFFICE_0_5