diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch new file mode 100644 index 00000000000..ec003732344 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch @@ -0,0 +1,22 @@ +diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +index 88fdbd1..57c6c05 100644 +--- a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc ++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector& codecs) + 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 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector& codecs) + // 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; diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch new file mode 100644 index 00000000000..d6aa9515b76 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch @@ -0,0 +1,47 @@ +diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h +--- a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h ++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h +@@ -25,16 +25,8 @@ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#ifndef __STUN_H__ +-#define __STUN_H__ +- +-// This file contains classes for dealing with the STUN and TURN protocols. +-// Both protocols use the same wire format. +- +-#include "talk/base/basictypes.h" +-#include "talk/base/bytebuffer.h" +-#include +-#include ++#ifndef STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX ++#define STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX + + namespace cricket { + +@@ -55,6 +47,23 @@ + STUN_DATA_INDICATION = 0x0115 + }; + ++} ++ ++#endif // STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX ++ ++#ifndef __STUN_H__ ++#define __STUN_H__ ++ ++// This file contains classes for dealing with the STUN and TURN protocols. ++// Both protocols use the same wire format. ++ ++#include "talk/base/basictypes.h" ++#include "talk/base/bytebuffer.h" ++#include ++#include ++ ++namespace cricket { ++ + // These are the types of attributes defined in STUN & TURN. Next to each is + // the name of the class (T is StunTAttribute) that implements that type. + enum StunAttributeType { + diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix index 3907b67c42a..7139c62981c 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix @@ -18,6 +18,8 @@ kde { patchPhase = '' cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake + patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch} + patch -p1 < ${./kopete-4.10.4-kopete-stun.patch} ''; cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];