[pkgsrc/trunk]: pkgsrc/math/guppi Add patch from Richard Earnshaw in PR 31825:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b65359fad244
branches:  trunk
changeset: 501408:b65359fad244
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Oct 22 13:25:18 2005 +0000

description:
Add patch from Richard Earnshaw in PR 31825:
        gnucash uses libguppi do do various graphical rendering activities.
        A bug in the libraries bar-charting code means that the labels
        on bar-charts are attached to the wrong objects, so attempting
        to open a sub-chart results in the wrong entry being selected
        (click on the first entry and the last one is displayed, click on
        the last and the first).

        Unfortunately, it would appear that guppi is no-longer being actively
        maintained, so there might not be a further release of this library.
        The attached patch is included in several source RPMS for Linux
        (and apparently was committed to the guppi source CVS).

Bump PKGREVISION.

diffstat:

 math/guppi/Makefile         |   4 +-
 math/guppi/distinfo         |   3 +-
 math/guppi/patches/patch-ac |  90 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 3 deletions(-)

diffs (121 lines):

diff -r 4f9de5a7b201 -r b65359fad244 math/guppi/Makefile
--- a/math/guppi/Makefile       Sat Oct 22 13:14:34 2005 +0000
+++ b/math/guppi/Makefile       Sat Oct 22 13:25:18 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2005/06/01 18:03:03 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2005/10/22 13:25:18 wiz Exp $
 
 DISTNAME=      Guppi-0.40.3
 PKGNAME=       ${DISTNAME:S/G/g/}
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    math graphics
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/Guppi/0.40/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 4f9de5a7b201 -r b65359fad244 math/guppi/distinfo
--- a/math/guppi/distinfo       Sat Oct 22 13:14:34 2005 +0000
+++ b/math/guppi/distinfo       Sat Oct 22 13:25:18 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/04/27 15:03:31 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/10/22 13:25:18 wiz Exp $
 
 SHA1 (Guppi-0.40.3.tar.bz2) = 7435bddddca9e3347efb006ad33198fbbe593ea7
 RMD160 (Guppi-0.40.3.tar.bz2) = c1e5575a992e40966749a8a18b2143ed69329495
 Size (Guppi-0.40.3.tar.bz2) = 1016831 bytes
 SHA1 (patch-aa) = 74b82a9fbf545d1c606f9b91c54259229f718c7d
 SHA1 (patch-ab) = 2ff86d16e39c9c3f842dbdcd2d85134f123511c4
+SHA1 (patch-ac) = 08b2c492981e25fa074280a41b0758a572b313b7
diff -r 4f9de5a7b201 -r b65359fad244 math/guppi/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/guppi/patches/patch-ac       Sat Oct 22 13:25:18 2005 +0000
@@ -0,0 +1,90 @@
+$NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $
+
+--- libguppitank/guppi-object-barchart.c       2003-05-30 21:21:16.000000000 +0200
++++ libguppitank/guppi-object-barchart.c       2003-05-30 21:21:26.000000000 +0200
+@@ -410,6 +410,7 @@
+   GuppiElementState *left_axis_state = NULL;
+   GuppiElementState *frame_state = NULL;
+   GuppiColorPalette *color_palette = NULL;
++  GuppiColorPalette *color_palette_legend = NULL;
+   GuppiDataTable *data_table;
+   GnomeFont *font;
+   
+@@ -446,11 +447,13 @@
+   /* FIXME: check for construction of legends. */
+ 
+   if (obar->legend_view && obar->col_labels) {
+-    add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, FALSE);
++    add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, 
++                  obar->legend_reversed);
+   }
+ 
+   if (obar->col_colors) {
+     color_palette = build_bar_colors (obar, FALSE);
++    color_palette_legend = build_bar_colors (obar, obar->legend_reversed);
+   }
+   
+   guppi_element_state_set (barchart_state,
+@@ -497,7 +500,7 @@
+ 
+     guppi_element_state_set (legend_state,
+                            "labels", data_table,
+-                           "swatch_colors", color_palette,
++                           "swatch_colors", color_palette_legend,
+                            "label_font", font,
+                            NULL);
+   }
+@@ -505,6 +508,8 @@
+  
+   /* clean up */
+   
++  guppi_unref (color_palette);
++  guppi_unref (color_palette_legend);
+   guppi_unref (barchart_state);
+   guppi_unref (legend_state);                    
+   guppi_unref (bottom_axis_state);
+@@ -525,6 +530,7 @@
+ 
+   GuppiDataTable *data_table;
+   GuppiColorPalette *color_palette = NULL;
++  GuppiColorPalette *color_palette_legend = NULL;
+ 
+   GuppiElementState *barchart_state;
+   GuppiElementState *legend_state = NULL;
+@@ -560,7 +566,8 @@
+   }
+ 
+   if (obar->col_labels) {
+-    add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, FALSE);
++    add_col_labels (obar, data_table, obar->data_cols, obar->col_labels, 
++                  obar->legend_reversed);
+   }
+ 
+ 
+@@ -568,6 +575,7 @@
+ 
+   if (obar->col_colors) {
+     color_palette = build_bar_colors (obar, FALSE);
++    color_palette_legend = build_bar_colors (obar, obar->legend_reversed);
+   }
+ 
+   barchart_state = guppi_element_state_new ("barchart",
+@@ -620,7 +628,8 @@
+ 
+     legend_state = guppi_element_state_new ("legend",
+                                           "labels", data_table,
+-                                          "swatch_colors", color_palette,
++                                          "swatch_colors", 
++                                          color_palette_legend,
+                                           "label_font", font,
+                                           NULL);
+ 
+@@ -669,6 +678,8 @@
+   /* Clean up after ourselves... */
+ 
+   guppi_unref (data_table);
++  guppi_unref (color_palette);
++  guppi_unref (color_palette_legend);
+ 
+   guppi_unref (barchart_state);
+   guppi_unref (bottom_axis_state);