| 1 |
commit: 6be7de3783bd15860176db13889ec47e95f46931 |
| 2 |
Author: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 4 13:35:57 2011 +0000 |
| 4 |
Commit: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 4 13:35:57 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6be7de3783bd15860176db13889ec47e95f46931 |
| 7 |
|
| 8 |
[kde-base/plasma-workspace] UNTESTED: Make semantic-desktop optional again for plasma-workspace, patch by Fabiano <fabianoengler at gmail dot com>, bug 350850 |
| 9 |
|
| 10 |
--- |
| 11 |
kde-base/plasma-workspace/Manifest | 3 ++- |
| 12 |
...a-workspace-4.6.0-optional_akonadi-server.patch | 16 ++++++++++++++++ |
| 13 |
.../plasma-workspace-4.6.9999.ebuild | 1 + |
| 14 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 1 + |
| 15 |
4 files changed, 20 insertions(+), 1 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest |
| 18 |
index 624cc57..0909cb8 100644 |
| 19 |
--- a/kde-base/plasma-workspace/Manifest |
| 20 |
+++ b/kde-base/plasma-workspace/Manifest |
| 21 |
@@ -1,4 +1,5 @@ |
| 22 |
AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157 |
| 23 |
-EBUILD plasma-workspace-4.6.9999.ebuild 3060 RMD160 fc9a91e95ca57898946fd5c76d69529b0181e673 SHA1 32a148703f020c5f109a3f24ba72deb9bd7199a1 SHA256 f8e7bbb6bfdf91761f041c32182a250055c6b58bc8d41a5bb29f6c1476db248f |
| 24 |
+AUX plasma-workspace-4.6.0-optional_akonadi-server.patch 781 RMD160 feff5a1fd798c2578f192dde2c4978296ac53e6c SHA1 f5ea63a4a4ef4dc3bf62d0fa933bb0554c2086c0 SHA256 f0730ea0fd0116410102c13a28bf9120630c29dadecfaae52942596d6ff4b67c |
| 25 |
+EBUILD plasma-workspace-4.6.9999.ebuild 3117 RMD160 c5e9f1abe3ddd8fcfb6e7644fe270e16c0a33826 SHA1 3688840170d283bf2681be5b1ee62c63b5595634 SHA256 2c4d1e355cc7cd1a1b373aed9e413b46ddc724cd09fe89deca742239a943fcf3 |
| 26 |
EBUILD plasma-workspace-9999.ebuild 3060 RMD160 fc9a91e95ca57898946fd5c76d69529b0181e673 SHA1 32a148703f020c5f109a3f24ba72deb9bd7199a1 SHA256 f8e7bbb6bfdf91761f041c32182a250055c6b58bc8d41a5bb29f6c1476db248f |
| 27 |
MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c |
| 28 |
|
| 29 |
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 |
| 30 |
new file mode 100644 |
| 31 |
index 0000000..de333bc |
| 32 |
--- /dev/null |
| 33 |
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch |
| 34 |
@@ -0,0 +1,16 @@ |
| 35 |
+diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt |
| 36 |
+--- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 18:58:47.884000165 -0500 |
| 37 |
++++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 19:24:21.511000165 -0500 |
| 38 |
+@@ -28,8 +28,10 @@ |
| 39 |
+ macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines") |
| 40 |
+ |
| 41 |
+ if(KDEPIMLIBS_FOUND) |
| 42 |
+- add_subdirectory(akonadi) |
| 43 |
+- add_subdirectory(calendar) |
| 44 |
++ if(AKONADI_FOUND) |
| 45 |
++ add_subdirectory(akonadi) |
| 46 |
++ add_subdirectory(calendar) |
| 47 |
++ endif(AKONADI_FOUND) |
| 48 |
+ add_subdirectory(rss) |
| 49 |
+ endif(KDEPIMLIBS_FOUND) |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild |
| 53 |
index a32f61d..41a87df 100644 |
| 54 |
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild |
| 55 |
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild |
| 56 |
@@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" |
| 57 |
|
| 58 |
PATCHES=( |
| 59 |
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
| 60 |
+ "${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch" |
| 61 |
) |
| 62 |
|
| 63 |
pkg_setup() { |
| 64 |
|
| 65 |
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 66 |
index a32f61d..41a87df 100644 |
| 67 |
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 68 |
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 69 |
@@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" |
| 70 |
|
| 71 |
PATCHES=( |
| 72 |
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
| 73 |
+ "${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch" |
| 74 |
) |
| 75 |
|
| 76 |
pkg_setup() { |
Archives