diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2011-02-04 13:28:34 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-02-04 13:28:34 +0000 |
| commit | 90f5c8c644cca611530bec7ddae32883eb52bb96 (patch) | |
| tree | 983e6b7e2a648d24e2963194a8f9ab68aaeb794f /kde-base | |
| parent | initial import, ebuild by me (diff) | |
| download | gentoo-2-90f5c8c644cca611530bec7ddae32883eb52bb96.tar.gz gentoo-2-90f5c8c644cca611530bec7ddae32883eb52bb96.tar.bz2 gentoo-2-90f5c8c644cca611530bec7ddae32883eb52bb96.zip | |
Make semantic-desktop optional again for plasma-workspace, patch by Fabiano <fabianoengler at gmail dot com>, bug 350850
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
3 files changed, 25 insertions, 2 deletions
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog index e22887df552a..8320dee766bb 100644 --- a/kde-base/plasma-workspace/ChangeLog +++ b/kde-base/plasma-workspace/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/plasma-workspace # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.89 2011/01/26 20:29:09 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.90 2011/02/04 13:28:34 tampakrap Exp $ + + 04 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> + plasma-workspace-4.6.0.ebuild, + +files/plasma-workspace-4.6.0-optional_akonadi-server.patch: + Make semantic-desktop optional again for plasma-workspace, patch by Fabiano + <fabianoengler at gmail dot com>, bug 350850 *plasma-workspace-4.6.0 (26 Jan 2011) diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch new file mode 100644 index 000000000000..de333bca99a2 --- /dev/null +++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch @@ -0,0 +1,16 @@ +diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt +--- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 18:58:47.884000165 -0500 ++++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 19:24:21.511000165 -0500 +@@ -28,8 +28,10 @@ + macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines") + + if(KDEPIMLIBS_FOUND) +- add_subdirectory(akonadi) +- add_subdirectory(calendar) ++ if(AKONADI_FOUND) ++ add_subdirectory(akonadi) ++ add_subdirectory(calendar) ++ endif(AKONADI_FOUND) + add_subdirectory(rss) + endif(KDEPIMLIBS_FOUND) + diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild index 53771a7a75d6..0a43bfef0456 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild,v 1.1 2011/01/26 20:29:09 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild,v 1.2 2011/02/04 13:28:34 tampakrap Exp $ EAPI="3" @@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" + "${FILESDIR}/${P}-optional_akonadi-server.patch" ) pkg_setup() { |