[pkgsrc/trunk]: pkgsrc/finance/gnucash gnucash: work around ctype(3) issues b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/605cad2ae0a0
branches:  trunk
changeset: 389970:605cad2ae0a0
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 14 22:58:02 2019 +0000

description:
gnucash: work around ctype(3) issues by ignoring the relevant clang warning

diffstat:

 finance/gnucash/Makefile                                                            |   4 +-
 finance/gnucash/distinfo                                                            |   5 +-
 finance/gnucash/patches/patch-gnucash_gnome-utils_gnc-date-edit.c                   |  23 ------
 finance/gnucash/patches/patch-gnucash_gnome-utils_gnc-menu-extensions.c             |  17 ----
 finance/gnucash/patches/patch-libgnucash_app-utils_calculation_expression__parser.c |  36 ----------
 5 files changed, 4 insertions(+), 81 deletions(-)

diffs (121 lines):

diff -r 5068f2eafa32 -r 605cad2ae0a0 finance/gnucash/Makefile
--- a/finance/gnucash/Makefile  Mon Jan 14 20:20:22 2019 +0000
+++ b/finance/gnucash/Makefile  Mon Jan 14 22:58:02 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.273 2019/01/01 11:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.274 2019/01/14 22:58:02 wiz Exp $
 
 DISTNAME=              gnucash-3.4
 CATEGORIES=            finance
@@ -31,6 +31,8 @@
 
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnucash
 CXXFLAGS+=             -Wno-deprecated-declarations
+# https://bugs.gnucash.org/show_bug.cgi?id=797039
+CFLAGS+=               -Wno-char-subscripts
 
 MAKE_ENV+=             GUILE_AUTO_COMPILE=0
 CMAKE_ARGS+=           -DWITH_AQBANKING=OFF
diff -r 5068f2eafa32 -r 605cad2ae0a0 finance/gnucash/distinfo
--- a/finance/gnucash/distinfo  Mon Jan 14 20:20:22 2019 +0000
+++ b/finance/gnucash/distinfo  Mon Jan 14 22:58:02 2019 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.92 2019/01/11 12:01:11 wiz Exp $
+$NetBSD: distinfo,v 1.93 2019/01/14 22:58:02 wiz Exp $
 
 SHA1 (gnucash-3.4.tar.bz2) = f3d58d6f1a06cf0fae8589b15bf416f814abcfb8
 RMD160 (gnucash-3.4.tar.bz2) = d6821fdca0190dc947906c2d35b61c8ac07b8b35
 SHA512 (gnucash-3.4.tar.bz2) = 4cebef0ba70e59a82d3b2b7b0b138ddb22e8866dc761e156ff1f15920145d12923719effef21ad4c65ccd62fbd14a1529cf0bfcaab70c5b33d103761d08062e0
 Size (gnucash-3.4.tar.bz2) = 13564432 bytes
-SHA1 (patch-gnucash_gnome-utils_gnc-date-edit.c) = 73adc687f6e84935e572aab2828b16e122e5e258
-SHA1 (patch-gnucash_gnome-utils_gnc-menu-extensions.c) = 8c080a24543c6da1f33b8b7d99101f8f43a10b73
-SHA1 (patch-libgnucash_app-utils_calculation_expression__parser.c) = 75d6043494e6850de1ca3e9194adace3a1ef3d19
 SHA1 (patch-libgnucash_engine_qoflog.cpp) = 8ba54382b8fc2507c0d146cae25a6764d3e1a5cb
