diff options
author | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-04-13 13:02:30 +0000 |
---|---|---|
committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-04-13 13:02:30 +0000 |
commit | 0784e87e044e61eb5c6037513d1a635d5030be11 (patch) | |
tree | d6a46b70064517dbae2200863cb0e0209139931b /kde-base | |
parent | bump a little the ffmpeg revision required to get in the bugfixes/additions (diff) | |
download | gentoo-2-0784e87e044e61eb5c6037513d1a635d5030be11.tar.gz gentoo-2-0784e87e044e61eb5c6037513d1a635d5030be11.tar.bz2 gentoo-2-0784e87e044e61eb5c6037513d1a635d5030be11.zip |
Make akonadi and kdepimlibs optional
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
3 files changed, 81 insertions, 2 deletions
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog index b0e3fb96e264..e691e41c626e 100644 --- a/kde-base/kdeplasma-addons/ChangeLog +++ b/kde-base/kdeplasma-addons/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdeplasma-addons # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.81 2011/04/12 02:07:56 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.82 2011/04/13 13:02:30 tampakrap Exp $ + + 13 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org> + kdeplasma-addons-4.6.2.ebuild, + +files/kdeplasma-addons-4.6.2-optional-akonadi.patch: + Make akonadi and kdepimlibs optional 12 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org> -files/4.5.0-fix_lancelot.patch, -files/kdeplasma-addons-4.4.74-cmake.patch, diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch new file mode 100644 index 000000000000..857e965cfb4f --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch @@ -0,0 +1,72 @@ +diff --git a/libs/lancelot-datamodels/MessagesKmail.cpp b/libs/lancelot-datamodels/MessagesKmail.cpp +index 8fa89e0..f56203d 100644 +--- a/libs/lancelot-datamodels/MessagesKmail.cpp ++++ b/libs/lancelot-datamodels/MessagesKmail.cpp +@@ -35,10 +35,10 @@ + #ifndef LANCELOT_DATAMODELS_HAS_PIMLIBS + + // just in case messages: +-I18N_NOOP("Unread messages"); ++/*I18N_NOOP("Unread messages"); + I18N_NOOP("Unable to find Kontact"); + I18N_NOOP("Start Akonadi server"); +-I18N_NOOP("Akonadi server is not running"); ++I18N_NOOP("Akonadi server is not running");*/ + + #warning "Pimlibs are not present" + +diff --git a/libs/lancelot-datamodels/MessagesKmail.h b/libs/lancelot-datamodels/MessagesKmail.h +index 8db2a1c..3dfbd6f 100644 +--- a/libs/lancelot-datamodels/MessagesKmail.h ++++ b/libs/lancelot-datamodels/MessagesKmail.h +@@ -32,6 +32,7 @@ namespace Models { + */ + class LANCELOT_EXPORT MessagesKmail : public BaseModel { + Q_OBJECT ++ + public: + /** + * Creates a new MessagesKmail instance +@@ -52,11 +53,13 @@ protected: + + void load(); + ++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS + L_Override QString selfShortTitle() const; + + protected Q_SLOTS: + void updateLater(); + void update(); ++#endif + + private: + class Private; +diff --git a/runners/contacts/contactsrunner.cpp b/runners/contacts/contactsrunner.cpp +index 2b5f3ec..aa64761 100644 +--- a/runners/contacts/contactsrunner.cpp ++++ b/runners/contacts/contactsrunner.cpp +@@ -23,7 +23,10 @@ + #include <KLocale> + #include <KIcon> + #include <KToolInvocation> ++ ++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS + #include <akonadi/contact/contactdefaultactions.h> ++#endif + /*#include <KMimeType> + + */ +diff --git a/runners/events/events_config.h b/runners/events/events_config.h +index f73b22b..8bb0148 100644 +--- a/runners/events/events_config.h ++++ b/runners/events/events_config.h +@@ -26,7 +26,9 @@ + + //KDE-Includes + #include <KCModule> ++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS + #include <Akonadi/Collection> ++#endif + + //Qt + diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild index 7e64543bceb1..ae8d805586f1 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.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/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.2 2011/04/12 02:07:56 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.3 2011/04/13 13:02:30 tampakrap Exp $ EAPI=3 @@ -49,6 +49,8 @@ RDEPEND="${COMMON_DEPEND} # kdebase-data: some svg icons moved from data directly here. add_blocker kdebase-data '<4.2.88' +PATCHES=( "${FILESDIR}/${P}-optional-akonadi.patch" ) + src_prepare() { find "${S}" -name CMakeLists.txt | \ xargs sed -i \ |