public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: tampakrap@gentoo.org
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
Date: Fri,  4 Feb 2011 13:38:48 +0000 (UTC)	[thread overview]
Message-ID: <6be7de3783bd15860176db13889ec47e95f46931.tampakrap@gentoo> (raw)

commit:     6be7de3783bd15860176db13889ec47e95f46931
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 13:35:57 2011 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 13:35:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6be7de3783bd15860176db13889ec47e95f46931

[kde-base/plasma-workspace] UNTESTED: Make semantic-desktop optional again for plasma-workspace, patch by Fabiano <fabianoengler at gmail dot com>, bug 350850

---
 kde-base/plasma-workspace/Manifest                 |    3 ++-
 ...a-workspace-4.6.0-optional_akonadi-server.patch |   16 ++++++++++++++++
 .../plasma-workspace-4.6.9999.ebuild               |    1 +
 .../plasma-workspace/plasma-workspace-9999.ebuild  |    1 +
 4 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 624cc57..0909cb8 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 0000000..de333bc
--- /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 a32f61d..41a87df 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 a32f61d..41a87df 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() {



             reply	other threads:[~2011-02-04 13:39 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-04 13:38 tampakrap [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-04-02 12:06 [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/ Andreas K. Huettel
2011-04-06 22:31 Theo Chatzimichos
2011-05-21 20:33 Andreas K. Huettel
2011-05-28 22:09 Andreas Hüttel
2012-04-23 11:45 Michael Palimaka
2013-02-07 22:19 Andreas Hüttel
2013-02-13 10:38 Michael Palimaka
2013-03-28 21:19 Andreas Hüttel
2014-04-09 15:26 Johannes Huber
2014-04-24 22:45 Johannes Huber
2014-05-24 22:48 Johannes Huber
2014-05-25 15:49 Johannes Huber
2014-05-28 14:42 Johannes Huber
2014-05-30  6:10 Johannes Huber
2014-09-19 17:38 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6be7de3783bd15860176db13889ec47e95f46931.tampakrap@gentoo \
    --to=tampakrap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox