diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-04-10 06:31:10 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-10 06:39:08 +1000 |
| commit | a757eede9b601ac69dc85ec4526f052988f1c6c9 (patch) | |
| tree | 1e470536970db675de99eabf7279fe4e7457cbbf /eclass | |
| parent | [kde-base/systemsettings] Add missing dependencies. (diff) | |
| download | kde-a757eede9b601ac69dc85ec4526f052988f1c6c9.tar.gz kde-a757eede9b601ac69dc85ec4526f052988f1c6c9.tar.bz2 kde-a757eede9b601ac69dc85ec4526f052988f1c6c9.zip | |
[eclass] Restore old dep-reduction logic and introduce new to support >=KDE/4.11.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 19eb31338d..063abbf1dd 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -528,10 +528,14 @@ kde4-meta_change_cmakelists() { sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ -i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace strip config install and fix EXPORT section" fi + # <KDE/4.11 if [[ ${PN} != plasma-workspace ]]; then - sed -e '/find_package(KActivities/s/^/#DONOTDEPEND /' \ + sed -e '/KActivities/s/REQUIRED//' \ -i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section" fi + # >=KDE/4.11 + sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -i CMakeLists.txt \ + || die "${LINENO}: sed died in kde-workspace dep reduction section" if [[ "${PN}" != "kwin" ]]; then sed -i -e "/^ macro_log_feature(OPENGL_OR_ES_FOUND/s/TRUE/FALSE/" \ "${S}"/CMakeLists.txt || die "${LINENO}: sed died removing kde-workspace opengl dependency" |