[packages/kde4-kdenetwork] - fix building with new linphone and mediastreamer libs - rel 2

[baggins]

commit aa06ca7dec58cd0cdc0e9ae3d1b775d2bb33447f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jun 20 09:28:18 2013 +0200

    - fix building with new linphone and mediastreamer libs
    - rel 2

 kde4-kdenetwork.spec |  4 +++-
 linphone-fix.patch   | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kdenetwork.spec b/kde4-kdenetwork.spec
index bad3893..b52d01b 100644
--- a/kde4-kdenetwork.spec
+++ b/kde4-kdenetwork.spec
@@ -15,7 +15,7 @@ Summary(pl.UTF-8):	K Desktop Environment - aplikacje sieciowe
 Summary(pt_BR.UTF-8):	K Desktop Environment - aplicações de rede
 Name:		kde4-kdenetwork
 Version:	4.10.4
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -24,6 +24,7 @@ Patch100:	%{name}-branch.diff
 Patch0:		%{name}-FindLibgadu.patch
 Patch1:		%{name}-gcc.patch
 Patch2:		kdenetwork-4.7.97-fix-for-g++47.patch
+Patch3:		linphone-fix.patch
 URL:		http://www.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtOpenGL-devel >= %{qtver}
@@ -750,6 +751,7 @@ specjalnych możliwości Remote Desktop Connection.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
diff --git a/linphone-fix.patch b/linphone-fix.patch
new file mode 100644
index 0000000..bcb4a01
--- /dev/null
+++ b/linphone-fix.patch
@@ -0,0 +1,20 @@
+--- kde4-kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc~	2013-06-20 09:15:17.773243467 +0200
++++ kde4-kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc	2013-06-20 09:27:03.157408216 +0200
+@@ -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(audio_stream_->ms.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(audio_stream_->ms.session);
+   }
+ 
+   return true;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdenetwork.git/commitdiff/aa06ca7dec58cd0cdc0e9ae3d1b775d2bb33447f