From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- kde-frameworks/kcalendarcore/Manifest | 7 +- ...5.64.0-fix-RRULE-generation-for-timezones.patch | 741 +++++++++++++++++++++ .../kcalendarcore/kcalendarcore-5.64.0-r1.ebuild | 29 + .../kcalendarcore/kcalendarcore-5.64.0.ebuild | 27 - .../kcalendarcore/kcalendarcore-5.65.0.ebuild | 27 - .../kcalendarcore/kcalendarcore-5.66.0.ebuild | 27 + 6 files changed, 801 insertions(+), 57 deletions(-) create mode 100644 kde-frameworks/kcalendarcore/files/kcalendarcore-5.64.0-fix-RRULE-generation-for-timezones.patch create mode 100644 kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild delete mode 100644 kde-frameworks/kcalendarcore/kcalendarcore-5.64.0.ebuild delete mode 100644 kde-frameworks/kcalendarcore/kcalendarcore-5.65.0.ebuild create mode 100644 kde-frameworks/kcalendarcore/kcalendarcore-5.66.0.ebuild (limited to 'kde-frameworks/kcalendarcore') diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest index ef510aa77dc6..3d4f0480da5f 100644 --- a/kde-frameworks/kcalendarcore/Manifest +++ b/kde-frameworks/kcalendarcore/Manifest @@ -1,5 +1,6 @@ +AUX kcalendarcore-5.64.0-fix-RRULE-generation-for-timezones.patch 24027 BLAKE2B 69248f2b712dcc206538da6d3d800035abaad6d886b2eeaa3161faa48be1a2fdf90bec68992c5899b4aa1e2a5ec669a8d13c6d502fb4ee354d3308470ce0fae1 SHA512 e67463a5a2b4d0cf1545a8248fdcec9e277caeb113b105aaeaa37e349fe37d3f94cad1f0317578161e9479b1ffe391c1e53bf044f080936a3d7ea8d1bc48f6bd DIST kcalendarcore-5.64.0.tar.xz 249868 BLAKE2B 1ce35ce485e52deaafe2a500295c1623aae7cca8d499e7f16890bfbc67f2f89f9b46518fdcadcf94a06b85be7ea6184de0bdac261324b483726d2cac0e6d6626 SHA512 562f0d35170389002b9a5e5b59fc90c276f4d54f1abc3e8558a6c22aadbd3e971a7eadb90fe793ce088bc0834f2d20c1396085ce2e3c8bb64fddb77b06c24231 -DIST kcalendarcore-5.65.0.tar.xz 250816 BLAKE2B eed9c8f6e813b1e483c27a1fe30920a20ad68f5b1094837a03f13dd1f746796e0c604355fe8be76d663a82d2de895530b245aeb8b4f3db0eebbc069efd045eac SHA512 4222a7223b9c6a45bc6966e547f9caa129e469a21386be271678ac3e6fcc2574593ca9dbb3f00bec30030f3d4511fb219a692607cd3b5fdcecd29be758a6e3ae -EBUILD kcalendarcore-5.64.0.ebuild 504 BLAKE2B dfa6f8364b7bc1888aa5fddf9578fc098eaaa61ed1c7ae8c6a41be3cd7d4b7b80f5ee1229b7f91445195d1ef921101132312b8b824424dc44d8bda82389ed1c8 SHA512 4fa7607040c9a6251d834464f039f686d23c21e5b255ffbf27091916561966b364b9156c67572f113a68f31aa5afcabd32be53e881b4b6c4067e21af35eae745 -EBUILD kcalendarcore-5.65.0.ebuild 507 BLAKE2B 95ff1fae6f96b85f32cd62efa759aa2ed7abb9e6078e3d1385a0578a547fab5a0f3c607dd9ca2b94f11db13bf56df2e582db21d6b7633e75771fef88ad33ae00 SHA512 3f23b308b2c2430a1f284ff3ce1b21c926ecc3f04c7c8ef67a90f264d06d9ed0cc0038a7ecf4e75a747622f426fc053d51ddb6d96fb057015a2d79c8abbc9e17 +DIST kcalendarcore-5.66.0.tar.xz 249656 BLAKE2B 9100a93986a0f2611662a23adec06e0b207202b6d0b64274d050550b4124d6ea3bdd90878809fa624a83f1d4f60c9e706be3d1d9e2db9fc37682e8691040c2a2 SHA512 155b229c9903f8f72fc54950810e6efbd3fc81a9e546b747170ef9125115617db248a4936206671b4e7aa2337a95791f43f8532762e761f6ad22d4e2e73d45e2 +EBUILD kcalendarcore-5.64.0-r1.ebuild 591 BLAKE2B afefe2569441b869ea46e95e358b4eb4a7d15241b872d5eb7bae1fca9d958a7b70238e685d522ccd62b0ea191aa100a2f798d3aca1a1b8a68cc4192e5e448369 SHA512 62f26bba66e48d7ab19d8f01b8561842ba280da5f5a3627dcd840a17a61fad36b51a74613699221a175e4ea4b7cadb58a4d522159f04850b73838dba9553f15a +EBUILD kcalendarcore-5.66.0.ebuild 507 BLAKE2B 5f49398f1993424c63686bbefdc4ee7e730cf07b00da6c365ec221ff8777f86a2b73741386900fe35e437ec70e059bb5dcd77e9e5f6e12e3bc701a5f85644bd5 SHA512 65b15e6e5029227a944448d4f5c78090c6fa5a152fa0f89c56e6918a84f0ca0962fd8880f38b5d971d7e9c912119dd03d7ce15684a2cd5f459d07d1519eb21cd MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kcalendarcore/files/kcalendarcore-5.64.0-fix-RRULE-generation-for-timezones.patch b/kde-frameworks/kcalendarcore/files/kcalendarcore-5.64.0-fix-RRULE-generation-for-timezones.patch new file mode 100644 index 000000000000..28fa08131cf7 --- /dev/null +++ b/kde-frameworks/kcalendarcore/files/kcalendarcore-5.64.0-fix-RRULE-generation-for-timezones.patch @@ -0,0 +1,741 @@ +From 595d25ddbc6838eb7ec70a71040246f4c7c5426f Mon Sep 17 00:00:00 2001 +From: Volker Krause +Date: Tue, 10 Dec 2019 18:08:31 +0100 +Subject: Fix RRULE generation for timezones + +Summary: +libical 3.0.6 is stricter for RRULEs than previous versions and disallows +setting both the COUNT and UNTIL property at the same time. So don't do +that anymore, one is enough. + +Reviewers: dfaure, winterz + +Reviewed By: winterz + +Subscribers: winterz, kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D25857 +--- + .../Compat-libical3/AppleICal_1.5.ics.ical.ref | 50 +++++++++++----------- + .../Evolution_2.8.2_timezone_test.ics.ical.ref | 12 +++--- + .../data/Compat-libical3/Mozilla_1.0.ics.ical.ref | 24 +++++------ + autotests/data/Compat/AppleICal_1.5.ics.ical.ref | 50 +++++++++++----------- + .../Evolution_2.8.2_timezone_test.ics.ical.ref | 4 +- + autotests/data/Compat/Mozilla_1.0.ics.ical.ref | 8 ++-- + autotests/testicaltimezones.cpp | 2 +- + src/icaltimezones.cpp | 1 - + 8 files changed, 75 insertions(+), 76 deletions(-) + +diff --git a/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref b/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref +index dca8c16..0173bc8 100644 +--- a/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref ++++ b/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref +@@ -17,7 +17,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -68,7 +68,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -119,7 +119,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -170,7 +170,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -221,7 +221,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -272,7 +272,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -323,7 +323,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -374,7 +374,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -425,7 +425,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -476,7 +476,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -527,7 +527,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -578,7 +578,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -629,7 +629,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -680,7 +680,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -731,7 +731,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -782,7 +782,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -833,7 +833,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -884,7 +884,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -935,7 +935,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -986,7 +986,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1037,7 +1037,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1088,7 +1088,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1139,7 +1139,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1190,7 +1190,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1241,7 +1241,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +diff --git a/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref b/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref +index 63fdc02..898b2f5 100644 +--- a/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref ++++ b/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref +@@ -24,7 +24,7 @@ TZNAME:EST + TZOFFSETFROM:-0400 + TZOFFSETTO:-0500 + DTSTART:19701025T020000 +-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 ++RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 + RDATE:20061029T020000 + END:STANDARD + BEGIN:DAYLIGHT +@@ -32,14 +32,14 @@ TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19760425T020000 +-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19880403T020000 +-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT +@@ -83,7 +83,7 @@ TZNAME:EST + TZOFFSETFROM:-0400 + TZOFFSETTO:-0500 + DTSTART:19701025T020000 +-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 ++RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 + RDATE:20061029T020000 + END:STANDARD + BEGIN:DAYLIGHT +@@ -91,14 +91,14 @@ TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19760425T020000 +-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19880403T020000 +-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT +diff --git a/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref b/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref +index b443dbb..d9f8078 100644 +--- a/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref ++++ b/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref +@@ -23,7 +23,7 @@ TZNAME:EST + TZOFFSETFROM:-0400 + TZOFFSETTO:-0500 + DTSTART:19701025T020000 +-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 ++RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 + RDATE:20061029T020000 + END:STANDARD + BEGIN:DAYLIGHT +@@ -31,14 +31,14 @@ TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19760425T020000 +-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19880403T020000 +-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT +@@ -82,7 +82,7 @@ TZNAME:EST + TZOFFSETFROM:-0400 + TZOFFSETTO:-0500 + DTSTART:19701025T020000 +-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 ++RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 + RDATE:20061029T020000 + END:STANDARD + BEGIN:DAYLIGHT +@@ -90,14 +90,14 @@ TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19760425T020000 +-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19880403T020000 +-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT +@@ -141,7 +141,7 @@ TZNAME:EST + TZOFFSETFROM:-0400 + TZOFFSETTO:-0500 + DTSTART:19701025T020000 +-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 ++RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 + RDATE:20061029T020000 + END:STANDARD + BEGIN:DAYLIGHT +@@ -149,14 +149,14 @@ TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19760425T020000 +-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19880403T020000 +-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT +@@ -200,7 +200,7 @@ TZNAME:EST + TZOFFSETFROM:-0400 + TZOFFSETTO:-0500 + DTSTART:19701025T020000 +-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 ++RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 + RDATE:20061029T020000 + END:STANDARD + BEGIN:DAYLIGHT +@@ -208,14 +208,14 @@ TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19760425T020000 +-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT + TZOFFSETFROM:-0500 + TZOFFSETTO:-0400 + DTSTART:19880403T020000 +-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 ++RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 + END:DAYLIGHT + BEGIN:DAYLIGHT + TZNAME:EDT +diff --git a/autotests/data/Compat/AppleICal_1.5.ics.ical.ref b/autotests/data/Compat/AppleICal_1.5.ics.ical.ref +index 8a48f48..20ae235 100644 +--- a/autotests/data/Compat/AppleICal_1.5.ics.ical.ref ++++ b/autotests/data/Compat/AppleICal_1.5.ics.ical.ref +@@ -17,7 +17,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -68,7 +68,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -119,7 +119,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -170,7 +170,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -221,7 +221,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -272,7 +272,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -323,7 +323,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -374,7 +374,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -425,7 +425,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -476,7 +476,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -527,7 +527,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -578,7 +578,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -629,7 +629,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -680,7 +680,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -731,7 +731,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -782,7 +782,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -833,7 +833,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -884,7 +884,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -935,7 +935,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -986,7 +986,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1037,7 +1037,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1088,7 +1088,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1139,7 +1139,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1190,7 +1190,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +@@ -1241,7 +1241,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + END:STANDARD + BEGIN:STANDARD + TZNAME:CET +diff --git a/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref b/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref +index 0d238f5..3d9a235 100644 +--- a/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref ++++ b/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref +@@ -39,7 +39,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + RDATE;VALUE=DATE-TIME:19950924T030000 + END:STANDARD + END:VTIMEZONE +@@ -79,7 +79,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + RDATE;VALUE=DATE-TIME:19950924T030000 + END:STANDARD + END:VTIMEZONE +diff --git a/autotests/data/Compat/Mozilla_1.0.ics.ical.ref b/autotests/data/Compat/Mozilla_1.0.ics.ical.ref +index 086abb6..a194a26 100644 +--- a/autotests/data/Compat/Mozilla_1.0.ics.ical.ref ++++ b/autotests/data/Compat/Mozilla_1.0.ics.ical.ref +@@ -38,7 +38,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + RDATE;VALUE=DATE-TIME:19950924T030000 + END:STANDARD + END:VTIMEZONE +@@ -78,7 +78,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + RDATE;VALUE=DATE-TIME:19950924T030000 + END:STANDARD + END:VTIMEZONE +@@ -118,7 +118,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + RDATE;VALUE=DATE-TIME:19950924T030000 + END:STANDARD + END:VTIMEZONE +@@ -158,7 +158,7 @@ TZNAME:CET + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + DTSTART:19790930T030000 +-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 ++RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 + RDATE;VALUE=DATE-TIME:19950924T030000 + END:STANDARD + END:VTIMEZONE +diff --git a/autotests/testicaltimezones.cpp b/autotests/testicaltimezones.cpp +index af3a975..71913cb 100644 +--- a/autotests/testicaltimezones.cpp ++++ b/autotests/testicaltimezones.cpp +@@ -123,7 +123,7 @@ static const char *VTZ_Prague + "TZOFFSETFROM:+0200\r\n" + "TZOFFSETTO:+0100\r\n" + "DTSTART:19790930T030000\r\n" +- "RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9\r\n" ++ "RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9\r\n" + "RDATE;VALUE=DATE-TIME:19950924T030000\r\n" + "END:STANDARD\r\n" + "BEGIN:DAYLIGHT\r\n" +diff --git a/src/icaltimezones.cpp b/src/icaltimezones.cpp +index c6d8891..9c0500f 100644 +--- a/src/icaltimezones.cpp ++++ b/src/icaltimezones.cpp +@@ -386,7 +386,6 @@ icalcomponent *ICalTimeZoneParser::icalcomponentFromQTimeZone(const QTimeZone &t + icalrecurrencetype r; + icalrecurrencetype_clear(&r); + r.freq = ICAL_YEARLY_RECURRENCE; +- r.count = (year >= 2030) ? 0 : times.count() - 1; + r.by_month[0] = month; + if (rule & DAY_OF_MONTH) { + r.by_month_day[0] = dayOfMonth; +-- +cgit v1.1 diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild new file mode 100644 index 000000000000..5737c7e70fb0 --- /dev/null +++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Library for interfacing with calendars" +LICENSE="GPL-2+ test? ( LGPL-3+ )" +KEYWORDS="amd64 arm64 x86" +IUSE="" + +BDEPEND=" + sys-devel/bison +" +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + dev-libs/libical:= +" +RDEPEND="${DEPEND} + !kde-apps/kcalcore:5 +" + +RESTRICT+=" test" # multiple tests fail or hang indefinitely + +PATCHES+=( "${FILESDIR}/${P}-fix-RRULE-generation-for-timezones.patch" ) # bug 699448 diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0.ebuild deleted file mode 100644 index 3a7e90063373..000000000000 --- a/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Library for interfacing with calendars" -LICENSE="GPL-2+ test? ( LGPL-3+ )" -KEYWORDS="amd64 arm64 x86" -IUSE="" - -BDEPEND=" - sys-devel/bison -" -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - dev-libs/libical:= -" -RDEPEND="${DEPEND} - !kde-apps/kcalcore:5 -" - -RESTRICT+=" test" # multiple tests fail or hang indefinitely diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.65.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.65.0.ebuild deleted file mode 100644 index 367b365a8c43..000000000000 --- a/kde-frameworks/kcalendarcore/kcalendarcore-5.65.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Library for interfacing with calendars" -LICENSE="GPL-2+ test? ( LGPL-3+ )" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" - -BDEPEND=" - sys-devel/bison -" -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - dev-libs/libical:= -" -RDEPEND="${DEPEND} - !kde-apps/kcalcore:5 -" - -RESTRICT+=" test" # multiple tests fail or hang indefinitely diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.66.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.66.0.ebuild new file mode 100644 index 000000000000..3f821fb6de9c --- /dev/null +++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.66.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Library for interfacing with calendars" +LICENSE="GPL-2+ test? ( LGPL-3+ )" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +BDEPEND=" + sys-devel/bison +" +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + dev-libs/libical:= +" +RDEPEND="${DEPEND} + !kde-apps/kcalcore:5 +" + +RESTRICT+=" test" # multiple tests fail or hang indefinitely -- cgit v1.2.3