Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=d2b400fb83ef8b03cfb0fd6b46d3dbe11d5c5363
commit d2b400fb83ef8b03cfb0fd6b46d3dbe11d5c5363 Author: Elentir <[email protected]> Date: Sat May 5 12:54:14 2012 +0200 ekiga-3.3.2-4-x86_64 * add patch to fix build diff --git a/source/gnome-extra/ekiga/FrugalBuild b/source/gnome-extra/ekiga/FrugalBuild index 943b113..f90d2d1 100644 --- a/source/gnome-extra/ekiga/FrugalBuild +++ b/source/gnome-extra/ekiga/FrugalBuild @@ -23,8 +23,10 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet +source=(${source[@]} ekiga-gcc47.patch) url="http://ekiga.org"; -sha1sums=('87189f8dc1a80b6a06bde028b93a2f2801892377') +sha1sums=('87189f8dc1a80b6a06bde028b93a2f2801892377' \ + 'd3d77afbb4dce1885351afb7f35a506de733e139') Fconfopts="$Fconfopts --enable-dbus -enable-avahi --disable-scrollkeeper" export CXXFLAGS="$CXXFLAGS -fexceptions" unset MAKEFLAGS diff --git a/source/gnome-extra/ekiga/ekiga-gcc47.patch b/source/gnome-extra/ekiga/ekiga-gcc47.patch new file mode 100644 index 0000000..7f61d3e --- /dev/null +++ b/source/gnome-extra/ekiga/ekiga-gcc47.patch @@ -0,0 +1,86 @@ +diff -Naur ekiga-3.3.2/lib/engine/account/bank-impl.h ekiga-3.3.2new/lib/engine/account/bank-impl.h +--- ekiga-3.3.2/lib/engine/account/bank-impl.h 2011-05-18 18:18:09.000000000 +0200 ++++ ekiga-3.3.2new/lib/engine/account/bank-impl.h 2012-05-05 12:27:00.551010698 +0200 +@@ -203,7 +203,7 @@ + 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 @@ + void + Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account) + { +- remove_object (account); ++ this->remove_object (account); + } + + #endif +diff -Naur ekiga-3.3.2/lib/engine/addressbook/book-impl.h ekiga-3.3.2new/lib/engine/addressbook/book-impl.h +--- ekiga-3.3.2/lib/engine/addressbook/book-impl.h 2011-05-18 18:18:09.000000000 +0200 ++++ ekiga-3.3.2new/lib/engine/addressbook/book-impl.h 2012-05-05 12:27:19.013357167 +0200 +@@ -204,7 +204,7 @@ + Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact) + { + contact->questions.connect (boost::ref (questions)); +- add_object (contact); ++ this->add_object (contact); + } + + +@@ -212,7 +212,7 @@ + void + Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact) + { +- remove_object (contact); ++ this->remove_object (contact); + } + + #endif +diff -Naur ekiga-3.3.2/lib/engine/addressbook/source-impl.h ekiga-3.3.2new/lib/engine/addressbook/source-impl.h +--- ekiga-3.3.2/lib/engine/addressbook/source-impl.h 2011-05-18 18:18:09.000000000 +0200 ++++ ekiga-3.3.2new/lib/engine/addressbook/source-impl.h 2012-05-05 12:27:51.943542425 +0200 +@@ -206,7 +206,7 @@ + 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 -Naur ekiga-3.3.2/lib/engine/presence/cluster-impl.h ekiga-3.3.2new/lib/engine/presence/cluster-impl.h +--- ekiga-3.3.2/lib/engine/presence/cluster-impl.h 2011-05-18 18:18:09.000000000 +0200 ++++ ekiga-3.3.2new/lib/engine/presence/cluster-impl.h 2012-05-05 12:28:16.843707110 +0200 +@@ -147,7 +147,7 @@ + + add_connection (heap, heap->questions.connect (boost::ref (questions))); + +- add_object (heap); ++ this->add_object (heap); + } + + template<typename HeapType> +diff -Naur ekiga-3.3.2/lib/engine/presence/heap-impl.h ekiga-3.3.2new/lib/engine/presence/heap-impl.h +--- ekiga-3.3.2/lib/engine/presence/heap-impl.h 2011-05-18 18:18:09.000000000 +0200 ++++ ekiga-3.3.2new/lib/engine/presence/heap-impl.h 2012-05-05 12:28:42.508969032 +0200 +@@ -160,14 +160,14 @@ + { + presentity->questions.connect (boost::ref (questions)); + +- add_object (presentity); ++ this->add_object (presentity); + } + + template<typename PresentityType> + void + Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity) + { +- remove_object (presentity); ++ this->remove_object (presentity); + } + + #endif _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
