* [gentoo-commits] proj/kde:master commit in: Documentation/package.keywords/.kde-live/, kde-base/kdelibs/files/, sets/, ...
@ 2011-09-25 21:44 Jonathan Callen
0 siblings, 0 replies; only message in thread
From: Jonathan Callen @ 2011-09-25 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 822a53a685e44b3422c13c193632137390997afd
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 20:45:10 2011 +0000
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 21:43:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=822a53a6
Add new kde-base/kactivities (split from kdelibs for 4.7, own repo for 4.8+)
---
.../package.keywords/.kde-4.7.9999/kdelibs-4.7 | 1 +
.../package.keywords/.kde-live/kdelibs-live | 1 +
.../package.keywords/kde-4.7.9999.keywords | 1 +
Documentation/package.keywords/kde-4.7.keywords | 1 +
Documentation/package.keywords/kde-live.keywords | 1 +
Documentation/package.unmask/kde-4.7 | 1 +
Documentation/package.unmask/kde-live | 1 +
kde-base/kactivities/kactivities-4.7.1.ebuild | 50 ++++++++
.../kactivities/kactivities-4.7.49.9999.ebuild | 50 ++++++++
kde-base/kactivities/kactivities-9999.ebuild | 18 +++
.../kdelibs/files/kdelibs-4.7.1-clearbutton.patch | 82 ++++++++++++
...-4.7.49.9999.ebuild => kdelibs-4.7.1-r2.ebuild} | 7 +-
kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild | 4 +
...a-workspace-4.6.2-optional_akonadi-server.patch | 131 --------------------
.../files/plasma-workspace-4.6.3-gpsdapi.patch | 74 -----------
...999.ebuild => plasma-workspace-4.7.1-r1.ebuild} | 3 +-
.../plasma-workspace-4.7.49.9999.ebuild | 1 +
.../plasma-workspace/plasma-workspace-9999.ebuild | 1 +
sets/kdelibs | 1 +
sets/kdelibs-4.7 | 1 +
sets/kdelibs-live | 1 +
21 files changed, 224 insertions(+), 207 deletions(-)
diff --git a/Documentation/package.keywords/.kde-4.7.9999/kdelibs-4.7 b/Documentation/package.keywords/.kde-4.7.9999/kdelibs-4.7
index b35ac74..1cf1fab 100644
--- a/Documentation/package.keywords/.kde-4.7.9999/kdelibs-4.7
+++ b/Documentation/package.keywords/.kde-4.7.9999/kdelibs-4.7
@@ -1,3 +1,4 @@
+~kde-base/kactivities-4.7.49.9999 **
~kde-base/kde-env-4.7.49.9999 **
~kde-base/kdelibs-4.7.49.9999 **
~kde-base/kdepimlibs-4.7.49.9999 **
diff --git a/Documentation/package.keywords/.kde-live/kdelibs-live b/Documentation/package.keywords/.kde-live/kdelibs-live
index 303dc04..e9ce955 100644
--- a/Documentation/package.keywords/.kde-live/kdelibs-live
+++ b/Documentation/package.keywords/.kde-live/kdelibs-live
@@ -1,3 +1,4 @@
+~kde-base/kactivities-9999 **
~kde-base/kde-env-9999 **
~kde-base/kdelibs-4.7.49.9999 **
~kde-base/kdepimlibs-9999 **
diff --git a/Documentation/package.keywords/kde-4.7.9999.keywords b/Documentation/package.keywords/kde-4.7.9999.keywords
index 623bd62..a3d6785 100644
--- a/Documentation/package.keywords/kde-4.7.9999.keywords
+++ b/Documentation/package.keywords/kde-4.7.9999.keywords
@@ -203,6 +203,7 @@
~kde-base/okular-4.7.49.9999 **
~kde-base/svgpart-4.7.49.9999 **
~kde-base/thumbnailers-4.7.49.9999 **
+~kde-base/kactivities-4.7.49.9999 **
~kde-base/kde-env-4.7.49.9999 **
~kde-base/kdelibs-4.7.49.9999 **
~kde-base/kdepimlibs-4.7.49.9999 **
diff --git a/Documentation/package.keywords/kde-4.7.keywords b/Documentation/package.keywords/kde-4.7.keywords
index 1e51fd7..dcdd0ac 100644
--- a/Documentation/package.keywords/kde-4.7.keywords
+++ b/Documentation/package.keywords/kde-4.7.keywords
@@ -203,6 +203,7 @@
>=kde-base/okular-4.6.50
>=kde-base/svgpart-4.6.50
>=kde-base/thumbnailers-4.6.50
+>=kde-base/kactivities-4.6.50
>=kde-base/kde-env-4.6.50
>=kde-base/kdelibs-4.6.50
>=kde-base/kdepimlibs-4.6.50
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index dbcc38a..99cea55 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -220,6 +220,7 @@
~kde-base/okular-9999 **
~kde-base/svgpart-9999 **
~kde-base/thumbnailers-9999 **
+~kde-base/kactivities-9999 **
~kde-base/kde-env-9999 **
~kde-base/kdelibs-4.7.49.9999 **
~kde-base/kdepimlibs-9999 **
diff --git a/Documentation/package.unmask/kde-4.7 b/Documentation/package.unmask/kde-4.7
index 7541c30..bdd59c4 100644
--- a/Documentation/package.unmask/kde-4.7
+++ b/Documentation/package.unmask/kde-4.7
@@ -203,6 +203,7 @@
>=kde-base/okular-4.6.50
>=kde-base/svgpart-4.6.50
>=kde-base/thumbnailers-4.6.50
+>=kde-base/kactivities-4.6.50
>=kde-base/kde-env-4.6.50
>=kde-base/kdelibs-4.6.50
>=kde-base/kdepimlibs-4.6.50
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index a9fe216..e989d22 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -220,6 +220,7 @@
~kde-base/okular-9999
~kde-base/svgpart-9999
~kde-base/thumbnailers-9999
+~kde-base/kactivities-9999
~kde-base/kde-env-9999
~kde-base/kdelibs-4.7.49.9999
~kde-base/kdepimlibs-9999
diff --git a/kde-base/kactivities/kactivities-4.7.1.ebuild b/kde-base/kactivities/kactivities-4.7.1.ebuild
new file mode 100644
index 0000000..667f248
--- /dev/null
+++ b/kde-base/kactivities/kactivities-4.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+KMNAME="kdelibs"
+
+inherit kde4-base
+
+DESCRIPTION="KDE Activity Manager"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT="test"
+
+# Split out from kdelibs in 4.7.1-r2
+add_blocker kdelibs 4.7.1-r1
+
+src_unpack() {
+ kde4-base_src_unpack
+ # Move the unpacked sources to where they are expected to be
+ [[ $(echo *-${PV}) != ${P} ]] && { mv *-${PV} ${P} || die; }
+}
+
+src_prepare() {
+ kde4-base_src_prepare
+
+ sed -i -e '/libkdeclarative/s:^:#DONOTWANT:' experimental/CMakeLists.txt || die
+}
+
+src_configure() {
+ local S="${WORKDIR}/${P}/experimental"
+
+ kde4-base_src_configure
+}
+
+src_compile() {
+ local S="${WORKDIR}/${P}/experimental"
+
+ kde4-base_src_compile
+}
+
+src_install() {
+ local S="${WORKDIR}/${P}/experimental"
+
+ kde4-base_src_install
+}
diff --git a/kde-base/kactivities/kactivities-4.7.49.9999.ebuild b/kde-base/kactivities/kactivities-4.7.49.9999.ebuild
new file mode 100644
index 0000000..3b3cb14
--- /dev/null
+++ b/kde-base/kactivities/kactivities-4.7.49.9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+KMNAME="kdelibs"
+
+inherit kde4-base
+
+DESCRIPTION="KDE Activity Manager"
+
+KEYWORDS=""
+IUSE=""
+
+RESTRICT="test"
+
+# Split out from kdelibs in 4.7.1-r2
+add_blocker kdelibs 4.7.1-r1
+
+src_unpack() {
+ kde4-base_src_unpack
+ # Move the unpacked sources to where they are expected to be
+ [[ $(echo *-${PV}) != ${P} ]] && { mv *-${PV} ${P} || die; }
+}
+
+src_prepare() {
+ kde4-base_src_prepare
+
+ sed -i -e '/libkdeclarative/s:^:#DONOTWANT:' experimental/CMakeLists.txt || die
+}
+
+src_configure() {
+ local S="${WORKDIR}/${P}/experimental"
+
+ kde4-base_src_configure
+}
+
+src_compile() {
+ local S="${WORKDIR}/${P}/experimental"
+
+ kde4-base_src_compile
+}
+
+src_install() {
+ local S="${WORKDIR}/${P}/experimental"
+
+ kde4-base_src_install
+}
diff --git a/kde-base/kactivities/kactivities-9999.ebuild b/kde-base/kactivities/kactivities-9999.ebuild
new file mode 100644
index 0000000..82cab21
--- /dev/null
+++ b/kde-base/kactivities/kactivities-9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Activity Manager"
+
+KEYWORDS=""
+IUSE=""
+
+RESTRICT="test"
+
+# Split out from kdelibs in 4.7.1-r2
+add_blocker kdelibs 4.7.1-r1
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch
new file mode 100644
index 0000000..c177b28
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch
@@ -0,0 +1,82 @@
+commit 07d20a558da67fb9f849e2b20c52cf275ea01794
+Author: Andrea Iacovitti <aiacovitti@libero.it>
+Date: Sat Sep 17 10:12:04 2011 +0200
+
+ -Do not set WA_OpaquePaintEvent attribute for line edit clearButton
+ (should fix the not transparent background bug)
+ -Optimize a bit the code to enable/disable it
+
+ BUG: 230024
+ CCBUG: 280226
+ FIXED-IN: 4.7.2
+
+diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
+index 715e182..c919b99 100644
+--- a/kdeui/widgets/klineedit.cpp
++++ b/kdeui/widgets/klineedit.cpp
+@@ -291,6 +291,7 @@ void KLineEdit::setClearButtonShown(bool show)
+ }
+
+ d->clearButton = new KLineEditButton(this);
++ d->clearButton->setObjectName("KLineEditButton");
+ d->clearButton->setCursor( Qt::ArrowCursor );
+ d->clearButton->setToolTip( i18nc( "@action:button Clear current text in the line edit", "Clear text" ) );
+
+diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
+index 1db9b1a..28dbac3 100644
+--- a/khtml/khtmlview.cpp
++++ b/khtml/khtmlview.cpp
+@@ -1363,7 +1363,7 @@ void KHTMLView::mouseMoveEvent( QMouseEvent * _mouse )
+ if (kw && kw->m_kwp->isRedirected())
+ setCursor = false;
+ else if (QLineEdit* le = qobject_cast<QLineEdit*>(rw->widget())) {
+- QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KHTMLLineEditButton" );
++ QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KLineEditButton" );
+ // force arrow cursor above lineedit clear button
+ foreach (QWidget*w, wl) {
+ if (w->underMouse()) {
+@@ -1942,7 +1942,10 @@ static void handleWidget(QWidget* w, KHTMLView* view, bool recurse=true)
+ w->setAttribute( Qt::WA_NoSystemBackground );
+
+ w->setAttribute(Qt::WA_WState_InPaintEvent);
+- w->setAttribute(Qt::WA_OpaquePaintEvent);
++
++ if (!(w->objectName() == "KLineEditButton"))
++ w->setAttribute(Qt::WA_OpaquePaintEvent);
++
+ w->installEventFilter(view);
+
+ if (!recurse)
+diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
+index 845db1a..3302920 100644
+--- a/khtml/rendering/render_form.cpp
++++ b/khtml/rendering/render_form.cpp
+@@ -1044,20 +1044,21 @@ void RenderLineEdit::setStyle(RenderStyle* _style)
+ RenderFormElement::setStyle( _style );
+
+ widget()->setAlignment(textAlignment());
++
+ bool showClearButton = (!shouldDisableNativeBorders() && !_style->hasBackgroundImage());
+- widget()->setClearButtonShown( showClearButton );
+- if (showClearButton) {
++
++ if (!showClearButton && widget()->isClearButtonShown()) {
++ widget()->setClearButtonShown(false);
++ }
++ else if (showClearButton && !widget()->isClearButtonShown()) {
++ widget()->setClearButtonShown(true);
+ QObjectList children = widget()->children();
+ foreach (QObject* object, children) {
+ QWidget *w = qobject_cast<QWidget*>(object);
+- if (w && !w->isWindow()) {
++ if (w && !w->isWindow() && (w->objectName() == "KLineEditButton")) {
+ // this duplicates KHTMLView's handleWidget but this widget
+ // is created on demand, so it might not be here at ChildPolished time
+- w->setObjectName("KHTMLLineEditButton");
+ w->installEventFilter(view());
+- w->setAttribute(Qt::WA_NoSystemBackground);
+- w->setAttribute(Qt::WA_WState_InPaintEvent);
+- w->setAttribute(Qt::WA_OpaquePaintEvent);
+ }
+ }
+ }
diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
similarity index 96%
copy from kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
copy to kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
index ff4385b..71cf447 100644
--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base fdo-mime toolchain-funcs
DESCRIPTION="KDE libraries needed by all KDE programs."
HOMEPAGE="http://www.kde.org/"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
@@ -115,6 +115,9 @@ PDEPEND="
semantic-desktop? ( $(add_kdebase_dep nepomuk) )
"
+# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
+add_blocker plasma-workspace 4.7.1
+
PATCHES=(
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
@@ -122,6 +125,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.90-xslt.patch"
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
+ "${FILESDIR}/${PN}-4.7.1-clearbutton.patch"
"${FILESDIR}/${PN}-4.7.1-libpng15.patch"
)
@@ -197,6 +201,7 @@ src_configure() {
-DWITH_ASPELL=OFF
-DKDE_DEFAULT_HOME=.kde4
-DKAUTH_BACKEND=POLKITQT-1
+ -DBUILD_libkactivities=OFF
$(cmake-utils_use_build handbook doc)
$(cmake-utils_use_has 3dnow X86_3DNOW)
$(cmake-utils_use_has altivec PPC_ALTIVEC)
diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
index ff4385b..956c453 100644
--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
@@ -115,6 +115,9 @@ PDEPEND="
semantic-desktop? ( $(add_kdebase_dep nepomuk) )
"
+# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
+add_blocker plasma-workspace 4.7.1
+
PATCHES=(
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
@@ -197,6 +200,7 @@ src_configure() {
-DWITH_ASPELL=OFF
-DKDE_DEFAULT_HOME=.kde4
-DKAUTH_BACKEND=POLKITQT-1
+ -DBUILD_libkactivities=OFF
$(cmake-utils_use_build handbook doc)
$(cmake-utils_use_has 3dnow X86_3DNOW)
$(cmake-utils_use_has altivec PPC_ALTIVEC)
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch
deleted file mode 100644
index aaa8381..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt
---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-25 23:10:02.000000000 +0100
-+++ plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt 2011-04-02 13:59:01.919795444 +0200
-@@ -25,10 +25,15 @@
- endif (NEPOMUK_FOUND)
-
- macro_optional_find_package(KdepimLibs 4.5.60)
--macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
-+macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
-+
-+macro_optional_find_package(Akonadi)
-+macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
-
- if(KDEPIMLIBS_FOUND)
-- add_subdirectory(akonadi)
-+ if(AKONADI_FOUND)
-+ add_subdirectory(akonadi)
-+ endif(AKONADI_FOUND)
- add_subdirectory(calendar)
- add_subdirectory(rss)
- endif(KDEPIMLIBS_FOUND)
-diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt
---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt 2011-04-01 12:52:43.000000000 +0200
-+++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt 2011-04-02 14:02:09.274795409 +0200
-@@ -1,7 +1,6 @@
- project(calendar_engine)
-
- find_package(KdepimLibs REQUIRED)
--find_package(Akonadi REQUIRED)
- find_package(Boost REQUIRED)
-
- include_directories(
-@@ -14,16 +13,22 @@
-
- set(calendar_engine_srcs
- calendarengine.cpp
-- eventdatacontainer.cpp
--# taken from kdepim/akonadi/kcal as long as it's not yet exported:
-- akonadi/calendar.cpp
-- akonadi/calendarmodel.cpp
-- akonadi/calfilterproxymodel.cpp
-- akonadi/utils.cpp
-- akonadi/blockalarmsattribute.cpp
-- akonadi/collectionselection.cpp
- )
-
-+if(AKONADI_FOUND)
-+ ADD_DEFINITIONS(-DAKONADI_FOUND)
-+ set(calendar_engine_srcs ${calendar_engine_srcs}
-+ eventdatacontainer.cpp
-+ # taken from kdepim/akonadi/kcal as long as it's not yet exported:
-+ akonadi/calendar.cpp
-+ akonadi/calendarmodel.cpp
-+ akonadi/calfilterproxymodel.cpp
-+ akonadi/utils.cpp
-+ akonadi/blockalarmsattribute.cpp
-+ akonadi/collectionselection.cpp
-+ )
-+endif(AKONADI_FOUND)
-+
- kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
-
- target_link_libraries(
-@@ -31,13 +36,19 @@
- ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- ${KDE4_PLASMA_LIBS}
-- ${KDE4_AKONADI_LIBS}
- ${KDE4_KMIME_LIBS}
- ${KDE4_KCALCORE_LIBS}
- ${KDE4_KCALUTILS_LIBS}
-- ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
- )
-
-+if(AKONADI_FOUND)
-+ target_link_libraries(
-+ plasma_engine_calendar
-+ ${KDE4_AKONADI_LIBS}
-+ ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-+ )
-+endif(AKONADI_FOUND)
-+
- install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-
-diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp
---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp 2011-02-25 23:10:02.000000000 +0100
-+++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp 2011-04-02 13:59:01.920795444 +0200
-@@ -32,6 +32,7 @@
- #include <KCalCore/Todo>
- #include <KCalCore/Journal>
-
-+#ifdef AKONADI_FOUND
- #include <Akonadi/ChangeRecorder>
- #include <Akonadi/Session>
- #include <Akonadi/Collection>
-@@ -41,6 +42,7 @@
- #include "akonadi/calendar.h"
- #include "akonadi/calendarmodel.h"
- #include "eventdatacontainer.h"
-+#endif
-
- CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
- : Plasma::DataEngine(parent),
-@@ -74,9 +76,11 @@
- return holidayCalendarSourceRequest(requestKey, requestTokens, request);
- }
-
-+#ifdef AKONADI_FOUND
- if (requestKey == "events" || requestKey == "eventsInMonth") {
- return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
- }
-+#endif
-
- return false;
- }
-@@ -272,6 +276,7 @@
- return false;
- }
-
-+#ifdef AKONADI_FOUND
- bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
- {
- // figure out what time range was requested from the source string
-@@ -339,5 +344,6 @@
- calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
- m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
- }
-+#endif
-
- #include "calendarengine.moc"
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
deleted file mode 100644
index f24aded..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Rafael Fernández López <ereslibre@kde.org>
-Date: Thu, 28 Apr 2011 11:35:53 +0000
-Subject: gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a3009dd96e8519bcc205d75c29e18bbbb81fce03
----
-gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
-some calls that are slightly different. Make the dataengine compile
-against this version and previous one by adding conditional code.
-
-REVIEW: 101247
----
-
-
---- a/plasma/generic/dataengines/geolocation/location_gps.cpp
-+++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
-@@ -51,7 +51,11 @@ void Gpsd::run()
- while (!m_abort) {
- Plasma::DataEngine::Data d;
-
-+#if GPSD_API_MAJOR_VERSION >= 5
-+ if (gps_read(m_gpsdata) != -1) {
-+#else
- if (gps_poll(m_gpsdata) != -1) {
-+#endif
- //kDebug() << "poll ok";
- if (m_gpsdata->online) {
- //kDebug() << "online";
-@@ -73,11 +77,19 @@ void Gpsd::run()
- Gps::Gps(QObject* parent, const QVariantList& args)
- : GeolocationProvider(parent, args),
- m_gpsd(0)
-+#if GPSD_API_MAJOR_VERSION >= 5
-+ , m_gpsdata(0)
-+#endif
- {
-- gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
-- if (gpsdata) {
-+#if GPSD_API_MAJOR_VERSION >= 5
-+ m_gpsdata = new gps_data_t;
-+ gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
-+#else
-+ gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
-+#endif
-+ if (m_gpsdata) {
- kDebug() << "gpsd found.";
-- m_gpsd = new Gpsd(gpsdata);
-+ m_gpsd = new Gpsd(m_gpsdata);
- connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
- this, SIGNAL(setData(const Plasma::DataEngine::Data&)));
- } else {
-@@ -90,6 +102,9 @@ Gps::Gps(QObject* parent, const QVariant
- Gps::~Gps()
- {
- delete m_gpsd;
-+#if GPSD_API_MAJOR_VERSION >= 5
-+ delete m_gpsdata;
-+#endif
- }
-
- void Gps::update()
-
---- a/plasma/generic/dataengines/geolocation/location_gps.h
-+++ b/plasma/generic/dataengines/geolocation/location_gps.h
-@@ -58,6 +58,9 @@ public:
-
- private:
- Gpsd* m_gpsd;
-+#if GPSD_API_MAJOR_VERSION >= 5
-+ gps_data_t* m_gpsdata;
-+#endif
- };
-
- #endif
-
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild
similarity index 97%
copy from kde-base/plasma-workspace/plasma-workspace-4.7.49.9999.ebuild
copy to kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild
index 256a54d..800c0d7 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild
@@ -11,10 +11,11 @@ PYTHON_DEPEND="python? 2"
inherit python kde4-meta
DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
COMMONDEPEND="
+ $(add_kdebase_dep kactivities)
$(add_kdebase_dep kdelibs 'semantic-desktop=')
$(add_kdebase_dep kephal)
$(add_kdebase_dep ksysguard)
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.49.9999.ebuild
index 256a54d..68ae697 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.49.9999.ebuild
@@ -15,6 +15,7 @@ KEYWORDS=""
IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
COMMONDEPEND="
+ $(add_kdebase_dep kactivities)
$(add_kdebase_dep kdelibs 'semantic-desktop=')
$(add_kdebase_dep kephal)
$(add_kdebase_dep ksysguard)
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 256a54d..68ae697 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -15,6 +15,7 @@ KEYWORDS=""
IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
COMMONDEPEND="
+ $(add_kdebase_dep kactivities)
$(add_kdebase_dep kdelibs 'semantic-desktop=')
$(add_kdebase_dep kephal)
$(add_kdebase_dep ksysguard)
diff --git a/sets/kdelibs b/sets/kdelibs
index 5f5b83a..4899cf8 100644
--- a/sets/kdelibs
+++ b/sets/kdelibs
@@ -1,4 +1,5 @@
# Autogenerated by regenerate-files, DO NOT EDIT.
+kde-base/kactivities:4
kde-base/kde-env:4
kde-base/kdelibs:4
kde-base/kdepimlibs:4
diff --git a/sets/kdelibs-4.7 b/sets/kdelibs-4.7
index bfaf647..34d392e 100644
--- a/sets/kdelibs-4.7
+++ b/sets/kdelibs-4.7
@@ -1,3 +1,4 @@
+>=kde-base/kactivities-4.6.50
>=kde-base/kde-env-4.6.50
>=kde-base/kdelibs-4.6.50
>=kde-base/kdepimlibs-4.6.50
diff --git a/sets/kdelibs-live b/sets/kdelibs-live
index 53ea497..ea91f65 100644
--- a/sets/kdelibs-live
+++ b/sets/kdelibs-live
@@ -1,3 +1,4 @@
+~kde-base/kactivities-9999
~kde-base/kde-env-9999
~kde-base/kdelibs-4.7.49.9999
~kde-base/kdepimlibs-9999
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-09-25 21:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-25 21:44 [gentoo-commits] proj/kde:master commit in: Documentation/package.keywords/.kde-live/, kde-base/kdelibs/files/, sets/, Jonathan Callen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox