media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch

   1 Index: gnomoradio-0.15.1/rainbow/license.cc
   2 ===================================================================
   3 --- gnomoradio-0.15.1.orig/rainbow/license.cc
   4 +++ gnomoradio-0.15.1/rainbow/license.cc
   5 @@ -54,7 +54,7 @@ void Rainbow::License::get_and_do (const
   6         }
   7
   8         if (done) {
   9 -               signal<void,ref_ptr<License> > sig;
  10 +               sigc::signal<void,ref_ptr<License> > sig;
  11                 sig.connect(slot);
  12                 sig(license);
  13         } else {
  14 Index: gnomoradio-0.15.1/rainbow/rdf-resource.cc
  15 ===================================================================
  16 --- gnomoradio-0.15.1.orig/rainbow/rdf-resource.cc
  17 +++ gnomoradio-0.15.1/rainbow/rdf-resource.cc
  18 @@ -35,7 +35,7 @@ void Rainbow::RdfResource::get_and_do (c
  19                 resource = ref_ptr<RdfResource>(p->second);
  20                 if (resource->downloaded) { // already downloaded
  21                         map<Glib::ustring,xmlpp::Element*>::iterator el = resource->id_map.find(id);
  22 -                       signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
  23 +                       sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
  24                         sig.connect(slot);
  25                         sig(el != resource->id_map.end() ? el->second : 0, resource);
  26                         return;
  27 @@ -47,7 +47,7 @@ void Rainbow::RdfResource::get_and_do (c
  28                 Glib::ustring host, file;
  29                 unsigned short port;
  30                 if (!HttpClient::parse_url(uri, host, port, file)) {
  31 -                       signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
  32 +                       sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
  33                         sig.connect(slot);
  34                         sig(0, resource);
  35                         return;
  36 @@ -55,14 +55,14 @@ void Rainbow::RdfResource::get_and_do (c
  37         }
  38
  39         // connect mem_fun to appropriate signal
  40 -       map<Glib::ustring,signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
  41 +       map<Glib::ustring,sigc::signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
  42         sig = resource->signal_map.find(id);
  43         if (sig != resource->signal_map.end()) {
  44                 // found existing signal for id
  45                 sig->second->connect(slot);
  46         } else {
  47                 // need to create new signal to handle id
  48 -               signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
  49 +               sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
  50                 signal_->connect(slot);
  51                 resource->signal_map.insert(make_pair(id, signal_));
  52         }
  53 @@ -190,7 +190,7 @@ void Rainbow::RdfResource::on_downloaded
  54
  55   error:
  56         // call all signals
  57 -       map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
  58 +       map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
  59         for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) {
  60                 map<Glib::ustring,xmlpp::Element*>::iterator el = id_map.find(signal->first);
  61                 signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr<RdfResource>(this));
  62 @@ -204,7 +204,7 @@ void Rainbow::RdfResource::on_downloaded
  63
  64  void Rainbow::RdfResource::clear_signal_map ()
  65  {
  66 -       map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
  67 +       map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
  68         for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
  69                 delete signal->second;
  70         signal_map.clear();