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.wip/yesman
Thomas Tuegel
9 years ago
parent
dd264938bc
commit
2e0589b4ca
@ -1,32 +0,0 @@ |
||||
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, |
||||
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, |
||||
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, |
||||
shared_desktop_ontologies, marble, libmysql }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
name = "digikam-2.9.0"; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://sourceforge/digikam/${name}.tar.bz2"; |
||||
sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ cmake automoc4 pkgconfig ]; |
||||
|
||||
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff |
||||
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw |
||||
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble libmysql ]; |
||||
|
||||
# Make digikam find some FindXXXX.cmake |
||||
KDEDIRS="${marble}:${qjson}"; |
||||
|
||||
enableParallelBuilding = true; |
||||
|
||||
meta = { |
||||
description = "Photo Management Program"; |
||||
license = "GPL"; |
||||
homepage = http://www.digikam.org; |
||||
maintainers = with stdenv.lib.maintainers; [ viric urkud ]; |
||||
inherit (kdelibs.meta) platforms; |
||||
}; |
||||
} |
||||
@ -0,0 +1,33 @@ |
||||
From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sat, 12 Sep 2015 16:14:10 -0500
|
||||
Subject: [PATCH] search paths
|
||||
|
||||
---
|
||||
src/utilities/utility.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp
|
||||
index 2e322aa..2e9e4d2 100644
|
||||
--- a/src/utilities/utility.cpp
|
||||
+++ b/src/utilities/utility.cpp
|
||||
@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr
|
||||
|
||||
QString programPathName;
|
||||
QStringList searchPathList = Settings::searchPathList();
|
||||
+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z";
|
||||
|
||||
QStringList programsWithDifferentNames = programToSearch.split(";");
|
||||
|
||||
@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int
|
||||
QStringList niceProcessArgs;
|
||||
|
||||
// look for 'nice' location :
|
||||
- QString nicePath = KStandardDirs::findExe("nice");
|
||||
+ QString nicePath = QString("/usr/bin/nice");
|
||||
niceProcessArgs.append(nicePath);
|
||||
niceProcessArgs.append("-n");
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,19 +0,0 @@ |
||||
--- kwooty-kwooty/src/utility.cpp 2012-01-24 22:22:45.091383072 +0100
|
||||
+++ kwooty-kwooty/src/utility.cpp 2012-01-24 22:29:08.526208140 +0100
|
||||
@@ -299,6 +299,7 @@
|
||||
|
||||
QString programPathName;
|
||||
QStringList searchPathList = Settings::searchPathList();
|
||||
+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z";
|
||||
|
||||
QStringList programsWithDifferentNames = programToSearch.split(";");
|
||||
|
||||
@@ -363,7 +364,7 @@
|
||||
QStringList niceProcessArgs;
|
||||
|
||||
// look for 'nice' location :
|
||||
- QString nicePath = KStandardDirs::findExe("nice");
|
||||
+ QString nicePath = QString("/usr/bin/nice");
|
||||
niceProcessArgs.append(nicePath);
|
||||
niceProcessArgs.append("-n");
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in new issue