[SCM] kopete packaging branch, master, updated. debian/4.13.1-1-61-gdb6961a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=2de90b8

The following commit has been merged in the master branch:
commit 2de90b840b73484cfb0e0b6857ea5af7e7889a38
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Wed Nov 13 19:51:32 2013 +0100

    Forgot to add the patch
---
 debian/patches/new_linphone.diff | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/debian/patches/new_linphone.diff b/debian/patches/new_linphone.diff
new file mode 100644
index 0000000..f4c0105
--- /dev/null
+++ b/debian/patches/new_linphone.diff
@@ -0,0 +1,29 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix build with the libraries of linphone >= 3.6.
+ - in linphonemediaengine.cc, cast audio_stream_ to the "base" MediaStream
+   struct
+ - stun.h: make the header guard a bit more specific, so it is different than
+   the one of the stun.h provided by libortp
+Forwarded: no
+Last-Update: 2013-09-08
+
+--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(((MediaStream *)audio_stream_)->session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(((MediaStream *)audio_stream_)->session);
+   }
+ 
+   return true;

-- 
kopete packaging