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

Remove PATHS from find-svn.patch

Browse Source 
svn path=/nixpkgs/trunk/; revision=31605
This commit is contained in:
Yury G. Kudryashov 2012-01-17 16:27:57 +00:00
parent dc9830111b
commit 3aa99d803e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
View File

@ -12,7 +12,7 @@ index 59bcb96..2eac05d 100644
if(SVNCONFIG_EXECUTABLE) if(SVNCONFIG_EXECUTABLE)
@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE) @@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
else(APRCONFIG_EXECUTABLE) else(APRCONFIG_EXECUTABLE)
FIND_PATH(_INCLUDES apr_pools.h FIND_PATH(_INCLUDES apr_pools.h
@ -26,12 +26,11 @@ index 59bcb96..2eac05d 100644
- /usr/local/include/apr-1/ - /usr/local/include/apr-1/
- /usr/local/include/apr-1.0/ - /usr/local/include/apr-1.0/
+ HINTS ${SVN_INCLUDES} + HINTS ${SVN_INCLUDES}
+ PATHS /usr /usr/local
+ SUFFIXES apr-0 apr-1 apr-1.0 + SUFFIXES apr-0 apr-1 apr-1.0
) )
if(_INCLUDES) if(_INCLUDES)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE) @@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_FOUND FALSE) # no apr == can't compile! set(SVN_FOUND FALSE) # no apr == can't compile!
endif(_INCLUDES) endif(_INCLUDES)
endif(APRCONFIG_EXECUTABLE) endif(APRCONFIG_EXECUTABLE)
@ -45,7 +44,6 @@ index 59bcb96..2eac05d 100644
+ else(APUCONFIG_EXECUTABLE) + else(APUCONFIG_EXECUTABLE)
+ FIND_PATH(_INCLUDES apu.h + FIND_PATH(_INCLUDES apu.h
+ HINTS ${SVN_INCLUDES} + HINTS ${SVN_INCLUDES}
+ PATHS /usr /usr/local
+ SUFFIXES apr-0 apr-1 apr-1.0 + SUFFIXES apr-0 apr-1 apr-1.0
+ ) + )
+ if(_INCLUDES) + if(_INCLUDES)