diff -ruN gnucash.old/Makefile gnucash/Makefile --- gnucash.old/Makefile 2009-05-05 00:01:40.000000000 +0200 +++ gnucash/Makefile 2009-05-05 00:05:24.296901560 +0200 @@ -7,8 +7,7 @@ # PORTNAME= gnucash -PORTVERSION= 2.2.7 -PORTREVISION= 2 +PORTVERSION= 2.2.9 CATEGORIES= finance gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.gnucash.org/pub/gnucash/sources/stable/ @@ -38,6 +37,7 @@ USE_GETTEXT= yes USE_XORG= xpm x11 USE_GMAKE= yes +MAKE_JOBS_SAFE= yes USE_PERL5= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix libgsf_gnome libglade2 \ diff -ruN gnucash.old/distinfo gnucash/distinfo --- gnucash.old/distinfo 2009-05-05 00:01:40.000000000 +0200 +++ gnucash/distinfo 2009-05-05 00:05:02.148601617 +0200 @@ -1,3 +1,3 @@ -MD5 (gnucash-2.2.7.tar.bz2) = 0f3f324c274b136070b769aa10591ccf -SHA256 (gnucash-2.2.7.tar.bz2) = aaa558e76427b7a990287089a6e0e5ecb0f4404e0343a7200e1588f60ffab1e8 -SIZE (gnucash-2.2.7.tar.bz2) = 7362491 +MD5 (gnucash-2.2.9.tar.bz2) = 1d814de8673b4760045bf51b72924d04 +SHA256 (gnucash-2.2.9.tar.bz2) = b1882406e71c565c1bdd64e963cf98a42c72053a7ec4608508a074a86b1d486a +SIZE (gnucash-2.2.9.tar.bz2) = 7509648 diff -ruN gnucash.old/files/patch-src-gnome-utils-gnc-html-graph-gog.c gnucash/files/patch-src-gnome-utils-gnc-html-graph-gog.c --- gnucash.old/files/patch-src-gnome-utils-gnc-html-graph-gog.c 1970-01-01 01:00:00.000000000 +0100 +++ gnucash/files/patch-src-gnome-utils-gnc-html-graph-gog.c 2009-05-05 00:05:02.126604731 +0200 @@ -0,0 +1,131 @@ +--- 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 +@@ -46,7 +46,22 @@ + #ifndef GTKHTML_USES_GTKPRINT + # include + #endif +-#include ++/* everything inside the following #ifndef can be safely removed when gnucash ++requires libgoffice >= 0.7.5. */ ++#ifndef GOG_TYPE_GRAPH ++# define GOG_TYPE_GRAPH GOG_GRAPH_TYPE ++# define GOG_TYPE_RENDERER GOG_RENDERER_TYPE ++# define GO_TYPE_PLUGIN_LOADER_MODULE GO_PLUGIN_LOADER_MODULE_TYPE ++# include ++# define GOStyle GogStyle ++# define go_styled_object_get_style gog_styled_object_get_style ++# define GO_STYLED_OBJECT GOG_STYLED_OBJECT ++# define GO_STYLE_FILL_PATTERN GOG_FILL_STYLE_PATTERN ++# define go_style_set_text_angle gog_style_set_text_angle ++#else ++# include ++# include ++#endif + #include + #include + #include +@@ -98,7 +113,7 @@ + libgoffice_init(); + + /* Initialize plugins manager */ +- go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_PLUGIN_LOADER_MODULE_TYPE); ++ go_plugins_init( NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE ); + + gnc_html_register_object_handler( "gnc-guppi-pie", handle_piechart ); + gnc_html_register_object_handler( "gnc-guppi-bar", handle_barchart ); +@@ -189,7 +204,7 @@ + gog_object_update (GOG_OBJECT (graph)); + + #if defined(HAVE_GOFFICE_0_5) +- renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_TYPE, ++ renderer = GOG_RENDERER (g_object_new (GOG_TYPE_RENDERER, + "model", graph, + NULL)); + update_status = gog_renderer_update (renderer, eb->width, eb->height); +@@ -229,7 +244,7 @@ + GogObject **out_chart, + GogPlot **out_plot) + { +- *out_graph = g_object_new(GOG_GRAPH_TYPE, NULL); ++ *out_graph = g_object_new(GOG_TYPE_GRAPH, NULL); + *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 @@ + GogObject *graph, *chart; + GogPlot *plot; + GogSeries *series; +- GogStyle *style; ++ GOStyle *style; + GOData *label_data, *slice_data; + int data_rows, data_cols; + double *data = NULL; +@@ -489,8 +504,8 @@ + gog_series_set_dim (series, 1, slice_data, NULL); + go_data_emit_changed (GO_DATA (slice_data)); + +- style = gog_styled_object_get_style (GOG_STYLED_OBJECT (series)); +- style->fill.type = GOG_FILL_STYLE_PATTERN; ++ style = go_styled_object_get_style( GO_STYLED_OBJECT(series) ); ++ 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 @@ + if (rotate_row_labels) { + GogObject *object = gog_object_get_child_by_role ( + chart, gog_object_find_role_by_name (chart, "X-Axis")); +- style = gog_styled_object_get_style (GOG_STYLED_OBJECT (object)); +- gog_style_set_text_angle (style, 90.0); ++ style = go_styled_object_get_style( GO_STYLED_OBJECT(object) ); ++ go_style_set_text_angle( style, 90.0 ); + } + + set_chart_titles_from_hash (chart, eb); +@@ -526,7 +541,7 @@ + GogPlot *plot; + GogSeries *series; + GOData *sliceData; +- GogStyle *style; ++ GOStyle *style; + int datasize; + double *xData, *yData; + gchar *marker_str, *color_str; +@@ -556,7 +571,7 @@ + } + + series = gog_plot_new_series( plot ); +- style = gog_styled_object_get_style(GOG_STYLED_OBJECT(series)); ++ style = go_styled_object_get_style(GO_STYLED_OBJECT(series)); + + sliceData = go_data_vector_val_new( xData, datasize, NULL ); + gog_series_set_dim( series, 0, sliceData, NULL ); +@@ -602,15 +617,15 @@ + go_marker_set_fill_color(style->marker.mark, + go_marker_get_outline_color(style->marker.mark)); + } else { +- GogStyle *chart_style = +- gog_styled_object_get_style(GOG_STYLED_OBJECT(chart)); ++ GOStyle *chart_style = ++ go_styled_object_get_style(GO_STYLED_OBJECT(chart)); + +- if (chart_style->fill.type == GOG_FILL_STYLE_PATTERN ++ if (chart_style->fill.type == GO_STYLE_FILL_PATTERN + && chart_style->fill.pattern.pattern == GO_PATTERN_SOLID) { + style->marker.auto_fill_color = FALSE; + go_marker_set_fill_color(style->marker.mark, + chart_style->fill.pattern.back); +- } else if (chart_style->fill.type == GOG_FILL_STYLE_PATTERN ++ } else if (chart_style->fill.type == GO_STYLE_FILL_PATTERN + && chart_style->fill.pattern.pattern + == GO_PATTERN_FOREGROUND_SOLID) { + style->marker.auto_fill_color = FALSE; +@@ -639,7 +654,7 @@ + { + GogGraph *graph = GOG_GRAPH(g_object_get_data(G_OBJECT(eb), "graph")); + # ifdef HAVE_GOFFICE_0_5 +- GogRenderer *rend = g_object_new(GOG_RENDERER_TYPE, "model", graph, NULL); ++ GogRenderer *rend = g_object_new(GOG_TYPE_RENDERER, "model", graph, NULL); + # else + GogRendererCairo *rend = g_object_new(GOG_RENDERER_CAIRO_TYPE, "model", graph, + "cairo", cr, "is-vector", TRUE, NULL); diff -ruN gnucash.old/pkg-plist gnucash/pkg-plist --- gnucash.old/pkg-plist 2009-05-05 00:01:41.000000000 +0200 +++ gnucash/pkg-plist 2009-05-05 00:05:02.147604019 +0200 @@ -324,7 +324,9 @@ share/gnucash/accounts/de_DE/acctchrt_otherloan.gnucash-xea share/gnucash/accounts/de_DE/acctchrt_skr03.gnucash-xea share/gnucash/accounts/de_DE/acctchrt_skr04.gnucash-xea +share/gnucash/accounts/de_DE/acctchrt_skr49.gnucash-xea share/gnucash/accounts/de_DE/acctchrt_studium.gnucash-xea +share/gnucash/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea share/gnucash/accounts/el_GR/acctchrt_brokerage.gnucash-xea share/gnucash/accounts/el_GR/acctchrt_carloan.gnucash-xea share/gnucash/accounts/el_GR/acctchrt_common.gnucash-xea @@ -375,6 +377,8 @@ share/gnucash/accounts/es_MX/acctchrt_retiremt.gnucash-xea share/gnucash/accounts/es_MX/acctchrt_spouseinc.gnucash-xea share/gnucash/accounts/es_MX/acctchrt_spouseretire.gnucash-xea +share/gnucash/accounts/fi_FI/acctchrt_common.gnucash-xea +share/gnucash/accounts/fi_FI/acctchrt_ry.gnucash-xea share/gnucash/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea share/gnucash/accounts/fr_CA/acctchrt_automobile.gnucash-xea share/gnucash/accounts/fr_CA/acctchrt_basecommune.gnucash-xea @@ -438,6 +442,7 @@ share/gnucash/accounts/hu_HU/acctchrt_spouseinc.gnucash-xea share/gnucash/accounts/hu_HU/acctchrt_spouseretire.gnucash-xea share/gnucash/accounts/it/acctchrt_brokerage.gnucash-xea +share/gnucash/accounts/it/acctchrt_business.gnucash-xea share/gnucash/accounts/it/acctchrt_carloan.gnucash-xea share/gnucash/accounts/it/acctchrt_checkbook.gnucash-xea share/gnucash/accounts/it/acctchrt_childcare.gnucash-xea @@ -483,6 +488,7 @@ share/gnucash/accounts/nb/acctchrt_retiremt.gnucash-xea share/gnucash/accounts/nb/acctchrt_spouseinc.gnucash-xea share/gnucash/accounts/nb/acctchrt_spouseretire.gnucash-xea +share/gnucash/accounts/nl/acctchrt_full.gnucash-xea share/gnucash/accounts/pt_BR/acctchrt_brokerage.gnucash-xea share/gnucash/accounts/pt_BR/acctchrt_carloan.gnucash-xea share/gnucash/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea @@ -575,6 +581,7 @@ share/gnucash/doc/README share/gnucash/doc/README-de.win32-bin.txt share/gnucash/doc/README-fr.win32-bin.txt +share/gnucash/doc/README-it.win32-bin.txt share/gnucash/doc/README.dependencies share/gnucash/doc/README.francais share/gnucash/doc/README.german @@ -912,6 +919,7 @@ @dirrm share/gnucash/accounts/ru @dirrm share/gnucash/accounts/pt_PT @dirrm share/gnucash/accounts/pt_BR +@dirrm share/gnucash/accounts/nl @dirrm share/gnucash/accounts/nb @dirrm share/gnucash/accounts/ja @dirrm share/gnucash/accounts/it @@ -919,6 +927,7 @@ @dirrm share/gnucash/accounts/fr_FR @dirrm share/gnucash/accounts/fr_CH @dirrm share/gnucash/accounts/fr_CA +@dirrm share/gnucash/accounts/fi_FI @dirrm share/gnucash/accounts/es_MX @dirrm share/gnucash/accounts/es_ES @dirrm share/gnucash/accounts/en_GB