summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/gnomoradio/ChangeLog6
-rw-r--r--media-sound/gnomoradio/Manifest15
-rw-r--r--media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch70
-rw-r--r--media-sound/gnomoradio/gnomoradio-0.15.1.ebuild3
4 files changed, 90 insertions, 4 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/Manifest b/media-sound/gnomoradio/Manifest
index bfb93a3530fd..550d9a0a7522 100644
--- a/media-sound/gnomoradio/Manifest
+++ b/media-sound/gnomoradio/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gnomoradio-0.15.1-gcc42.patch 777 RMD160 52e83efd1531dabf108994ef2373e7f12301133f SHA1 975b798d9ec1da148f0c91f63eccd2b6ebd50b35 SHA256 84fabb25196c505dba9d9f17024445d580b356372053d1848df6d612ea02e5da
+AUX gnomoradio-0.15.1-gcc43.patch 3237 RMD160 b940282c60e17281b8db033273827da91b61067e SHA1 cfe07c2317b54c1e5cb05c6b0cdeb47586522382 SHA256 98c23c27cee966d11e34c08064744e0e3134acf9facb61322b8da5e8f3eb983e
DIST gnomoradio-0.15.1.tar.bz2 351723 RMD160 c2258e1c18b5298396949de49c199d44f090a231 SHA1 ff65e32eb08bf2f8e5fbaecec0cb9942e587b38d SHA256 02b6c256fe6877da3831c5e67c1564b16cc9d5ff33ca410baf5dbdb41922e40a
-EBUILD gnomoradio-0.15.1.ebuild 1018 RMD160 958b1b5d101be6c270872ef0e21d591c411ebc64 SHA1 a493321a4a068795c6de503aa133fd7daa6b5a08 SHA256 6632ab8a67f7ae6d48f6af28a681c9f2dd8e9778a53e19b98379cb8a973ac06c
-MISC ChangeLog 2477 RMD160 5859df3c8ab4215ff4364d70409a9cfe695db86b SHA1 b125a864f8185ffb15cef85b78f3b7a68d3001ec SHA256 374fb1e3d12800df6a05b476f00c0b254b9527c87c12976ff7987e1e4ea96892
+EBUILD gnomoradio-0.15.1.ebuild 1062 RMD160 89ef09b037a1a76acd0e363c972909f2ec3b8174 SHA1 daa5dc224413951f75ee25e797f2be75c247a012 SHA256 7061bd958d0e1c175e3c0fd225da19c3a1850576c5466e232733e86b6a09b119
+MISC ChangeLog 2638 RMD160 f53d281b35534e86dd8a28a726eba09747578822 SHA1 1f4c29715579f60773ee9aea049ef40194ab809d SHA256 1201af0e2d094f94f4ad1e051019914628e42dcb389bedcd73ef2a7315202e53
MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklL4jQACgkQvFcC4BYPU0pMmQCgomcj0CUgkJrW8f8zBvjUAqXS
+MNYAoJh46Sjl1jjG4uywCUdvjm/amLS1
+=Zkgr
+-----END PGP SIGNATURE-----
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() {