diff options
author | shannonjr <shannonjr@pkgsrc.org> | 2004-06-01 15:36:50 +0000 |
---|---|---|
committer | shannonjr <shannonjr@pkgsrc.org> | 2004-06-01 15:36:50 +0000 |
commit | 5dc2891618574babf5a2a41ed4381540e60b8c0d (patch) | |
tree | 567b02a10cadbb013eacacb20afc1ab3496fa461 /textproc/dict-dictionaries/patches | |
parent | b8981cbdface86701c28fe926f21a2de7d1790c4 (diff) | |
download | pkgsrc-5dc2891618574babf5a2a41ed4381540e60b8c0d.tar.gz |
Re: PR 25725 Syntax errors prevent compilation of with gcc 3.4.0
The patch-ac corrects four instances of printf being called with an
uncompilable argument list; the patch follows a recommendation from
Christian Biere <christianbiere@gmx.de>.
The patch-ad corrects a situation where a label at end of block prevents
compilation; the fix adds a null statement as the label's target.
Diffstat (limited to 'textproc/dict-dictionaries/patches')
-rw-r--r-- | textproc/dict-dictionaries/patches/patch-ac | 40 | ||||
-rw-r--r-- | textproc/dict-dictionaries/patches/patch-ad | 12 |
2 files changed, 52 insertions, 0 deletions
diff --git a/textproc/dict-dictionaries/patches/patch-ac b/textproc/dict-dictionaries/patches/patch-ac new file mode 100644 index 00000000000..37be5fb5075 --- /dev/null +++ b/textproc/dict-dictionaries/patches/patch-ac @@ -0,0 +1,40 @@ +$NetBSD: patch-ac,v 1.1 2004/06/01 15:36:50 shannonjr Exp $ + +--- dict-web1913-1.4/libmaa/parse.c.orig 1998-02-22 12:32:36.000000000 -0700 ++++ dict-web1913-1.4/libmaa/parse.c +@@ -75,7 +75,7 @@ void prs_file( const char *filename ) + + if (!cpp) { + if ((cpp = getenv( "KHEPERA_CPP" ))) { +- PRINTF(MAA_PARSE,(__FUNCTION__ ": Using KHEPERA_CPP from %s\n",cpp)); ++ PRINTF(MAA_PARSE,("%s : Using KHEPERA_CPP from %s\n", __FUNCTION__, cpp)); + } + + /* Always look for gcc's cpp first, since +@@ -86,7 +86,7 @@ void prs_file( const char *filename ) + + if (fread( buf, 1, 1023, tmp ) > 0) { + if ((t = strchr( buf, '\n' ))) *t = '\0'; +- PRINTF(MAA_PARSE,(__FUNCTION__ ": Using GNU cpp from %s\n",buf)); ++ PRINTF(MAA_PARSE,("%s : Using GNU cpp from %s\n",__FUNCTION__,buf)); + cpp = str_find( buf ); + extra_options = "-nostdinc -nostdinc++"; + } +@@ -103,7 +103,7 @@ void prs_file( const char *filename ) + for (pt = cpps; **pt; pt++) { + if (!access( *pt, X_OK )) { + PRINTF(MAA_PARSE, +- (__FUNCTION__ ": Using system cpp from %s\n",*pt)); ++ ("%s : Using system cpp from %s\n",__FUNCTION__,*pt)); + cpp = *pt; + break; + } +@@ -123,7 +123,7 @@ void prs_file( const char *filename ) + sprintf( buffer, "%s -I. %s %s 2>/dev/null", cpp, + _prs_cpp_options ? _prs_cpp_options : "", filename ); + +- PRINTF(MAA_PARSE,(__FUNCTION__ ": %s\n",buffer)); ++ PRINTF(MAA_PARSE,("%s : %s\n",__FUNCTION__,buffer)); + if (!(yyin = popen( buffer, "r" ))) + err_fatal_errno( __FUNCTION__, + "Cannot open \"%s\" for read\n", filename ); diff --git a/textproc/dict-dictionaries/patches/patch-ad b/textproc/dict-dictionaries/patches/patch-ad new file mode 100644 index 00000000000..f99f9452ad3 --- /dev/null +++ b/textproc/dict-dictionaries/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2004/06/01 15:36:50 shannonjr Exp $ + +--- ./dict-misc-1.5/dictfmt.c.orig 1998-07-05 19:33:40.000000000 -0600 ++++ ./dict-misc-1.5/dictfmt.c +@@ -465,6 +465,7 @@ int main( int argc, char **argv ) + fmt_string(buf); + fmt_newline(); + skip: ++ ; + } + + fmt_newheadword(NULL,0); |