pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/finance/gnucash-devel Fix errno. Work around gnucash t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fa5b73f7c458
branches: trunk
changeset: 508698:fa5b73f7c458
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Feb 23 22:19:45 2006 +0000
description:
Fix errno. Work around gnucash trying clever things with struct lconv,
which breaks with -Werror on DragonFly.
diffstat:
finance/gnucash-devel/distinfo | 4 +-
finance/gnucash-devel/patches/patch-aa | 12 +++++
finance/gnucash-devel/patches/patch-ab | 75 ++++++++++++++++++++++++++++++++++
3 files changed, 90 insertions(+), 1 deletions(-)
diffs (107 lines):
diff -r 0c8b4f128741 -r fa5b73f7c458 finance/gnucash-devel/distinfo
--- a/finance/gnucash-devel/distinfo Thu Feb 23 21:24:11 2006 +0000
+++ b/finance/gnucash-devel/distinfo Thu Feb 23 22:19:45 2006 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2006/02/20 23:25:46 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/02/23 22:19:45 joerg Exp $
SHA1 (gnucash-1.9.1.tar.gz) = 496878f90167a228a8baf159cb9088854803f8e5
RMD160 (gnucash-1.9.1.tar.gz) = fbb25f8c728ff370104c40f0c80f96b91aa46743
Size (gnucash-1.9.1.tar.gz) = 9959644 bytes
+SHA1 (patch-aa) = db08a08fe8181822c1038d0adb3174dc2ebbcc12
+SHA1 (patch-ab) = 065d32ce1bd8e8af115012b685000d2f7f997f8f
diff -r 0c8b4f128741 -r fa5b73f7c458 finance/gnucash-devel/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/finance/gnucash-devel/patches/patch-aa Thu Feb 23 22:19:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2006/02/23 22:19:45 joerg Exp $
+
+--- src/core-utils/gnc-gkeyfile-utils.c.orig 2006-02-23 18:16:56.000000000 +0000
++++ src/core-utils/gnc-gkeyfile-utils.c
+@@ -85,7 +85,6 @@ gnc_key_file_save_to_file (const gchar *
+ {
+ gchar *contents;
+ gint fd;
+- extern int errno;
+ gint length;
+ ssize_t written;
+ gboolean success = TRUE;
diff -r 0c8b4f128741 -r fa5b73f7c458 finance/gnucash-devel/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/finance/gnucash-devel/patches/patch-ab Thu Feb 23 22:19:45 2006 +0000
@@ -0,0 +1,75 @@
+$NetBSD: patch-ab,v 1.1 2006/02/23 22:19:45 joerg Exp $
+
+--- src/app-utils/gnc-ui-util.c.orig 2006-02-23 18:49:41.000000000 +0000
++++ src/app-utils/gnc-ui-util.c
+@@ -47,6 +47,14 @@
+ #include "Transaction.h"
+ #include "guile-mappings.h"
+
++#if defined(__DragonFly__)
++#define LC_CAST (char **)
++#define LC_CAST2 (char *)
++#else
++#define LC_CAST
++#define LC_CAST2
++#endif
++
+
+ #define KEY_CURRENCY_CHOICE "currency_choice"
+ #define KEY_CURRENCY_OTHER "currency_other"
+@@ -738,15 +746,15 @@ gnc_localeconv (void)
+
+ lc = *localeconv();
+
+- gnc_lconv_set_utf8(&lc.decimal_point, ".");
+- gnc_lconv_set_utf8(&lc.thousands_sep, ",");
+- gnc_lconv_set_utf8(&lc.grouping, "\003");
+- gnc_lconv_set_utf8(&lc.int_curr_symbol, "USD ");
+- gnc_lconv_set_utf8(&lc.currency_symbol, "$");
+- gnc_lconv_set_utf8(&lc.mon_decimal_point, ".");
+- gnc_lconv_set_utf8(&lc.mon_thousands_sep, ",");
+- gnc_lconv_set_utf8(&lc.mon_grouping, "\003");
+- gnc_lconv_set_utf8(&lc.negative_sign, "-");
++ gnc_lconv_set_utf8(LC_CAST & lc.decimal_point, ".");
++ gnc_lconv_set_utf8(LC_CAST & lc.thousands_sep, ",");
++ gnc_lconv_set_utf8(LC_CAST & lc.grouping, "\003");
++ gnc_lconv_set_utf8(LC_CAST & lc.int_curr_symbol, "USD ");
++ gnc_lconv_set_utf8(LC_CAST & lc.currency_symbol, "$");
++ gnc_lconv_set_utf8(LC_CAST & lc.mon_decimal_point, ".");
++ gnc_lconv_set_utf8(LC_CAST & lc.mon_thousands_sep, ",");
++ gnc_lconv_set_utf8(LC_CAST & lc.mon_grouping, "\003");
++ gnc_lconv_set_utf8(LC_CAST & lc.negative_sign, "-");
+
+ gnc_lconv_set_char(&lc.frac_digits, 2);
+ gnc_lconv_set_char(&lc.int_frac_digits, 2);
+@@ -1224,12 +1232,12 @@ PrintAmountInternal(char *buf, gnc_numer
+ if (info->monetary)
+ {
+ separator = lc->mon_thousands_sep[0];
+- group = lc->mon_grouping;
++ group = LC_CAST2 lc->mon_grouping;
+ }
+ else
+ {
+ separator = lc->thousands_sep[0];
+- group = lc->grouping;
++ group = LC_CAST2 lc->grouping;
+ }
+
+ buf_ptr = buf;
+@@ -1574,13 +1582,13 @@ xaccParseAmount (const char * in_str, gb
+ {
+ group_separator = lc->mon_thousands_sep[0];
+ decimal_point = lc->mon_decimal_point[0];
+- group = lc->mon_grouping;
++ group = LC_CAST2 lc->mon_grouping;
+ }
+ else
+ {
+ group_separator = lc->thousands_sep[0];
+ decimal_point = lc->decimal_point[0];
+- group = lc->grouping;
++ group = LC_CAST2 lc->grouping;
+ }
+
+ return xaccParseAmountExtended(in_str, monetary, negative_sign, decimal_point,
Home |
Main Index |
Thread Index |
Old Index