diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-05-10 21:14:54 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-05-10 22:26:47 +0200 |
| commit | 018ab03b20ac62aa99a6d3a54dd5ca294351d505 (patch) | |
| tree | c20472135e959754851898ac8a8c422630feb00d /eclass/kde4-meta.eclass | |
| parent | 472896e8b6ed3f5de2aa72270f7d28823ec1ee4e (diff) | |
| download | kde-018ab03b20ac62aa99a6d3a54dd5ca294351d505.tar.gz kde-018ab03b20ac62aa99a6d3a54dd5ca294351d505.tar.bz2 kde-018ab03b20ac62aa99a6d3a54dd5ca294351d505.zip | |
[eclasses] update the kworspace handling, some whitespace, etc
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index a5d597f85d6..05d7a1521a4 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -578,9 +578,14 @@ kde4-meta_change_cmakelists() { die "${LINENO}: sed died in the kdebase-startkde collision prevention section" fi # Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82 + # install files separately as KDE4WorkspaceConfig-${PN}.cmake and + # strip duplicate definitions only. Libkworkspace is only special + # candidate that installs the desired file itself. if [[ ${PN} != libkworkspace ]]; then - sed -i -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ - CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip EXPORT section" + sed -i \ + -e '/install(FILES[[:space:]]{CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/s/^/#DONOTINSTALL[[:space:]]/' + -e "s:FILE[[:space:]]KDE4WorkspaceLibraryTargets.cmake:FILE[[:space:]]KDE4WorkspaceLibraryTargets-${PN}.cmake:g" + CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section" fi ;; kdebase-runtime) @@ -603,9 +608,9 @@ kde4-meta_change_cmakelists() { kdewebdev) # Disable hardcoded kdepimlibs check sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \ - -e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2 REQUIRED)/' \ - -e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt REQUIRED)/' \ - -e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost REQUIRED)/' \ + -e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2)/' \ + -e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt)/' \ + -e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost)/' \ -i CMakeLists.txt || die "failed to disable hardcoded checks" ;; koffice) |