r34790 - in /desktop/unstable/ekiga/debian: changelog control patches/fix-linux-gnueabihf-build.patch patches/gcc47.patch patches/opal310.patch patches/series
kilian at users.alioth.debian.org
kilian at users.alioth.debian.org
Sat May 12 11:27:30 UTC 2012
Author: kilian
Date: Sat May 12 11:27:30 2012
New Revision: 34790
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34790
Log:
Backport f81a43f2c4 from GNOME Git to fix FTBFS with gcc 4.7 (Closes: #672098)
Added:
desktop/unstable/ekiga/debian/patches/fix-linux-gnueabihf-build.patch
desktop/unstable/ekiga/debian/patches/gcc47.patch
desktop/unstable/ekiga/debian/patches/opal310.patch
Modified:
desktop/unstable/ekiga/debian/changelog
desktop/unstable/ekiga/debian/control
desktop/unstable/ekiga/debian/patches/series
Modified: desktop/unstable/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/changelog?rev=34790&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog [utf-8] (original)
+++ desktop/unstable/ekiga/debian/changelog [utf-8] Sat May 12 11:27:30 2012
@@ -1,3 +1,27 @@
+ekiga (3.2.7-5) UNRELEASED; urgency=low
+
+ * ACK NMUs - thanks to Hector and Mehdi for their work!
+ * Backport f81a43f2c4 from GNOME Git to fix FTBFS with gcc 4.7
+ (Closes: #672098)
+
+ -- Kilian Krause <kilian at debian.org> Sat, 12 May 2012 13:23:40 +0200
+
+ekiga (3.2.7-4.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix FTBFS due to API changes in Opal 3.10 (Closes: #664929, #662964)
+ - add debian/patches/opal310.patch
+ * Set urgency to "high" to fix RC bugs.
+
+ -- Mehdi Dogguy <mehdi at debian.org> Thu, 05 Apr 2012 11:51:01 +0200
+
+ekiga (3.2.7-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add arm-linux-gnueabihf (armhf) support (Closes: #640256)
+
+ -- Hector Oron <zumbi at debian.org> Mon, 17 Oct 2011 12:00:09 +0100
+
ekiga (3.2.7-4) unstable; urgency=low
* Fix compilation with libnotify0.7 (Closes: #630266)
@@ -782,5 +806,3 @@
* Initial Release. (Closes: #103474)
-- Sander Smeenk <ssmeenk at debian.org> Wed, 4 Jul 2001 14:03:24 +0200
-
-
Modified: desktop/unstable/ekiga/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control?rev=34790&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control [utf-8] (original)
+++ desktop/unstable/ekiga/debian/control [utf-8] Sat May 12 11:27:30 2012
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Kilian Krause <kilian at debian.org>
-Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>
+Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 8),
libsasl2-dev,
gettext,
Added: desktop/unstable/ekiga/debian/patches/fix-linux-gnueabihf-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/fix-linux-gnueabihf-build.patch?rev=34790&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/fix-linux-gnueabihf-build.patch (added)
+++ desktop/unstable/ekiga/debian/patches/fix-linux-gnueabihf-build.patch [utf-8] Sat May 12 11:27:30 2012
@@ -1,0 +1,63 @@
+Description: Add arm-linux-gnueabihf support
+ * configure.ac: add linux-gnueabi* support
+ .
+ ekiga (3.2.7-4.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * Add arm-linux-gnueabihf (armhf) support (Closes: #640256)
+Author: Hector Oron <zumbi at debian.org>
+Bug-Debian: http://bugs.debian.org/640256
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: http://git.gnome.org/browse/ekiga/commit/?id=f49e5a5ce749ac
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/640256
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- ekiga-3.2.7.orig/configure.ac
++++ ekiga-3.2.7/configure.ac
+@@ -87,7 +87,7 @@ case $target_os in
+ gm_platform="solaris"
+ ;;
+
+- linux-gnulp | linux-gnu | linux-gnueabi | linux | Linux)
++ linux-gnulp | linux-gnu | linux-gnueabi* | linux | Linux)
+ gm_platform="linux"
+ ;;
+
+@@ -124,7 +124,7 @@ case $target_os in
+ ARCH_OPAL_LIBS="-lpt -lopal -ldl -lpthread"
+ ;;
+
+- linux-gnulp | linux-gnu | linux-gnueabi | linux | Linux)
++ linux-gnulp | linux-gnu | linux-gnueabi* | linux | Linux)
+ ARCH_PTLIB_CFLAGS="-DPTRACING -DNDEBUG -Os -g -fno-exceptions -felide-constructors"
+ ARCH_OPAL_LIBS="-lpt -lopal -ldl -lpthread"
+ ;;
+--- ekiga-3.2.7.orig/configure
++++ ekiga-3.2.7/configure
+@@ -15386,7 +15386,7 @@ case $target_os in
+ gm_platform="solaris"
+ ;;
+
+- linux-gnulp | linux-gnu | linux-gnueabi | linux | Linux)
++ linux-gnulp | linux-gnu | linux-gnueabi* | linux | Linux)
+ gm_platform="linux"
+ ;;
+
+@@ -15602,7 +15602,7 @@ case $target_os in
+ ARCH_OPAL_LIBS="-lpt -lopal -ldl -lpthread"
+ ;;
+
+- linux-gnulp | linux-gnu | linux-gnueabi | linux | Linux)
++ linux-gnulp | linux-gnu | linux-gnueabi* | linux | Linux)
+ ARCH_PTLIB_CFLAGS="-DPTRACING -DNDEBUG -Os -g -fno-exceptions -felide-constructors"
+ ARCH_OPAL_LIBS="-lpt -lopal -ldl -lpthread"
+ ;;
Added: desktop/unstable/ekiga/debian/patches/gcc47.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/gcc47.patch?rev=34790&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/gcc47.patch (added)
+++ desktop/unstable/ekiga/debian/patches/gcc47.patch [utf-8] Sat May 12 11:27:30 2012
@@ -1,0 +1,107 @@
+Author: Kilian Krause <kilian at debian.org>
+Subject: Compile with GCC 4.7
+
+ http://git.gnome.org/browse/ekiga/commit/?id=f81a43f2c4ed5e5083e3a850bc7164d11a910358
+
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/672098
+
+From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
+Date: Sat, 24 Mar 2012 09:17:40 +0000
+Subject: Fix compile error with gcc 4.7
+
+---
+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 (boost::shared_ptr<ContactType> contact)
+ {
+ contact->questions.connect (boost::ref (questions));
+- add_object (contact);
++ this->add_object (contact);
+ }
+
+
+@@ -212,7 +212,7 @@ template<typename ContactType>
+ void
+ Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_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.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
+--
+cgit v0.9.0.2
Added: desktop/unstable/ekiga/debian/patches/opal310.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/opal310.patch?rev=34790&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/opal310.patch (added)
+++ desktop/unstable/ekiga/debian/patches/opal310.patch [utf-8] Sat May 12 11:27:30 2012
@@ -1,0 +1,79 @@
+Author: Mehdi Dogguy <mehdi at debian.org>
+Subject: Cope with API changes in Opal 3.10
+
+ http://git.gnome.org/browse/ekiga/commit/lib/engine/components/opal/opal-call.cpp?id=34d9b995344eca38afa083b10a6c864c15848b9a
+ http://git.gnome.org/browse/ekiga/commit/lib/engine/components/opal/opal-call.cpp?id=72d7b95bd8df3b6673e175195d9ba2b8abef5c0e
+ http://git.gnome.org/browse/ekiga/commit/lib/engine/components/opal/sip-endpoint.cpp?id=8c02582bdfa81ea0154572549fbfc319811a72f1
+
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/664929
+
+--- a/lib/engine/components/opal/opal-call.cpp
++++ b/lib/engine/components/opal/opal-call.cpp
+@@ -154,11 +154,11 @@
+ PSafePtr<OpalConnection> connection = get_remote_connection ();
+ if (connection != NULL) {
+
+- on_hold = connection->IsConnectionOnHold ();
++ on_hold = connection->IsOnHold (false);
+ if (!on_hold)
+- connection->HoldConnection ();
++ connection->Hold (false, true);
+ else
+- connection->RetrieveConnection ();
++ connection->Hold (false, false);
+ }
+ }
+
+@@ -477,7 +477,6 @@
+ case OpalConnection::EndedByNoRingBackTone:
+ case OpalConnection::EndedByOutOfService:
+ case OpalConnection::EndedByAcceptingCallWaiting:
+- case OpalConnection::EndedWithQ931Code:
+ case OpalConnection::NumCallEndReasons:
+ default :
+ reason = _("Call completed");
+--- a/lib/engine/components/opal/sip-endpoint.cpp
++++ b/lib/engine/components/opal/sip-endpoint.cpp
+@@ -352,7 +352,11 @@
+ {
+ if (!_uri.empty () && (_uri.find ("sip:") == 0 || _uri.find (':') == string::npos) && !_message.empty ()) {
+
+- SIPEndPoint::Message (_uri, _message);
++ OpalIM im;
++ im.m_to = PURL (_uri);
++ im.m_mimeType = "text/plain;charset=UTF-8";
++ im.m_body = _message;
++ Message(im);
+
+ return true;
+ }
+@@ -940,6 +944,7 @@
+ }
+
+
++#if 0
+ void
+ Opal::Sip::EndPoint::OnMessageFailed (const SIPURL & messageUrl,
+ SIP_PDU::StatusCodes /*reason*/)
+@@ -953,6 +958,7 @@
+ uri, display_name,
+ _("Could not send message")));
+ }
++#endif
+
+
+ SIPURL
+--- a/lib/engine/components/opal/sip-endpoint.h
++++ b/lib/engine/components/opal/sip-endpoint.h
+@@ -180,8 +180,10 @@
+ bool OnReceivedMESSAGE (OpalTransport & transport,
+ SIP_PDU & pdu);
+
++#if 0
+ void OnMessageFailed (const SIPURL & messageUrl,
+ SIP_PDU::StatusCodes reason);
++#endif
+
+ SIPURL GetRegisteredPartyName (const SIPURL & host,
+ const OpalTransport & transport);
Modified: desktop/unstable/ekiga/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/series?rev=34790&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/series [utf-8] (original)
+++ desktop/unstable/ekiga/debian/patches/series [utf-8] Sat May 12 11:27:30 2012
@@ -1,1 +1,4 @@
libnotify0.7.patch
+fix-linux-gnueabihf-build.patch
+opal310.patch
+gcc47.patch
More information about the pkg-gnome-commits
mailing list