kde414: build with kdelibs-4.14.12

Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.

15 files changed, 143 insertions, 22 deletions

diff --git a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch
new file mode 100644
index 000000000000..cd19b7e2d72a
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch
@@ -0,0 +1,36 @@
+From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 7 Sep 2015 18:55:44 -0500
+Subject: [PATCH] ksysguard disable signalplottertest
+
+---
+ libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
+index d472fd7..f178b71 100644
+--- a/libs/ksysguard/tests/CMakeLists.txt
++++ b/libs/ksysguard/tests/CMakeLists.txt
+@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
+ set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
+ kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
+ target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
+-
+-
+-# KGraphicsSignalPlotter benchmark
+-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
+-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
+-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
+-
+-
+-# KSignalPlotter unit test
+-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
+-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
+-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
+-
+-
+-
+-
+-- 
+2.5.0
+
diff --git a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
new file mode 100644
index 000000000000..4127b16d5f6d
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
@@ -0,0 +1,62 @@
+From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Thu, 10 Sep 2015 18:41:57 -0500
+Subject: [PATCH] duplicate add_test
+
+---
+ RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt  | 1 -
+ RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt  | 1 -
+ RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt  | 1 -
+ RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt  | 1 -
+ RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 -
+ 5 files changed, 5 deletions(-)
+
+diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
+index 32a2504..4fbb838 100644
+--- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
++++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
+@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin
+     ${QT_QTTEST_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin)
+diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
+index 615004c..6383bd8 100644
+--- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
++++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
+@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin
+     ${QT_QTTEST_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin)
+diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
+index f9cdbfa..842d14b 100644
+--- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
++++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
+@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin
+     ${QT_QTTEST_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin)
+diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
+index 33c0da8..70cab8d 100644
+--- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
++++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
+@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin
+     ${QT_QTTEST_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin)
+diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
+index b52736e..58ee40e 100644
+--- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
++++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
+@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin
+     ${QT_QTTEST_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+ )
+-add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin)
+ 
+-- 
+2.5.0
+
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
index c78dfbd8a36a..52600e183bdd 100644
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4, perl, pkgconfig
 , release, branch, ignoreList, extraSubpkgs
 }:
 
@@ -29,13 +29,14 @@ rec {
   # released as individual tarballs
   kdeMonoPkg = name:
     let n_ = name; v_ = getAttr name manifest.versions; in
-    a@{meta, name ? n_, version ? v_, ...}:
+    a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}:
     stdenv.mkDerivation ({
       name = "${name}-${version}";
       src = kdesrc name version;
+      nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
       meta = defMeta // meta;
       enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" ]));
+    } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ]));
 
   # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
   # API.
@@ -45,10 +46,11 @@ rec {
   kdeSubdirPkg = module:
     {name, subdir ? name, sane ? name}:
     let name_ = name; version_ = getAttr module manifest.versions; in
-    a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, ...}:
+    a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}:
     stdenv.mkDerivation ({
       name = "${name}-${release}";
       src = kdesrc module version;
+      nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
       cmakeFlags =
         [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
           "-DBUILD_doc=TRUE"
@@ -56,7 +58,7 @@ rec {
         ] ++ cmakeFlags;
       meta = defMeta // meta;
       enableParallelBuilding = module.enableParallelBuilding or true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
+    } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ]));
 
   # A KDE monolithic module
   kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix
