public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde-workspace: fix build with kdelibs-4.14.12 

kdelibs-4.14.12 enables stricter CMake policies which break the
build. Patch to disable the offending test.
This commit is contained in:
Thomas Tuegel 2015-09-30 06:22:56 -05:00
parent 6b934c30d3
commit 246e306d2a
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -289,6 +289,7 @@ let
kde-wallpapers = kde4Package super.kde-wallpapers; kde-wallpapers = kde4Package super.kde-wallpapers;
kde-workspace = extendDerivation (kde4Package super.kde-workspace) { kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
patches = [ ./kde-workspace/ksysguard-0001-disable-signalplottertest.patch ];
buildInputs = with scope.xorg; [ buildInputs = with scope.xorg; [
libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
]; ];

36
pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch Normal file
View File

@ -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