diff options
author | Shea Levy <shea@shealevy.com> | 2011-08-31 18:12:33 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2011-08-31 18:12:33 +0000 |
commit | 191a4c404ab57be4466e9b2d6ef25c6c77152602 (patch) | |
tree | 23000acd1260299138cdb9cf355ab0054ecfc783 /pkgs/desktops/kde-4.7/kdesdk/find-svn.patch | |
parent | f7f9b39450877382151dc0bdd10281404780f19f (diff) | |
parent | 04b1ac31da9885e3b1893a98e5280b8f9a039652 (diff) |
Merge from trunk backups/darwin-updates@34176
svn path=/nixpkgs/branches/darwin-updates/; revision=28944
Diffstat (limited to 'pkgs/desktops/kde-4.7/kdesdk/find-svn.patch')
-rw-r--r-- | pkgs/desktops/kde-4.7/kdesdk/find-svn.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch new file mode 100644 index 0000000000000..61cb49b308f2c --- /dev/null +++ b/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch @@ -0,0 +1,59 @@ +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,9 @@ 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} ++ PATHS /usr /usr/local ++ SUFFIXES apr-0 apr-1 apr-1.0 + ) + if(_INCLUDES) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) +@@ -72,6 +69,25 @@ 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} ++ PATHS /usr /usr/local ++ 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) |