- fix compilation with gcc 4.7

diff --git a/ekiga-gcc47.patch b/ekiga-gcc47.patch
new file mode 100644 (file)
index 0000000..64232cd
--- /dev/null
+++ b/ekiga-gcc47.patch
@@ -0,0 +1,91 @@
+diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
+index e16848e..b0a8775 100644
+--- a/lib/engine/account/bank-impl.h
++++ b/lib/engine/account/bank-impl.h
+@@ -203,7 +203,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
+ {
+-  add_object (account);
++  this->add_object (account);
+ 
+   account->questions.connect (boost::ref (questions));
+ }
+@@ -213,7 +213,7 @@ template<typename AccountType>
+ void
+ Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
+ {
+-  remove_object (account);
++  this->remove_object (account);
+ }
+ 
+ #endif
+diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
+index 711d8d9..4fea7d5 100644
+--- a/lib/engine/addressbook/book-impl.h
++++ b/lib/engine/addressbook/book-impl.h
+@@ -204,7 +204,7 @@ void
+ Ekiga::BookImpl<ContactType>::add_contact (gmref_ptr<ContactType> contact)
+ {
+   contact->questions.add_handler (questions.make_slot ());
+-  add_object (contact);
++  this->add_object (contact);
+ }
+ 
+ 
+@@ -212,7 +212,7 @@ template<typename ContactType>
+ void
+ Ekiga::BookImpl<ContactType>::remove_contact (gmref_ptr<ContactType> contact)
+ {
+-  remove_object (contact);
++  this->remove_object (contact);
+ }
+ 
+ #endif
+diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
+index a30cd03..630236f 100644
+--- a/lib/engine/addressbook/source-impl.h
++++ b/lib/engine/addressbook/source-impl.h
+@@ -206,7 +206,7 @@ template<typename BookType>
+ void
+ Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
+ {
+-  add_object (book);
++  this->add_object (book);
+ 
+   add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
+ 
+diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
+index 245a7c6..92074a8 100644
+--- a/lib/engine/presence/cluster-impl.h
++++ b/lib/engine/presence/cluster-impl.h
+@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
+ 
+   add_connection (heap, heap->questions.connect (boost::ref (questions)));
+ 
+-  add_object (heap);
++  this->add_object (heap);
+ }
+ 
+ template<typename HeapType>
+diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
+index d63c491..15fe86f 100644
+--- a/lib/engine/presence/heap-impl.h
++++ b/lib/engine/presence/heap-impl.h
+@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
+ {
+   presentity->questions.add_handler (questions.make_slot ());
+ 
+-  add_object (presentity);
++  this->add_object (presentity);
+ }
+ 
+ template<typename PresentityType>
+ void
+ Ekiga::HeapImpl<PresentityType>::remove_presentity (gmref_ptr<PresentityType> presentity)
+ {
+-  remove_object (presentity);
++  this->remove_object (presentity);
+ }
+ 
+ #endif

diff --git a/ekiga.spec b/ekiga.spec
index e5c88981e81f85ec2cb47678c8900d4bdca60eba..b86b0fa5885a6cf38eeded5700f1aaba7b6b8201 100644 (file)
--- a/ekiga.spec
+++ b/ekiga.spec
@@ -14,6 +14,7 @@ Source0:      http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/%{name}-%{version}.tar
 # Source0-md5: bdc787550c4cf5acf873788f5ea153ba
 Patch0:                %{name}-shell.patch
 Patch1:                %{name}-libnotify.patch
 # Source0-md5: bdc787550c4cf5acf873788f5ea153ba
 Patch0:                %{name}-shell.patch
 Patch1:                %{name}-libnotify.patch

+Patch2:                %{name}-gcc47.patch

 URL:           http://www.ekiga.org/
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: SDL-devel
 URL:           http://www.ekiga.org/
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: SDL-devel


@@ -77,6 +78,7 @@ obrazem. Ekiga była poprzednio znana jako GnomeMeeting.
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

+%patch2 -p1

 sed -i -e 's|Categories=GNOME;GTK;Network;Telephony;|Categories=GTK;GNOME;Network;InstantMessaging;|' ekiga.desktop.in.in
 
 %build
 sed -i -e 's|Categories=GNOME;GTK;Network;Telephony;|Categories=GTK;GNOME;Network;InstantMessaging;|' ekiga.desktop.in.in
 
 %build