diff options
| author | tron <tron@pkgsrc.org> | 2007-02-07 17:15:24 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2007-02-07 17:15:24 +0000 |
| commit | ea12e4834625327b5fb0eb616ccc33c05ad3ed57 (patch) | |
| tree | 59db29b2270c9a54ca1d233f75c7373d110521b4 | |
| parent | df2f90ff6408acefb2dbc2b3e3e3f9455f86360a (diff) | |
| download | pkgsrc-ea12e4834625327b5fb0eb616ccc33c05ad3ed57.tar.gz | |
Use official patch for the GCC 3.3.x build problem provided by the
wireshark maintainers.
| -rw-r--r-- | net/wireshark/distinfo | 4 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-aa | 35 |
2 files changed, 23 insertions, 16 deletions
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index cf90254288c..20233760e59 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2007/02/07 15:18:23 tron Exp $ +$NetBSD: distinfo,v 1.7 2007/02/07 17:15:24 tron Exp $ SHA1 (wireshark-0.99.5.tar.bz2) = ec9a07f13d5cda3d310d8c8900362f7cb96f4042 RMD160 (wireshark-0.99.5.tar.bz2) = 1b3f7bb8e2c73a945fff86fb8ab2aa79481ba809 Size (wireshark-0.99.5.tar.bz2) = 11007039 bytes -SHA1 (patch-aa) = c05ecf25e24bc0c7a7c0a037364b416963736ff3 +SHA1 (patch-aa) = 605db7ae5682acbee96a7a8b9c39dbc1dc8366f2 diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa index dca719ed38f..3d1ade0ad48 100644 --- a/net/wireshark/patches/patch-aa +++ b/net/wireshark/patches/patch-aa @@ -1,17 +1,24 @@ -$NetBSD: patch-aa,v 1.6 2007/02/07 15:18:23 tron Exp $ +$NetBSD: patch-aa,v 1.7 2007/02/07 17:15:24 tron Exp $ + +Fix for GCC 3.3.x build problem taken from the SVN repository: + +http://anonsvn.wireshark.org/viewvc/viewvc.py/trunk/tools/lemon/lemon.c?r1=20452&r2=20737&pathrev=20737&view=patch + +Details of the problem are document here: -Fix build with GCC 3.3.x, see: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1357 ---- tools/lemon/lemon.c.orig 2007-02-01 22:53:43.000000000 +0000 -+++ tools/lemon/lemon.c 2007-02-07 14:54:00.000000000 +0000 -@@ -3095,6 +3095,9 @@ - /* Print a #line directive line to the output file. */ - PRIVATE void tplt_linedir(FILE *out, int lineno, char *filename) - { -+ if (lineno > 65536) -+ return; -+ - fprintf(out,"#line %d \"",lineno); - while( *filename ){ - if( *filename == '\\' ) putc('\\',out); +--- tools/lemon/lemon.c 2007/01/16 16:41:12 20452 ++++ tools/lemon/lemon.c 2007/02/07 16:08:19 20737 +@@ -3247,7 +3247,10 @@ + for(i=0; i<rp->nrhs; i++) used[i] = 0; + lhsused = 0; + +- if (!rp->code) rp->code = "\n"; ++ if (!rp->code) { ++ rp->code = "\n"; ++ rp->line = rp->ruleline; ++ } + + append_str(0,0,0,0); + for(cp=rp->code; *cp; cp++){ |