[SCM] KDE Network module packaging branch, master, updated. debian/4.10.5-2-3-g2acdfcb

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git;a=commitdiff;h=06857e5

The following commit has been merged in the master branch:
commit 06857e5ba41c0949c0b844daa9fe6222d8f3faf9
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 8 19:49:54 2013 +0200

    fix build with linphone >= 3.6 (#719371)
---
 debian/changelog                 |    2 ++
 debian/patches/new_linphone.diff |   48 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 321d035..5652113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdenetwork (4:4.10.5-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix build with linphone >= 3.6; patch new_linphone.diff. (Closes: #719371)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Sep 2013 19:33:41 +0200
 
diff --git a/debian/patches/new_linphone.diff b/debian/patches/new_linphone.diff
new file mode 100644
index 0000000..f1c8a21
--- /dev/null
+++ b/debian/patches/new_linphone.diff
@@ -0,0 +1,48 @@
+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/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -143,7 +143,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;
+     }
+   }
+@@ -154,7 +154,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);
+   }
+  
+ }
+--- a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
+@@ -25,8 +25,8 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#ifndef __STUN_H__
+-#define __STUN_H__
++#ifndef __LIBJINGLE_STUN_H__
++#define __LIBJINGLE_STUN_H__
+ 
+ // This file contains classes for dealing with the STUN and TURN protocols.
+ // Both protocols use the same wire format.
+@@ -361,4 +361,4 @@
+ 
+ } // namespace cricket
+ 
+-#endif // __STUN_H__
++#endif // __LIBJINGLE_STUN_H__
diff --git a/debian/patches/series b/debian/patches/series
index f58c5f3..567239c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kdenetwork-4.7.97-fix-for-g++47.patch
 add_libpthread_to_krfb.diff
 fix-kget-doc.patch
 kppp-linux-only.diff
+new_linphone.diff

-- 
KDE Network module packaging