Hello community, here is the log from the commit of package akonadi-googledata for openSUSE:Factory checked in at Mon Sep 19 21:22:15 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/akonadi-googledata/akonadi-googledata.changes 2011-03-20 23:28:56.000000000 +0100 @@ -0,0 +1,27 @@ +------------------------------------------------------------------- +Sun Mar 20 22:22:26 UTC 2011 - [email protected] + +- Add fix_events.diff + * Fixes kde#261958 (google calendar not synced using akonadi google resource) + * Fixes kde#252568 (Whole day event added in Google calendar takes two days in KOrganizer) + + +------------------------------------------------------------------- +Wed Sep 8 06:27:36 UTC 2010 - [email protected] + +- Update to 1.2.0 + * Support instant messaging addresses + * Allow separate Google accounts for calendar and contacts + * Allow multiple accounts by using separate KWallet entries + * Make authentication dialog clearer + +------------------------------------------------------------------- +Fri Jun 11 18:16:46 UTC 2010 - bitshuffler #[email protected] + +- Update to 1.1.0 + +------------------------------------------------------------------- +Fri Feb 19 19:58:43 UTC 2010 - bitshuffler #[email protected] + +- Initial package + calling whatdependson for head-i586 New: ---- akonadi-googledata-1.2.0.tar.bz2 akonadi-googledata.changes akonadi-googledata.spec fix_events.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-googledata.spec ++++++ # norootforbuild Name: akonadi-googledata Version: 1.2.0 Release: 1.0 License: GNU LGPL v2.1 or later Url: http://code.google.com/p/libgcal/ Group: System/GUI/KDE Source: http://libgcal.googlecode.com/files/akonadi-googledata-%{version}.tar.bz2 Patch0: fix_events.diff BuildRequires: boost-devel BuildRequires: libakonadiprotocolinternals-devel BuildRequires: libgcal-devel BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libxslt BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Google Contacts and Calendar Akonadi Resource %kde4_akonadi_requires %kde4_pimlibs_requires %kde4_runtime_requires %description An akonadi datasource for Google calendars and contacts. %lang_package %prep %setup -q %patch0 %build %cmake_kde4 -d build %make_jobs %install pushd build %kde4_makeinstall popd rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin %kde_post_install %find_lang akonadi_gcal_resource %{name}.lang %clean rm -rf %{buildroot} %files lang -f %{name}.lang %files %defattr(-,root,root) %doc ChangeLog COPYING README %{_bindir}/akonadi_gcal_resource %{_bindir}/akonadi_googledata_resource %dir %{_datadir}/akonadi %dir %{_datadir}/akonadi/agents %{_datadir}/akonadi/agents/gcalresource.desktop %{_datadir}/akonadi/agents/googledataresource.desktop ++++++ fix_events.diff ++++++ --- contacts/googledataresource.cpp.orig +++ contacts/googledataresource.cpp @@ -204,9 +204,9 @@ if (!authenticated) configure(0); if (!authenticated) { - ResourceBase::cancelTask(QString("Failed retrieving contacts!")); + ResourceBase::cancelTask(i18n("Failed retrieving contacts!")); ResourceBase::doSetOnline(false); - emit error(QString("retrieveItems: not authenticated!")); + emit error(i18n("retrieveItems: not authenticated!")); return; } @@ -222,7 +222,7 @@ /* Downloading the contacts can be slow and it is blocking. */ if ((result = gcal_get_contacts(gcal, &all_contacts))) { - ResourceBase::cancelTask(QString("Failed contacts retrieving!")); + ResourceBase::cancelTask(i18n("Failed contacts retrieving!")); ResourceBase::doSetOnline(false); return; } @@ -1140,7 +1140,7 @@ "Failed adding new contact."); emit error(message); emit status(Broken, message); - ResourceBase::cancelTask(QString("Failed adding contact!")); + ResourceBase::cancelTask(i18n("Failed adding contact!")); ResourceBase::doSetOnline(false); return; } --- calendar/gcalresource.cpp.orig +++ calendar/gcalresource.cpp @@ -60,6 +60,7 @@ QLatin1String( "/Settings" ), Settings::self(), QDBusConnection::ExportAdaptors ); + changeRecorder()->fetchCollection( true ); changeRecorder()->itemFetchScope().fetchFullPayload(); if (!(gcal = gcal_new(GCALENDAR))) @@ -202,12 +203,16 @@ temp = gcal_event_get_end(event); end = end.fromString(temp, KDateTime::ISODate); kevent->setDtStart(start); + + if (end.isDateOnly()) { + // KCal::Event::dtEnd() is inclusive, not exclusive. + // ( When serializing back to ICal, +1 is added internaly, to respect ical rfc ) + end = end.addDays(-1); + } kevent->setDtEnd(end); - + qDebug() << "start: " << start.dateTime() << "\tend: " << end.dateTime(); - - /* remoteID: edit_url */ KUrl urlEtag(gcal_event_get_url(event)); item.setRemoteId(urlEtag.url()); @@ -378,8 +383,15 @@ temp = gcal_event_get_end(event); end = end.fromString(temp, KDateTime::ISODate); kevent->setDtStart(start); - kevent->setDtEnd(end); + + if (end.isDateOnly()) { + // KCal::Event::dtEnd() is inclusive, not exclusive. + // ( When serializing back to ICal, +1 is added internaly, to respect ical rfc ) + end = end.addDays(-1); + } + kevent->setDtEnd(end); + url = gcal_event_get_url(event); item.setRemoteId(url.url()); item.setPayload(IncidencePtr(kevent)); @@ -526,6 +538,12 @@ gcal_event_set_start(event, t_byte.data()); time = kevent->dtEnd(); + + if (time.isDateOnly()) { + // KCal::Event::dtEnd() is inclusive, not exclusive. + time = time.addDays(1); + } + temp = time.toString(KDateTime::ISODate); t_byte = temp.toUtf8(); gcal_event_set_end(event, t_byte.data()); @@ -626,6 +644,12 @@ gcal_event_set_start(event, t_byte.data()); time = kevent->dtEnd(); + + if (time.isDateOnly()) { + // KCal::Event::dtEnd() is inclusive, not exclusive. + time = time.addDays(1); + } + temp = time.toString(KDateTime::ISODate); t_byte = temp.toUtf8(); gcal_event_set_end(event, t_byte.data()); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
