From 66021f9cd8b3076dc1d6d4be705850c32a2fe8d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Jul 2013 14:54:47 +0200 Subject: [PATCH] Fix kdenetwork --- .../kdenetwork/kdenetwork-filesharing.nix | 2 -- .../kdenetwork-strigi-analyzers.nix | 4 +--- .../kde-4.10/kdenetwork/kdenetwork.patch | 24 ------------------- pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix | 2 -- pkgs/desktops/kde-4.10/kdenetwork/kget.nix | 11 ++++----- pkgs/desktops/kde-4.10/kdenetwork/kppp.nix | 2 -- pkgs/desktops/kde-4.10/kdenetwork/krdc.nix | 3 --- pkgs/desktops/kde-4.10/kdenetwork/krfb.nix | 6 ++--- 8 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix index 2f32f4d6b2cd..bada0c1cb108 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/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/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix index f90fd3560796..ac28edb8dd98 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.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/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 ]; }