diff options
| -rw-r--r-- | kde-misc/akonadi-googledata/Manifest | 5 | ||||
| -rw-r--r-- | kde-misc/akonadi-googledata/akonadi-googledata-1.1.0-r1.ebuild (renamed from kde-misc/akonadi-googledata/akonadi-googledata-1.1.0.ebuild) | 5 | ||||
| -rw-r--r-- | kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild | 5 | ||||
| -rw-r--r-- | kde-misc/akonadi-googledata/files/akonadi-googledata-fix-offset.patch | 65 |
4 files changed, 78 insertions, 2 deletions
diff --git a/kde-misc/akonadi-googledata/Manifest b/kde-misc/akonadi-googledata/Manifest index 1dd636cd54f..4eb263d3656 100644 --- a/kde-misc/akonadi-googledata/Manifest +++ b/kde-misc/akonadi-googledata/Manifest @@ -1,4 +1,5 @@ +AUX akonadi-googledata-fix-offset.patch 2015 RMD160 e199ac5c5a2c13ad78f4bf7b8a096e3089d65c70 SHA1 e181cde1bb4a0b84466ca70e6c6425c9ef3ae4f5 SHA256 7d57c1f53ab7cb16c77bfd9b44d481ba0b72b63f1094c86f3eaf8e71994bbd38 DIST akonadi-googledata-1.1.0.tar.bz2 122477 RMD160 e3b57c635f94b852a684f454fb00afc97e4615bb SHA1 42bb239f186e712336b47a4c2d62c1d01a2450e4 SHA256 f4d78c4dfb08254b3f4dc1c1058934a6923eb89294a28b2aac1ce7deb22c66f4 -EBUILD akonadi-googledata-1.1.0.ebuild 717 RMD160 6c7dbb12e4de943a3907310fd0e58e15779c9370 SHA1 03b3c7ebda34736a548c58d3945416b271c495a8 SHA256 78b8772a9f13dc1762c81e4f9406461f6faa74c195e5dc5f71bbf4225e3accc0 -EBUILD akonadi-googledata-9999.ebuild 504 RMD160 40ce3d1a3d308a20e1715bb5b04520583c5723a7 SHA1 664ede603937065f73b9e9af092e261b4090318a SHA256 1952acfabc83603f8cd0d961ee1e89700170f3b707e5ae425fa4e202dcd95e85 +EBUILD akonadi-googledata-1.1.0-r1.ebuild 806 RMD160 be46df8438c57e9618d425187926fdb07db9dee1 SHA1 500d682edf103781a1a732a1e3f608da628d39f1 SHA256 aeeb4be9178992e81e32c7bbd59c852fa314d76d304eff99b94f5740ed10e008 +EBUILD akonadi-googledata-9999.ebuild 593 RMD160 16672676ae00b560586f8ea800d3d921d69f191a SHA1 9e52c0b1a37f016bfe7623981bebf1b1ec7a478a SHA256 796dfcaf1707583dc80bd845f7eb52bd8341a668f4007f80e5d10981d912b4b5 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 diff --git a/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0.ebuild b/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0-r1.ebuild index 3c3c79ca715..47a696556bb 100644 --- a/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0.ebuild +++ b/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0-r1.ebuild @@ -28,3 +28,8 @@ DEPEND=" RDEPEND="${DEPEND} !kde-misc/googledata " + +src_prepare() { + kde4-base_src_prepare + epatch "${FILESDIR}"/"${PN}"-fix-offset.patch +} diff --git a/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild b/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild index 76099ceb5fc..fcf8273d998 100644 --- a/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild +++ b/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild @@ -24,3 +24,8 @@ DEPEND=" RDEPEND="${DEPEND} !kde-misc/googledata " + +src_prepare() { + kde4-base_src_prepare + epatch "${FILESDIR}"/"${PN}"-fix-offset.patch +} diff --git a/kde-misc/akonadi-googledata/files/akonadi-googledata-fix-offset.patch b/kde-misc/akonadi-googledata/files/akonadi-googledata-fix-offset.patch new file mode 100644 index 00000000000..9b68589aa12 --- /dev/null +++ b/kde-misc/akonadi-googledata/files/akonadi-googledata-fix-offset.patch @@ -0,0 +1,65 @@ +diff -ruN ../akonadi-googledata-9999.orig/calendar/gcalresource.cpp ./calendar/gcalresource.cpp +--- ../akonadi-googledata-9999.orig/calendar/gcalresource.cpp 2010-08-10 23:28:59.968928637 +0200 ++++ ./calendar/gcalresource.cpp 2010-08-10 23:30:55.608085396 +0200 +@@ -89,6 +89,16 @@ + Settings::self()->writeConfig(); + } + ++void GCalResource::fixOffset(KDateTime &date, bool toGoogle) ++{ ++ // fix for issue #57: GCal events end on 00:00:00 on the next day ++ if(date.isDateOnly()) { ++ if(toGoogle) ++ date = date.addDays(1); ++ else ++ date = date.addDays(-1); ++ } ++} + + void GCalResource::retrieveCollections() + { +@@ -191,6 +201,7 @@ + start = start.fromString(temp, KDateTime::ISODate); + temp = gcal_event_get_end(event); + end = end.fromString(temp, KDateTime::ISODate); ++ fixOffset(end); + kevent->setDtStart(start); + kevent->setDtEnd(end); + +@@ -361,6 +372,7 @@ + start = start.fromString(temp, KDateTime::ISODate); + temp = gcal_event_get_end(event); + end = end.fromString(temp, KDateTime::ISODate); ++ fixOffset(end); + kevent->setDtStart(start); + kevent->setDtEnd(end); + +@@ -507,6 +519,7 @@ + gcal_event_set_start(event, t_byte.data()); + + time = kevent->dtEnd(); ++ fixOffset(time, true); + temp = time.toString(KDateTime::ISODate); + t_byte = temp.toUtf8(); + gcal_event_set_end(event, t_byte.data()); +@@ -607,6 +620,7 @@ + gcal_event_set_start(event, t_byte.data()); + + time = kevent->dtEnd(); ++ fixOffset(time, true); + temp = time.toString(KDateTime::ISODate); + t_byte = temp.toUtf8(); + gcal_event_set_end(event, t_byte.data()); +diff -ruN ../akonadi-googledata-9999.orig/calendar/gcalresource.h ./calendar/gcalresource.h +--- ../akonadi-googledata-9999.orig/calendar/gcalresource.h 2010-08-10 23:28:59.968928637 +0200 ++++ ./calendar/gcalresource.h 2010-08-10 23:30:55.611418168 +0200 +@@ -57,6 +57,9 @@ + /* Event itens update lists */ + Akonadi::Item::List pending; + Akonadi::Item::List deleted; ++ ++private: ++ void fixOffset(KDateTime &date, bool toGoogle=false); + + }; + |