alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

KDE4.10 kioslave-{svn,perldoc}: Fix build.

Browse source 
Patch contributed by Karn Kallio.
This commit is contained in:
Evgeny Egorochkin 2013-05-06 17:37:40 +03:00
parent 6e406edf0a
commit b2f6770208
4 changed files with 4 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/kde-4.10/default.nix
View file

@ -25,8 +25,8 @@ let
kdesdk = [
{ name="cervisia"; }
{ name="lokalize"; }
{ name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kioslave"; }
{ name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kioslave"; }
{ name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kdesdk-kioslaves"; }
{ name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kdesdk-kioslaves"; }
{ name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
{ name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
{ name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }

57
pkgs/desktops/kde-4.10/kdesdk/find-svn.patch
View file

@ -1,57 +0,0 @@
diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
index 59bcb96..2eac05d 100644
--- a/cmake/modules/FindSVN.cmake
+++ b/cmake/modules/FindSVN.cmake
@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
/usr/local/apr/bin
)
+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
+ /usr/local/apr/bin
+)
if(SVNCONFIG_EXECUTABLE)
@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
else(APRCONFIG_EXECUTABLE)
FIND_PATH(_INCLUDES apr_pools.h
- ${SVN_INCLUDES}/apr-0/
- ${SVN_INCLUDES}/apr-1/
- ${SVN_INCLUDES}/apr-1.0/
- /usr/include/apr-0/
- /usr/include/apr-1/
- /usr/include/apr-1.0/
- /usr/local/include/apr-0/
- /usr/local/include/apr-1/
- /usr/local/include/apr-1.0/
+ HINTS ${SVN_INCLUDES}
+ SUFFIXES apr-0 apr-1 apr-1.0
)
if(_INCLUDES)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_FOUND FALSE) # no apr == can't compile!
endif(_INCLUDES)
endif(APRCONFIG_EXECUTABLE)
+
+ # Use apu-config if it exists
+ if(APUCONFIG_EXECUTABLE)
+ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
+ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
+ string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
+ else(APUCONFIG_EXECUTABLE)
+ FIND_PATH(_INCLUDES apu.h
+ HINTS ${SVN_INCLUDES}
+ SUFFIXES apr-0 apr-1 apr-1.0
+ )
+ if(_INCLUDES)
+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
+ else(_INCLUDES)
+ set(SVN_FOUND FALSE) # no apr == can't compile!
+ endif(_INCLUDES)
+ endif(APUCONFIG_EXECUTABLE)
FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
if(SVN_LIBRARIES)
FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)

2
pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
View file

@ -1,7 +1,7 @@
{ kde, kdelibs, perl }:
kde {
#todo: doesn't build
buildInputs = [ kdelibs perl ];
cmakeFlags = [ "-DBUILD_perldoc=ON" ];

4
pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
View file

@ -1,10 +1,8 @@
{ kde, kdelibs, subversionClient, apr, aprutil }:
kde {
#todo: doesn't build
buildInputs = [ kdelibs subversionClient apr aprutil ];
patches = [ ./find-svn.patch ];
buildInputs = [ kdelibs subversionClient apr aprutil ];
meta = {
description = "Subversion kioslave";