diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2008-07-26 18:12:35 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2008-07-26 18:12:35 +0000 |
| commit | cc3878a636cd6b30451eea28497301b741909442 (patch) | |
| tree | d62f2683235775ba7a6191bf14a2150e98985c97 /net-analyzer/bmon | |
| parent | Version bump, bug #232987 (diff) | |
| download | gentoo-2-cc3878a636cd6b30451eea28497301b741909442.tar.gz gentoo-2-cc3878a636cd6b30451eea28497301b741909442.tar.bz2 gentoo-2-cc3878a636cd6b30451eea28497301b741909442.zip | |
Improve gcc4 patch for bug #231186
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-analyzer/bmon')
| -rw-r--r-- | net-analyzer/bmon/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff | 40 |
2 files changed, 31 insertions, 14 deletions
diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog index 781f7984d744..41744b29f2f4 100644 --- a/net-analyzer/bmon/ChangeLog +++ b/net-analyzer/bmon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/bmon # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.37 2008/04/28 04:30:56 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.38 2008/07/26 18:12:34 cedk Exp $ + + 26 Jul 2008; Cédric Krier <cedk@gentoo.org> files/bmon-2.1.0-gcc4.diff: + Improve gcc4 patch for bug #231186 28 Apr 2008; Jeroen Roovers <jer@gentoo.org> bmon-2.1.0-r3.ebuild: Marked ~sparc too. diff --git a/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff b/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff index 433edf5090de..23c12b5380c3 100644 --- a/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff +++ b/net-analyzer/bmon/files/bmon-2.1.0-gcc4.diff @@ -1,16 +1,6 @@ ---- bmon-2.1.0.orig/src/out_xml_event.c 2005-04-05 12:01:33.000000000 -0300 -+++ bmon-2.1.0/src/out_xml_event.c 2005-09-09 17:56:07.000000000 -0300 -@@ -127,7 +127,7 @@ - .om_draw = xml_event_draw, - .om_set_opts = xml_event_set_opts, - .om_probe = xml_event_probe, -- .om_shutdown xml_event_shutdown, -+ .om_shutdown = xml_event_shutdown - }; - - static void __init xml_event_init(void) ---- bmon-2.1.0.orig/src/out_audio.c 2005-04-05 12:01:33.000000000 -0300 -+++ bmon-2.1.0/src/out_audio.c 2005-09-09 17:58:20.000000000 -0300 +diff -ru bmon-2.1.0~/src/out_audio.c bmon-2.1.0/src/out_audio.c +--- bmon-2.1.0~/src/out_audio.c 2008-07-26 20:06:24.000000000 +0200 ++++ bmon-2.1.0/src/out_audio.c 2008-07-26 20:09:42.000000000 +0200 @@ -141,7 +141,7 @@ .om_draw = audio_draw, .om_set_opts = audio_set_opts, @@ -20,3 +10,27 @@ }; static void __init audio_init(void) +diff -ru bmon-2.1.0~/src/out_db.c bmon-2.1.0/src/out_db.c +--- bmon-2.1.0~/src/out_db.c 2008-07-26 20:06:24.000000000 +0200 ++++ bmon-2.1.0/src/out_db.c 2008-07-26 20:07:44.000000000 +0200 +@@ -679,7 +679,7 @@ + .om_draw = db_draw, + .om_set_opts = db_set_opts, + .om_probe = db_probe, +- .om_shutdown db_shutdown, ++ .om_shutdown = db_shutdown, + }; + + static void __init db_init(void) +diff -ru bmon-2.1.0~/src/out_xml_event.c bmon-2.1.0/src/out_xml_event.c +--- bmon-2.1.0~/src/out_xml_event.c 2008-07-26 20:06:24.000000000 +0200 ++++ bmon-2.1.0/src/out_xml_event.c 2008-07-26 20:09:42.000000000 +0200 +@@ -127,7 +127,7 @@ + .om_draw = xml_event_draw, + .om_set_opts = xml_event_set_opts, + .om_probe = xml_event_probe, +- .om_shutdown xml_event_shutdown, ++ .om_shutdown = xml_event_shutdown + }; + + static void __init xml_event_init(void) |