diff options
author | joerg <joerg> | 2006-02-23 22:19:45 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-02-23 22:19:45 +0000 |
commit | f012ed210c3b541c5e6eff717491c84c9398a168 (patch) | |
tree | 546bd9ef3a80b59b1e207b97295b1b24a9c7df29 /finance | |
parent | cc87984b651522f2901433fc3df38677c5c116ed (diff) | |
download | pkgsrc-f012ed210c3b541c5e6eff717491c84c9398a168.tar.gz |
Fix errno. Work around gnucash trying clever things with struct lconv,
which breaks with -Werror on DragonFly.
Diffstat (limited to 'finance')
-rw-r--r-- | finance/gnucash-devel/distinfo | 4 | ||||
-rw-r--r-- | finance/gnucash-devel/patches/patch-aa | 12 | ||||
-rw-r--r-- | finance/gnucash-devel/patches/patch-ab | 75 |
3 files changed, 90 insertions, 1 deletions
diff --git a/finance/gnucash-devel/distinfo b/finance/gnucash-devel/distinfo index 12abf308070..2ebc6ece131 100644 --- a/finance/gnucash-devel/distinfo +++ b/finance/gnucash-devel/distinfo @@ -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 --git a/finance/gnucash-devel/patches/patch-aa b/finance/gnucash-devel/patches/patch-aa new file mode 100644 index 00000000000..9b08a17449d --- /dev/null +++ b/finance/gnucash-devel/patches/patch-aa @@ -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 --git a/finance/gnucash-devel/patches/patch-ab b/finance/gnucash-devel/patches/patch-ab new file mode 100644 index 00000000000..01308d76892 --- /dev/null +++ b/finance/gnucash-devel/patches/patch-ab @@ -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, |