| 1 |
commit: 085abde8e34fbc3d6e48d15d0d274a0276924c96 |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 24 02:36:26 2011 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 24 02:37:58 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=085abde8 |
| 7 |
|
| 8 |
[eclass/kde4-{base,meta}] Remove target prefix for KDE4 workspace as suggested by Ciprian Ciubotariu in bug 332829. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/kde4-base.eclass | 21 --------------------- |
| 12 |
eclass/kde4-meta.eclass | 3 +++ |
| 13 |
2 files changed, 3 insertions(+), 21 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
| 16 |
index 0600665..a43e84e 100644 |
| 17 |
--- a/eclass/kde4-base.eclass |
| 18 |
+++ b/eclass/kde4-base.eclass |
| 19 |
@@ -721,27 +721,6 @@ kde4-base_src_prepare() { |
| 20 |
load_library_dependencies |
| 21 |
fi |
| 22 |
|
| 23 |
- # Replace KDE4Workspace library targets |
| 24 |
- find "${S}" -name CMakeLists.txt \ |
| 25 |
- -exec sed -i -r \ |
| 26 |
- -e 's/\$\{KDE4WORKSPACE_TASKMANAGER_(LIBRARY|LIBS)\}/taskmanager/g' \ |
| 27 |
- -e 's/\$\{KDE4WORKSPACE_KWORKSPACE_(LIBRARY|LIBS)\}/kworkspace/g' \ |
| 28 |
- -e 's/\$\{KDE4WORKSPACE_SOLIDCONTROLIFACES_(LIBRARY|LIBS)\}/solidcontrolifaces/g' \ |
| 29 |
- -e 's/\$\{KDE4WORKSPACE_SOLIDCONTROL_(LIBRARY|LIBS)\}/solidcontrol/g' \ |
| 30 |
- -e 's/\$\{KDE4WORKSPACE_PROCESSUI_(LIBRARY|LIBS)\}/processui/g' \ |
| 31 |
- -e 's/\$\{KDE4WORKSPACE_LSOFUI_(LIBRARY|LIBS)\}/lsofui/g' \ |
| 32 |
- -e 's/\$\{KDE4WORKSPACE_PLASMACLOCK_(LIBRARY|LIBS)\}/plasmaclock/g' \ |
| 33 |
- -e 's/\$\{KDE4WORKSPACE_NEPOMUKQUERYCLIENT_(LIBRARY|LIBS)\}/nepomukqueryclient/g' \ |
| 34 |
- -e 's/\$\{KDE4WORKSPACE_NEPOMUKQUERY_(LIBRARY|LIBS)\}/nepomukquery/g' \ |
| 35 |
- -e 's/\$\{KDE4WORKSPACE_KSCREENSAVER_(LIBRARY|LIBS)\}/kscreensaver/g' \ |
| 36 |
- -e 's/\$\{KDE4WORKSPACE_WEATHERION_(LIBRARY|LIBS)\}/weather_ion/g' \ |
| 37 |
- -e 's/\$\{KDE4WORKSPACE_KWINEFFECTS_(LIBRARY|LIBS)\}/kwineffects/g' \ |
| 38 |
- -e 's/\$\{KDE4WORKSPACE_KDECORATIONS_(LIBRARY|LIBS)\}/kdecorations/g' \ |
| 39 |
- -e 's/\$\{KDE4WORKSPACE_KSGRD_(LIBRARY|LIBS)\}/ksgrd/g' \ |
| 40 |
- -e 's/\$\{KDE4WORKSPACE_KEPHAL_(LIBRARY|LIBS)\}/kephal/g' \ |
| 41 |
- {} + \ |
| 42 |
- || die 'failed to replace KDE4Workspace library targets' |
| 43 |
- |
| 44 |
# Hack for manuals relying on outdated DTD, only outside kde-base/koffice/... |
| 45 |
if [[ -z ${KDEBASE} ]]; then |
| 46 |
find "${S}" -name "*.docbook" \ |
| 47 |
|
| 48 |
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass |
| 49 |
index 08cbfa2..c0279bc 100644 |
| 50 |
--- a/eclass/kde4-meta.eclass |
| 51 |
+++ b/eclass/kde4-meta.eclass |
| 52 |
@@ -556,6 +556,9 @@ kde4-meta_change_cmakelists() { |
| 53 |
sed -e '/startkde/s/^/#DONOTINSTALL /' \ |
| 54 |
-i CMakeLists.txt || die "${LINENO}: sed died in the kdebase-startkde collision prevention section" |
| 55 |
fi |
| 56 |
+ # Remove workspace target prefix in order to get direct linking to workspace libs |
| 57 |
+ sed -e '/set(KDE4WORKSPACE_TARGET_PREFIX/s/^/#OVERRIDE /' \ |
| 58 |
+ -i CMakeLists.txt || die "${LINENO}: sed died in KDE4WORKSPACE_TARGET_PREFIX removal section" |
| 59 |
# Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82 |
| 60 |
if [[ ${PN} != libkworkspace ]]; then |
| 61 |
sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ |
Archives