summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2011-02-04 15:35:57 +0200
committerTheo Chatzimichos <tampakrap@gentoo.org>2011-02-04 15:35:57 +0200
commit6be7de3783bd15860176db13889ec47e95f46931 (patch)
treed63a973271fc6abfcc37d3acef4766a7fe6badd7
parentacb9b62f2ac5972e2734614039f3a616eeeabd90 (diff)
downloadkde-6be7de3783bd15860176db13889ec47e95f46931.tar.gz
kde-6be7de3783bd15860176db13889ec47e95f46931.tar.bz2
kde-6be7de3783bd15860176db13889ec47e95f46931.zip
[kde-base/plasma-workspace] UNTESTED: Make semantic-desktop optional again for plasma-workspace, patch by Fabiano <fabianoengler at gmail dot com>, bug 350850
-rw-r--r--kde-base/plasma-workspace/Manifest3
-rw-r--r--kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch16
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild1
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-9999.ebuild1
4 files changed, 20 insertions, 1 deletions
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 624cc5703d5..0909cb876e5 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,4 +1,5 @@
AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
-EBUILD plasma-workspace-4.6.9999.ebuild 3060 RMD160 fc9a91e95ca57898946fd5c76d69529b0181e673 SHA1 32a148703f020c5f109a3f24ba72deb9bd7199a1 SHA256 f8e7bbb6bfdf91761f041c32182a250055c6b58bc8d41a5bb29f6c1476db248f
+AUX plasma-workspace-4.6.0-optional_akonadi-server.patch 781 RMD160 feff5a1fd798c2578f192dde2c4978296ac53e6c SHA1 f5ea63a4a4ef4dc3bf62d0fa933bb0554c2086c0 SHA256 f0730ea0fd0116410102c13a28bf9120630c29dadecfaae52942596d6ff4b67c
+EBUILD plasma-workspace-4.6.9999.ebuild 3117 RMD160 c5e9f1abe3ddd8fcfb6e7644fe270e16c0a33826 SHA1 3688840170d283bf2681be5b1ee62c63b5595634 SHA256 2c4d1e355cc7cd1a1b373aed9e413b46ddc724cd09fe89deca742239a943fcf3
EBUILD plasma-workspace-9999.ebuild 3060 RMD160 fc9a91e95ca57898946fd5c76d69529b0181e673 SHA1 32a148703f020c5f109a3f24ba72deb9bd7199a1 SHA256 f8e7bbb6bfdf91761f041c32182a250055c6b58bc8d41a5bb29f6c1476db248f
MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
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 00000000000..de333bca99a
--- /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.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
index a32f61df798..41a87dfb274 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
@@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
PATCHES=(
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+ "${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch"
)
pkg_setup() {
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index a32f61df798..41a87dfb274 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
PATCHES=(
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+ "${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch"
)
pkg_setup() {