fix build with gcc 4.3, bug #251221

(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64)

3 files changed, 77 insertions, 2 deletions

diff --git a/media-sound/gnomoradio/ChangeLog b/media-sound/gnomoradio/ChangeLog
index c28923503e9c..151e90da7cdf 100644
--- a/media-sound/gnomoradio/ChangeLog
+++ b/media-sound/gnomoradio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gnomoradio
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.19 2008/06/29 11:55:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/ChangeLog,v 1.20 2008/12/19 18:04:30 aballier Exp $
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/gnomoradio-0.15.1-gcc43.patch, gnomoradio-0.15.1.ebuild:
+  fix build with gcc 4.3, bug #251221
 
   29 Jun 2008; Samuli Suominen <drac@gentoo.org>
   +files/gnomoradio-0.15.1-gcc42.patch, gnomoradio-0.15.1.ebuild:
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch
new file mode 100644
index 000000000000..b5f30edfa395
--- /dev/null
+++ b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch
@@ -0,0 +1,70 @@
+Index: gnomoradio-0.15.1/rainbow/license.cc
+===================================================================
+--- gnomoradio-0.15.1.orig/rainbow/license.cc
++++ gnomoradio-0.15.1/rainbow/license.cc
+@@ -54,7 +54,7 @@ void Rainbow::License::get_and_do (const
+ 	}
+ 	
+ 	if (done) {
+-		signal<void,ref_ptr<License> > sig;
++		sigc::signal<void,ref_ptr<License> > sig;
+ 		sig.connect(slot);
+ 		sig(license);
+ 	} else {
+Index: gnomoradio-0.15.1/rainbow/rdf-resource.cc
+===================================================================
+--- gnomoradio-0.15.1.orig/rainbow/rdf-resource.cc
++++ gnomoradio-0.15.1/rainbow/rdf-resource.cc
+@@ -35,7 +35,7 @@ void Rainbow::RdfResource::get_and_do (c
+ 		resource = ref_ptr<RdfResource>(p->second);
+ 		if (resource->downloaded) { // already downloaded
+ 			map<Glib::ustring,xmlpp::Element*>::iterator el = resource->id_map.find(id);
+-			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
++			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ 			sig.connect(slot);
+ 			sig(el != resource->id_map.end() ? el->second : 0, resource);
+ 			return;
+@@ -47,7 +47,7 @@ void Rainbow::RdfResource::get_and_do (c
+ 		Glib::ustring host, file;
+ 		unsigned short port;
+ 		if (!HttpClient::parse_url(uri, host, port, file)) {
+-			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
++			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ 			sig.connect(slot);
+ 			sig(0, resource);
+ 			return;
+@@ -55,14 +55,14 @@ void Rainbow::RdfResource::get_and_do (c
+ 	}
+ 
+ 	// connect mem_fun to appropriate signal
+-	map<Glib::ustring,signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
+ 	sig = resource->signal_map.find(id);
+ 	if (sig != resource->signal_map.end()) {
+ 		// found existing signal for id
+ 		sig->second->connect(slot);
+ 	} else {
+ 		// need to create new signal to handle id
+-		signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
++		sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
+ 		signal_->connect(slot);
+ 		resource->signal_map.insert(make_pair(id, signal_));
+ 	}
+@@ -190,7 +190,7 @@ void Rainbow::RdfResource::on_downloaded
+ 
+  error:
+ 	// call all signals
+-	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
+ 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) {
+ 		map<Glib::ustring,xmlpp::Element*>::iterator el = id_map.find(signal->first);
+ 		signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr<RdfResource>(this));
+@@ -204,7 +204,7 @@ void Rainbow::RdfResource::on_downloaded
+ 
+ void Rainbow::RdfResource::clear_signal_map ()
+ {
+-	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
+ 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
+ 		delete signal->second;
+ 	signal_map.clear();
diff --git a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
index 31125579d139..1aa442ea2016 100644
--- a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
+++ b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild,v 1.9 2008/06/29 11:55:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild,v 1.10 2008/12/19 18:04:30 aballier Exp $
 
 EAPI=1
 
@@ -29,6 +29,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc42.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {