summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authormycroft <mycroft>2002-07-15 16:51:31 +0000
committermycroft <mycroft>2002-07-15 16:51:31 +0000
commit48a9f6a7a4cca9fd034693889a50d1068e859772 (patch)
treebfb67650ecb0f161352e7daf0332c377122f9dcf /math
parent2e6d7e851dd37a2f2cf78d018259900f77d98794 (diff)
downloadpkgsrc-48a9f6a7a4cca9fd034693889a50d1068e859772.tar.gz
A package to fix obvious errors in the psiconv plugin.
Diffstat (limited to 'math')
-rw-r--r--math/gnumeric0/distinfo3
-rw-r--r--math/gnumeric0/patches/patch-aa44
2 files changed, 46 insertions, 1 deletions
diff --git a/math/gnumeric0/distinfo b/math/gnumeric0/distinfo
index 0c91e1425ed..a7e3dc880a4 100644
--- a/math/gnumeric0/distinfo
+++ b/math/gnumeric0/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/17 13:12:00 martti Exp $
+$NetBSD: distinfo,v 1.2 2002/07/15 16:51:31 mycroft Exp $
SHA1 (gnumeric-0.75.tar.gz) = 5c5d8ea33283452c61a989b493a34b9b584b150d
Size (gnumeric-0.75.tar.gz) = 8722118 bytes
+SHA1 (patch-aa) = 554ba6f4c4469ca83f1324f8bfc9a7c56f6031fd
diff --git a/math/gnumeric0/patches/patch-aa b/math/gnumeric0/patches/patch-aa
new file mode 100644
index 00000000000..8459eb1ebf2
--- /dev/null
+++ b/math/gnumeric0/patches/patch-aa
@@ -0,0 +1,44 @@
+$NetBSD: patch-aa,v 1.1 2002/07/15 16:51:32 mycroft Exp $
+
+--- plugins/psiconv/psiconv-read.c.orig Sun Jul 14 13:19:07 2002
++++ plugins/psiconv/psiconv-read.c Sun Jul 14 13:22:50 2002
+@@ -420,7 +420,7 @@
+
+ formula = psiconv_get_formula (psi_formulas, psi_cell->ref_formula);
+
+- return (formula != NULL) ? return parse_subexpr (formula) : NULL;
++ return (formula != NULL) ? parse_subexpr (formula) : NULL;
+ }
+
+ static void
+@@ -429,14 +429,13 @@
+ {
+ Cell *cell;
+ Value *val;
+- ExprTree *tree;
+- psiconv_formula psi_formula;
++ ExprTree *expr;
+
+ cell = sheet_cell_fetch (sheet, psi_cell->column, psi_cell->row);
+ if (!cell)
+ return;
+
+- val = value_new_from_psi_cell (psi_cell);
++ val = value_new_from_psi_cell (cell, psi_cell);
+
+ if (psi_cell->calculated)
+ expr = expr_new_from_formula (psi_cell, psi_formulas);
+@@ -445,11 +444,11 @@
+ /* TODO : is there a notion of parse format ?
+ * How does it store a user entered date ?
+ */
+- if (value != NULL)
++ if (val != NULL)
+ cell_set_expr_and_value (cell, expr, val, NULL, TRUE);
+ else
+ cell_set_expr (cell, expr, NULL);
+- } else if (value != NULL) {
++ } else if (val != NULL) {
+ /* TODO : is there a notion of parse format ?
+ * How does it store a user entered date ?
+ */