summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--finance/gnucash-devel/Makefile5
-rw-r--r--finance/gnucash-devel/PLIST10
-rw-r--r--finance/gnucash-devel/distinfo11
-rw-r--r--finance/gnucash-devel/patches/patch-ab14
-rw-r--r--finance/gnucash-devel/patches/patch-ae24
5 files changed, 45 insertions, 19 deletions
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index 09334da4849..1a3e50af322 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/29 20:38:57 wiz Exp $
#
-DISTNAME= gnucash-1.9.4
-PKGREVISION= 1
+DISTNAME= gnucash-1.9.5
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnucash/}
diff --git a/finance/gnucash-devel/PLIST b/finance/gnucash-devel/PLIST
index 1b9715b5f59..0e230c609b0 100644
--- a/finance/gnucash-devel/PLIST
+++ b/finance/gnucash-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/29 20:38:57 wiz Exp $
bin/gnc-fq-check
bin/gnc-fq-dump
bin/gnc-fq-helper
@@ -56,6 +56,7 @@ include/gnucash/dialog-transfer.h
include/gnucash/dialog-utils.h
include/gnucash/druid-commodity.h
include/gnucash/druid-gconf-setup.h
+include/gnucash/druid-gnc-xml-import.h
include/gnucash/druid-utils.h
include/gnucash/engine-helpers.h
include/gnucash/file-utils.h
@@ -90,7 +91,6 @@ include/gnucash/gnc-druid-provider-file-cb.h
include/gnucash/gnc-druid-provider.h
include/gnucash/gnc-druid.h
include/gnucash/gnc-embedded-window.h
-include/gnucash/gnc-engine-util.h
include/gnucash/gnc-engine.h
include/gnucash/gnc-euro.h
include/gnucash/gnc-event.h
@@ -162,7 +162,6 @@ include/gnucash/option-util.h
include/gnucash/policy.h
include/gnucash/pricecell.h
include/gnucash/print-session.h
-include/gnucash/qof-be-utils.h
include/gnucash/qof.h
include/gnucash/qofbackend-p.h
include/gnucash/qofbackend.h
@@ -184,6 +183,7 @@ include/gnucash/qofquerycore.h
include/gnucash/qofreference.h
include/gnucash/qofsession.h
include/gnucash/qofsql.h
+include/gnucash/qofutil.h
include/gnucash/quickfillcell.h
include/gnucash/recncell.h
include/gnucash/register-common.h
@@ -480,6 +480,7 @@ share/gnucash/glade/binary-import.glade
share/gnucash/glade/budget.glade
share/gnucash/glade/businessprefs.glade
share/gnucash/glade/chart-export.glade
+share/gnucash/glade/choose-owner.glade
share/gnucash/glade/commodities.glade
share/gnucash/glade/commodity.glade
share/gnucash/glade/customer.glade
@@ -487,6 +488,7 @@ share/gnucash/glade/date-close.glade
share/gnucash/glade/dialog-query-list.glade
share/gnucash/glade/dialog-reset-warnings.glade
share/gnucash/glade/druid-gconf-setup.glade
+share/gnucash/glade/druid-gnc-xml-import.glade
share/gnucash/glade/druid-provider-multifile.glade
share/gnucash/glade/employee.glade
share/gnucash/glade/exchange-dialog.glade
@@ -734,8 +736,8 @@ share/xml/gnucash/xsl/gnucash-gnccustomer-vcard2.xsl
share/xml/gnucash/xsl/gnucash-std.xsl
share/xml/gnucash/xsl/string.xsl
share/xml/gnucash/xsl/vcard-gnccustomer.pl
-share/xml/qsf/pilot-qsf-gncCustomer.xml
share/xml/qsf/pilot-qsf-GnuCashInvoice.xml
+share/xml/qsf/pilot-qsf-gncCustomer.xml
share/xml/qsf/qsf-map.xsd.xml
share/xml/qsf/qsf-object.xsd.xml
@dirrm share/xml/qsf
diff --git a/finance/gnucash-devel/distinfo b/finance/gnucash-devel/distinfo
index 207fd3a71b9..bda54f88a2a 100644
--- a/finance/gnucash-devel/distinfo
+++ b/finance/gnucash-devel/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2006/04/08 23:40:11 wiz Exp $
+$NetBSD: distinfo,v 1.9 2006/04/29 20:38:57 wiz Exp $
-SHA1 (gnucash-1.9.4.tar.gz) = fbf0623fec2628bd1ad0f5eb277284a7abf3f1b6
-RMD160 (gnucash-1.9.4.tar.gz) = fe47c10d526396d126f0d57a34bd519e0d721f88
-Size (gnucash-1.9.4.tar.gz) = 10162399 bytes
+SHA1 (gnucash-1.9.5.tar.gz) = a7bbda9848345ca65f3a18f6f272edd2c86c93f9
+RMD160 (gnucash-1.9.5.tar.gz) = 078e4c4fe179e82633799a09f9cf203adbedf2e0
+Size (gnucash-1.9.5.tar.gz) = 10196556 bytes
SHA1 (patch-aa) = db08a08fe8181822c1038d0adb3174dc2ebbcc12
-SHA1 (patch-ab) = c4a8f0bf0276424d5d7fc77b99d2757a9f1d56c0
+SHA1 (patch-ab) = 92eacff50b719f3488fcf692a96ba89c45559b88
SHA1 (patch-ac) = e151916a2434a709c32c6a7169ddc287a0d5d229
SHA1 (patch-ad) = a28ccd08bb8c4a654bb5bdf619888925c854d53f
+SHA1 (patch-ae) = 32ae0e92bbfa617ef69145cd6419fd1d9a8d66bf
diff --git a/finance/gnucash-devel/patches/patch-ab b/finance/gnucash-devel/patches/patch-ab
index ebff3add25f..35b6b7a064d 100644
--- a/finance/gnucash-devel/patches/patch-ab
+++ b/finance/gnucash-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/03/13 21:23:03 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2006/04/29 20:38:57 wiz Exp $
---- src/app-utils/gnc-ui-util.c.orig 2006-03-06 02:02:59.000000000 +0000
+--- src/app-utils/gnc-ui-util.c.orig 2006-04-16 23:52:14.000000000 +0000
+++ src/app-utils/gnc-ui-util.c
-@@ -93,6 +93,14 @@ gnc_configure_account_separator (void)
+@@ -100,6 +100,14 @@ gnc_configure_account_separator (void)
free(string);
}
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.3 2006/03/13 21:23:03 joerg Exp $
static void
gnc_configure_reverse_balance (void)
-@@ -742,15 +750,15 @@ gnc_localeconv (void)
+@@ -749,15 +757,15 @@ gnc_localeconv (void)
lc = *localeconv();
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.3 2006/03/13 21:23:03 joerg Exp $
gnc_lconv_set_char(&lc.frac_digits, 2);
gnc_lconv_set_char(&lc.int_frac_digits, 2);
-@@ -1228,13 +1236,13 @@ PrintAmountInternal(char *buf, gnc_numer
+@@ -1261,13 +1269,13 @@ PrintAmountInternal(char *buf, gnc_numer
if (info->monetary)
{
@@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.3 2006/03/13 21:23:03 joerg Exp $
}
buf_ptr = buf;
-@@ -1302,7 +1310,7 @@ PrintAmountInternal(char *buf, gnc_numer
+@@ -1335,7 +1343,7 @@ PrintAmountInternal(char *buf, gnc_numer
}
else
{
@@ -69,7 +69,7 @@ $NetBSD: patch-ab,v 1.3 2006/03/13 21:23:03 joerg Exp $
guint8 num_decimal_places = 0;
char *temp_ptr = temp_buf;
-@@ -1585,13 +1593,13 @@ xaccParseAmount (const char * in_str, gb
+@@ -1618,13 +1626,13 @@ xaccParseAmount (const char * in_str, gb
{
group_separator = g_utf8_get_char(lc->mon_thousands_sep);
decimal_point = g_utf8_get_char(lc->mon_decimal_point);
diff --git a/finance/gnucash-devel/patches/patch-ae b/finance/gnucash-devel/patches/patch-ae
new file mode 100644
index 00000000000..74e2bc0dc9b
--- /dev/null
+++ b/finance/gnucash-devel/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.1 2006/04/29 20:38:57 wiz Exp $
+
+--- src/gnome-utils/druid-gnc-xml-import.c.orig 2006-04-16 23:52:26.000000000 +0000
++++ src/gnome-utils/druid-gnc-xml-import.c
+@@ -838,8 +838,8 @@ gxi_update_default_enc_combo (GncXmlImpo
+ static void
+ gxi_update_summary_label (GncXmlImportData *data)
+ {
+- gchar *string;
+- gboolean show;
++ gchar *string=NULL;
++ gboolean show=FALSE;
+
+ if (data->n_unassigned) {
+ if (data->n_impossible) {
+@@ -1149,7 +1149,7 @@ gxi_string_combo_changed_cb (GtkComboBox
+ GList *found, *default_conv;
+ gboolean is_active;
+ ambiguous_type *amb;
+- conv_type *prev_conv, *curr_conv;
++ conv_type *prev_conv, *curr_conv=NULL;
+ gpointer ptr;
+ GQuark prev_enc, curr_enc;
+