diff -r 5068f2eafa32 -r 605cad2ae0a0 finance/gnucash/patches/patch-gnucash_gnome-utils_gnc-date-edit.c
--- a/finance/gnucash/patches/patch-gnucash_gnome-utils_gnc-date-edit.c Mon Jan 14 20:20:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-gnucash_gnome-utils_gnc-date-edit.c,v 1.2 2019/01/11 12:01:11 wiz Exp $
-
-Fix build with clang
-error: array subscript is of type 'char'
-https://bugs.gnucash.org/show_bug.cgi?id=797039
-
---- gnucash/gnome-utils/gnc-date-edit.c.orig   2018-12-25 22:43:08.000000000 +0000
-+++ gnucash/gnome-utils/gnc-date-edit.c
-@@ -1113,12 +1113,12 @@ gnc_date_edit_get_date_internal (GNCDate
-             temp = gnc_strtok_r (NULL, ": ", &tokp);
-             if (temp)
-             {
--                if (isdigit (*temp))
-+                if (isdigit ((unsigned char)*temp))
-                 {
-                     tm.tm_min = atoi (temp);
-                     flags = gnc_strtok_r (NULL, ": ",
-                                           &tokp);
--                    if (flags && isdigit (*flags))
-+                    if (flags && isdigit ((unsigned char)*flags))
-                     {
-                         tm.tm_sec = atoi (flags);
-                         flags = gnc_strtok_r (NULL,
diff -r 5068f2eafa32 -r 605cad2ae0a0 finance/gnucash/patches/patch-gnucash_gnome-utils_gnc-menu-extensions.c
--- a/finance/gnucash/patches/patch-gnucash_gnome-utils_gnc-menu-extensions.c   Mon Jan 14 20:20:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-gnucash_gnome-utils_gnc-menu-extensions.c,v 1.2 2019/01/11 12:01:11 wiz Exp $
-
-Fix build with clang
-error: array subscript is of type 'char'
-https://bugs.gnucash.org/show_bug.cgi?id=797039
-
---- gnucash/gnome-utils/gnc-menu-extensions.c.orig     2018-12-25 22:43:08.000000000 +0000
-+++ gnucash/gnome-utils/gnc-menu-extensions.c
-@@ -221,7 +221,7 @@ gnc_ext_gen_action_name (const gchar *na
-     // 'Mum & ble12' => 'Mumble___ble12'
-     for ( extChar = name; *extChar != '\0'; extChar++ )
-     {
--        if ( ! isalnum( *extChar ) )
-+        if ( ! isalnum((unsigned char) *extChar ) )
-             g_string_append_c( actionName, '_' );
-         g_string_append_c( actionName, *extChar );
-     }
diff -r 5068f2eafa32 -r 605cad2ae0a0 finance/gnucash/patches/patch-libgnucash_app-utils_calculation_expression__parser.c
--- a/finance/gnucash/patches/patch-libgnucash_app-utils_calculation_expression__parser.c       Mon Jan 14 20:20:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-libgnucash_app-utils_calculation_expression__parser.c,v 1.2 2019/01/11 12:01:11 wiz Exp $
-
-is* takes a char argument.
-https://bugs.gnucash.org/show_bug.cgi?id=797039
-
---- libgnucash/app-utils/calculation/expression_parser.c.orig  2018-12-25 22:43:08.000000000 +0000
-+++ libgnucash/app-utils/calculation/expression_parser.c
-@@ -768,7 +768,7 @@ next_token (parser_env_ptr pe)
-     const char *str_parse = pe->parse_str;
-     void *number;
- 
--    while (isspace (*str_parse))
-+    while (isspace ((unsigned char)*str_parse))
-         str_parse++;
- 
-     pe->asn_op = EOS;
-@@ -812,7 +812,7 @@ next_token (parser_env_ptr pe)
-         add_token( pe, STR_TOKEN );
-     }
-     /* test for name */
--    else if (isalpha (*str_parse)
-+    else if (isalpha ((unsigned char)*str_parse)
-              || (*str_parse == '_'))
-     {
-         int funcFlag = 0;
-@@ -833,8 +833,8 @@ next_token (parser_env_ptr pe)
-         }
-         while ((*str_parse == '_')
-                 || (*str_parse == '(')
--                || isalpha (*str_parse)
--                || isdigit (*str_parse));
-+                || isalpha ((unsigned char)*str_parse)
-+                || isdigit ((unsigned char)*str_parse));
- 
-         *nstr = EOS;
-         if ( funcFlag )