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

Calligra: fix build with KDE 4.10

This commit is contained in:
Evgeny Egorochkin 2013-05-07 17:09:47 +03:00
parent 2e77679b0b
commit d32fafc9e4
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/calligra/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl pkgconfig ];
patches = [ ./fix-kde4.10-build.patch ];
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A Qt/KDE office suite, formely known as koffice";
homepage = http://calligra.org;
maintainers = [ stdenv.lib.maintainers.urkud ];
maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
inherit (kdelibs.meta) platforms;
};
}

36
pkgs/applications/office/calligra/fix-kde4.10-build.patch Normal file
View File

@ -0,0 +1,36 @@
From: Andre Woebbeking <Woebbeking@kde.org>
Date: Sun, 13 Jan 2013 15:10:38 +0000
Subject: compile with kdelibs 4.10 (tests are enabled by default)
X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=39fdda6757cbbb35480dec98eac419eb1879cb31
---
compile with kdelibs 4.10 (tests are enabled by default)
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,11 +96,6 @@
set(SHOULD_BUILD_ACTIVE FALSE)
ENDIF()
-if(KDE4_BUILD_TESTS)
- # only with this definition will the FOO_TEST_EXPORT macro do something
- add_definitions(-DCOMPILING_TESTS)
-endif(KDE4_BUILD_TESTS)
-
########################
#########################
## Look for KDE and Qt ##
@@ -146,6 +141,11 @@
endif(NOT ${KDE_VERSION} VERSION_GREATER 4.6.4)
macro_ensure_out_of_source_build("Compiling Calligra inside the source directory is not possible. Please refer to the build instruction http://community.kde.org/Calligra/Building/Building_Calligra")
+
+if(KDE4_BUILD_TESTS)
+ # only with this definition will the FOO_TEST_EXPORT macro do something
+ add_definitions(-DCOMPILING_TESTS)
+endif(KDE4_BUILD_TESTS)
###########################
############################