index ddda04fd3705..ae4959662626 100644
--- a/pkgs/desktops/kde-4.14/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.14/kde-runtime.nix
@@ -1,4 +1,4 @@
-{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
+{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info
 , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
 , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
 }:
@@ -14,7 +14,7 @@ kde {
 #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ shared_mime_info ];
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix
index 75863e1fe99b..53df146ab533 100644
--- a/pkgs/desktops/kde-4.14/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.14/kde-workspace.nix
@@ -18,7 +18,7 @@ kde {
       kactivities
     ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  patches = [ ./files/ksysguard-0001-disable-signalplottertest.patch ];
 
   preConfigure =
    ''
diff --git a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
index ce30d11fda31..76131d8f0f0f 100644
--- a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
@@ -1,6 +1,8 @@
 { kde, kdelibs, boost, grantlee }:
 
 kde {
+  patches = [ ../files/rocs-0001-duplicate-add_test.patch ];
+
   buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
 
   NIX_CFLAGS_COMPILE = "-fexceptions";
diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
index f8d9bad36dc5..b60afa786d17 100644
--- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
@@ -1,6 +1,7 @@
-{ kde, kdelibs, libkdegames }:
+{ kde, kdelibs, libkdegames, shared_mime_info }:
 kde {
   buildInputs = [ kdelibs libkdegames ];
+  nativeBuildInputs = [ shared_mime_info ];
   meta = {
     description = "a relaxing card sorting game";
   };
diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
index 010dbd5d6232..ddecc78c75bc 100644
--- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
+++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
@@ -1,8 +1,10 @@
-{ kde, kdelibs, libkdegames }:
+{ kde, kdelibs, libkdegames, shared_mime_info }:
 kde {
 
 # TODO: package qvoronoi
 
+  nativeBuildInputs = [ shared_mime_info ];
+
   buildInputs = [ kdelibs libkdegames ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
index 1d5c6e2fcb4a..18697e13b66c 100644
--- a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
+++ b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
@@ -4,8 +4,6 @@ kde {
 
   buildInputs = [ kdelibs libraw lcms2 ];
 
-  nativeBuildInputs = [ pkgconfig ];
-
   meta = {
     description = "Library for decoding RAW images";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
index 526ac069e619..b990628889b6 100644
--- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
+++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
@@ -1,5 +1,5 @@
 { stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4
-, pkgconfig, doxygen, ebook_tools
+, pkgconfig, doxygen, ebook_tools, automoc4, cmake, perl
 }:
 
 kde {
@@ -11,7 +11,7 @@ kde {
     poppler_qt4 ebook_tools
   ];
 
-  nativeBuildInputs = [ pkgconfig doxygen ];
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig doxygen ];
 
   meta = {
     description = "NEPOMUK core";
diff --git a/pkgs/desktops/kde-4.14/kdepim-runtime.nix b/pkgs/desktops/kde-4.14/kdepim-runtime.nix
index d92e22548206..e5061a8790af 100644
--- a/pkgs/desktops/kde-4.14/kdepim-runtime.nix
+++ b/pkgs/desktops/kde-4.14/kdepim-runtime.nix
@@ -1,4 +1,5 @@
-{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
+{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies
+, shared_mime_info }:
 
 kde {
 
@@ -9,6 +10,8 @@ kde {
     libxslt
   ];
 
+  nativeBuildInputs = [ shared_mime_info ];
+
   meta = {
     description = "KDE PIM runtime";
     license = "GPL";
diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix
index e0f355acdd95..ac62c970eec0 100644
--- a/pkgs/desktops/kde-4.14/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix
@@ -1,13 +1,20 @@
 { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
 , kdelibs, akonadi, libxslt, nepomuk_core
-, shared_desktop_ontologies, qjson }:
+, shared_mime_info, shared_desktop_ontologies, qjson
+, automoc4, cmake, perl
+}:
 
 kde {
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+
+  cmakeFlags = [
+    "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3"
+  ];
 
   buildInputs =
     [ boost gpgme libical libxslt qjson prison
       openldap cyrus_sasl akonadi shared_desktop_ontologies
+      shared_mime_info
     ];
 
   propagatedBuildInputs = [ kdelibs nepomuk_core ];
diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
index 2b1f1628cf1d..b4d24f47e490 100644
--- a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
 , boost, eigen2, kde_workspace, attica, qca2, qimageblitz
 , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth }:
+, qjson, qoauth, shared_mime_info }:
 
 kde {
 
@@ -14,7 +14,7 @@ kde {
                   shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ shared_mime_info ];
 
   meta = {
     description = "KDE Plasma Addons";
diff --git a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
index 058636596ad8..77108c76adc3 100644
--- a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
+++ b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
@@ -1,8 +1,10 @@
-{ kde, kdelibs, qca2 }:
+{ kde, kdelibs, qca2, shared_mime_info }:
 
 kde {
   buildInputs = [ kdelibs qca2 ];
 
+  nativeBuildInputs = [ shared_mime_info ];
+
 # TODO: Look what does -DBUILD_mobile add
 
   enableParallelBuilding = false;
diff --git a/pkgs/desktops/kde-4.14/l10n/default.nix b/pkgs/desktops/kde-4.14/l10n/default.nix
index fa6406043b1b..b4c272cb328e 100644
--- a/pkgs/desktops/kde-4.14/l10n/default.nix
+++ b/pkgs/desktops/kde-4.14/l10n/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
+, kdelibs, gettext, release, branch, stable
+}:
 
 let
 
@@ -18,7 +20,11 @@ let
 
       buildInputs = [ gettext kdelibs ];
 
-      cmakeFlags = "-Wno-dev";
+      nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+
+      cmakeFlags = [
+        "-Wno-dev"
+      ];
 
       meta = {
         description = "KDE translation for ${lang}";