diff options
Diffstat (limited to 'pkgs/desktops/kde-4.10/kdenetwork')
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix (renamed from pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix) | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix (renamed from pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix) | 4 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch | 24 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kget.nix | 11 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch | 22 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch | 47 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kopete.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/kppp.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/krdc.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.10/kdenetwork/krfb.nix | 6 |
11 files changed, 78 insertions, 47 deletions
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix index 2f32f4d6b2cd..bada0c1cb108 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix @@ -2,6 +2,4 @@ kde { buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix index f90fd3560796..ac28edb8dd98 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix @@ -5,7 +5,5 @@ kde { buildInputs = [ kdelibs boost ]; - preConfigure = "mv -v strigi-analyzer kfile-plugins"; - - patches = [ ./kdenetwork.patch ]; + #preConfigure = "mv -v kdenetwork-strigi-analyzers kfile-plugins"; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch deleted file mode 100644 index ebadbfad9bac..000000000000 --- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt ---- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400 -+++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400 -@@ -28,7 +28,8 @@ - set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} ) - endif (WIN32) - --find_package(KdepimLibs REQUIRED) -+macro_optional_find_package(KdepimLibs) -+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete") - # find_package(X11VidMode) not used at this time - - # NX support is not ready for KDE 4.2; disabled (uwolfer) -@@ -79,7 +80,9 @@ - macro_optional_add_subdirectory(kfile-plugins) - macro_optional_add_subdirectory(kget) - --macro_optional_add_subdirectory(kopete) -+if(KDEPIMLIBS_FOUND) -+ macro_optional_add_subdirectory(kopete) -+endif(KDEPIMLIBS_FOUND) - - if(Q_WS_X11) - macro_optional_add_subdirectory(krdc) diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix index 2f32f4d6b2cd..bada0c1cb108 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix @@ -2,6 +2,4 @@ kde { buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix index 25028ef974ef..d5f38096a427 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix @@ -4,14 +4,11 @@ kde { buildInputs = [ kdelibs libktorrent -#kde_workspace -shared_desktop_ontologies -#kdepimlibs -# kde_baseapps -gpgme boost libmms qca2 sqlite + kde_workspace + shared_desktop_ontologies + # kde_baseapps + gpgme boost libmms qca2 sqlite ]; KDEDIRS = libktorrent; - - patches = [ ./kdenetwork.patch ]; } 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 000000000000..ec003732344f --- /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<AudioCodec>& 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<AudioCodec>& 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 000000000000..d6aa9515b76c --- /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 <string> +-#include <vector> ++#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 <string> ++#include <vector> ++ ++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 3907b67c42a5..7139c62981c6 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" ]; diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix index 2f32f4d6b2cd..bada0c1cb108 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix @@ -2,6 +2,4 @@ kde { buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix index 1f3ba36aaa1b..1b7405f10062 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix @@ -1,8 +1,5 @@ { kde, kdelibs, libvncserver, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver libjpeg ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix index 80013f430d3c..b6c36ea9c158 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix @@ -1,7 +1,5 @@ -{ kde, kdelibs, libvncserver, libXdamage, libXtst }: +{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver libXdamage libXtst]; - - patches = [ ./kdenetwork.patch ]; + buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg ]; } |