diff options
| -rw-r--r-- | AUTHORS | 372 | ||||
| -rw-r--r-- | CMakeLists.txt | 34 | ||||
| -rw-r--r-- | ChangeLog | 67 | ||||
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 24 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/test-eds-ics-all-day-events.cpp | 4 | ||||
| -rw-r--r-- | tests/test-eds-ics-missing-trigger.cpp | 8 | ||||
| -rw-r--r-- | tests/test-eds-ics-nonrepeating-events.cpp | 4 | ||||
| -rw-r--r-- | tests/test-eds-ics-repeating-events.cpp | 4 | ||||
| -rw-r--r-- | tests/test-eds-ics-tzids-2.cpp | 4 | ||||
| -rw-r--r-- | tests/test-eds-ics-tzids-utc.cpp | 4 | ||||
| -rw-r--r-- | tests/test-eds-ics-tzids.cpp | 4 |
16 files changed, 326 insertions, 229 deletions
@@ -1,187 +1,185 @@ -Abbas Baharforoosh <abahar1996@gmail.com> -Abdusalam <1810010207@s.upc.edu.cn> -account1 <surajchawla61@gmail.com> -Ács Zoltán <acszoltan111@gmail.com> -Adolfo Jayme Barrientos <fitojb@ubuntu.com> -Adrià Martín <adriamartinmor@gmail.com> -advocatux <advocatux@airpost.net> -Allan LeSage <allanlesage@gmail.com> -Allan Nordhøy <epost@anotheragency.no> -Anders Jonsson <anders.jonsson@norsjovallen.se> -Andrea Azzarone <azzaronea@gmail.com> -Andreas Kleinert <Andy.Kleinert@gmail.com> -Andrew Shadura <andrew@shadura.me> -Antti Kaijanmäki <antti.kaijanmaki@canonical.com> -Arthur Mello <arthur.mello@canonical.com> -Baka Gaijin <lewdwarrior@waifu.club> -bittin1ddc447d824349b2 <bittin@reimu.nl> -Bob Owen <bobowen@spamcop.net> -Boyuan Yang <073plan@gmail.com> -Bruno Fragoso <darth_signa@hotmail.com> -ButterflyOfFire <ButterflyOfFire@protonmail.com> -Charles Kerr <charles.kerr@canonical.com> -chrismeurer <christianmeurer@outlook.com> -CI Train Bot <ci-train-bot@canonical.com> -Cleverson Cândido <optimuspraimu@gmail.com> -Colin Watson <cjwatson@canonical.com> -Cristian Gherman <c_gherman@yahoo.com> -Csaba <csab0825@gmail.com> -이정희 <daemul72@gmail.com> -Danjela Hoxha <danjelahoxha@gmail.com> -David Barth <david.barth@canonical.com> -David Mohammed <fossfreedom@ubuntu.com> -David Planella <david.planella@ubuntu.com> -Davit Mayilyan <davit.mayilyan@protonmail.ch> -Didier Roche <didier.roche@canonical.com> -Didier Roche <didrocks@ubuntu.com> -Doma Gergő <domag02@gmail.com> -Droit <3118138007@qq.com> -Dylan McCall <dylanmccall@ubuntu.com> -Eduardo Addad de Oliveira <duduaddad@gmail.com> -ElectrifiedSpeed <electrifiedsped@gmail.com> -Elizabeth Sherrock <lizzyd710@gmail.com> -EminUZUN <eminuzunn@gmail.com> -Eryk Michalak <gnu.ewm@protonmail.com> -Espen Wiborg <espenhw@grumblesmurf.org> -Eugen Wesseloh <auscoder@gmail.com> -Evgeni Golov <evgeni@debian.org> -farkasdvd <30418389+farkasdvd@users.noreply.github.com> -Gabor Kelemen <kelemeng@gnome.hu> -gallegonovato <fran-carro@hotmail.es> -Gediminas Murauskas <muziejusinfo@gmail.com> -geni <me@geni.site> -giorgio.saragnese <giorgio.saragnese@hotmail.it> -gökhan barış göbet <barisgobet2002@gmail.com> -Grace Guo <grace@appest.com> -György Balló <ballogy@freestart.hu> -Heimen Stoffels <vistausss@fastmail.com> -Heimen Stoffels <vistausss@outlook.com> -Henrik Dankvardt <dankvardt@gmail.com> -Hosted Weblate <hosted@weblate.org> -hugoalh <hugoalh@users.noreply.hosted.weblate.org> -HuNteR GaMinG <rd7128089@gmail.com> -Iain Lane <iain.lane@canonical.com> -Iain Lane <iain@orangesquash.org.uk> -iNetRoos <inetroos@gmail.com> -Javier Jardón <javier.jardon@codethink.co.uk> -Jeannette L <j.lavoie@net-c.ca> -Jeremy Bicha <jbicha@ubuntu.com> -J. Lavoie <j.lavoie@net-c.ca> -Joan CiberSheep <cibersheep@gmail.com> -Johntini <ekardian@gmail.com> -Jörn Horstmann <launchpad@planetxml.de> -Juraj Liso <lisojuraj@gmail.com> -karel van dongen <karelvandongen@gmail.com> -karl-qdh <karl@qdh.org.uk> -Karol Kosek <krkkx@protonmail.com> -Ken VanDine <ken.vandine@canonical.com> -klausade <klaus@linuxavdelingen.no> -koffevar <egor.kafisov@gmail.com> -Kristjan Räts <kristjanrats@gmail.com> -kugiigi <kugi_eusebio@protonmail.com> -Kyle Nitzsche <kyle.nitzsche@canonical.com> -Kyrylo Yanukovych <rhetoranswer@hotmail.com> -Laércio Cordeiro <efs.laee@gmail.com> -Lars Uebernickel <lars@uebernic.de> -Lars Uebernickel <lars.uebernickel@canonical.com> -larsu <Unknown> -leela <52065244+leela52452@users.noreply.github.com> -leela <53352@protonmail.com> -Lejo <Lejo_1@web.de> -Luigi311 <git@luigi311.com> -Lukáš Tinkl <lukas.tinkl@canonical.com> -Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> -Luke Yelavich <luke.yelavich@canonical.com> -Luna Jernberg <droidbittin@gmail.com> -Marco Scaglioni <id.ray.sca@gmail.com> -Marco Trevisan (Treviño) <mail@3v1n0.net> -Marcus Tomlinson <marcus.tomlinson@canonical.com> -Marius Gripsgard <marius@ubports.com> -MarongHappy <daemul72@gmail.com> -Martin Pitt <martin.pitt@canonical.com> -Martin Šikuda <msikuda@gmail.com> -Mateusz Rumiński <matt.ruminski@protonmail.com> -Mathieu Trudel-Lapierre <mathieu@canonical.com> -Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> -Mertcan Gokgoz <mertcan.gokgoz@gmail.com> -Michael Terry <michael.terry@canonical.com> -Michael Terry <mike@mterry.name> -Michalis <michalisntovas@yahoo.gr> -Michele <miguel2000@livecom.it> -Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Milan Korecky <milan.korecky@gmail.com> -Milo Ivir <mail@milotype.de> -Mirco Müller <mirco.mueller@canonical.com> -MoccoCoffee <egor.pravdikov@gmail.com> -Moo <hazap@hotmail.com> -M Ramani Priya <priya.maremanda@gmail.com> -mv87 <mv87@dismail.de> -Naveen Rajan <naveentherocker1234@gmail.com> -Nicholas Guriev <nicholas@guriev.su> -nimradium <nimra242001@gmail.com> -nugullpunch <wldjs102@naver.com> -Oğuz Ersen <oguz@ersen.moe> -Oğuz Ersen <oguzersen@protonmail.com> -Olivier Macchioni <olivier.macchioni@gmail.com> -Olivier Tilloy <olivier.tilloy@canonical.com> -OPNA2608 <christoph.neidahl@gmail.com> -OrionJK - <idorionjk@gmail.com> -Pavel Borecki <pavel.borecki@gmail.com> -Phil Clifford <philip.clifford@gmail.com> -phlostically <phlostically@mailinator.com> -Quentin PAGÈS <quentinantonin@free.fr> -Ratchanan Srirattanamet <ratchanan@ubports.com> -Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org> -Renato Araujo Oliveira Filho <renato.filho@canonical.com> -Reza Almanda <rezaalmanda27@gmail.com> -Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> -Richard Somlói <level@somloirichard.hu> -Robert Ancell <robert.ancell@canonical.com> -Robert Tari <robert@tari.in> -Rob Pearson <rob.dunedin@gmail.com> -Rodney Dawes <dobey.pwns@gmail.com> -Rodney Dawes <rodney.dawes@canonical.com> -Rodrigo Moya <rodrigo.moya@canonical.com> -Rondy Andersson <rondarius@gmail.com> -Rui Mendes <xz9@protonmail.com> -Ryan Lortie <desrt@desrt.ca> -SapuSeven <sapuseven@gmail.com> -Sebastian Rasmussen <sebras@gmail.com> -Sebastien Bacher <seb128@ubuntu.com> -Sergey Shnatsel Davidoff <shnatsel@gmail.com> -Sergii Horichenko <m@sgg.im> -Simon Quigley <tsimonq2@ubuntu.com> -sock-et <inline.py@gmail.com> -spnux <stephane.petrus@posteo.net> -ssantos <ssantos@web.de> -Steve <steve.kueffer.ch@gmail.com> -Swann Martinet <swann.ranskassa@laposte.net> -Sylke Vicious <silkevicious@tuta.io> -taoky <taoky99@outlook.com> -Ted Gould <ted@gould.cx> -Temuri Doghonadze <temuri.doghonadze@gmail.com> -THANOS SIOURDAKIS <siourdakisthanos@gmail.com> -thebylito <thebylito@gmail.com> -Tiago Silva Miguel <tiagos.miguel@outlook.com> -Timo Jyrinki <timo.jyrinki@canonical.com> -Tobias p <sorenautonom667@gmail.com> -Tomáš Marný <tomik.marny@gmail.com> -Tommy Cheng <csckcac@gmail.com> -Uddin Mtm <saifuddinmutammam@gmail.com> -umesaburo sagawa <atowa-notonare-yamatonare427@pm.me> -Veselin Georgiev <vvgeorgievv@gmail.com> -Viktar Vauchkevich <victorenator@gmail.com> -WaldiS <admin@sto.ugu.pl> -wdggg <wdggg7@gmail.com> -Weblate <noreply@weblate.org> -Wellington Terumi Uemura <wellingtonuemura@gmail.com> -wigy <wigy@tuta.io> -Yaron Shahrabani <sh.yaron@gmail.com> -Zdeněk Klauda <finaltek.com@gmail.com> -Zhaoyu Gan <ganzhaoyu037@sina.com> -Артем <wwesstt@gmail.com> -Володимир Бриняк <bardvv@gmail.com> -Марс Ямбар <mjambarmeta@gmail.com> -Мира Странная <miraityan2004@gmail.com> -தமிழ்நேரம் <anishprabu.t@gmail.com> -复予 <clonewith@qq.com> +이정희 +Abbas Baharforoosh +Abdusalam +Account1 +Ács Zoltán +Adolfo Jayme Barrientos +Adrià Martín +Advocatux +Allan LeSage +Allan Nordhøy +Anders Jonsson +Andi Chandler +Andrea Azzarone +Andreas Kleinert +Andrew Shadura +Antti Kaijanmäki +Arif Budiman +Arthur Mello +Baka Gaijin +Bittin1ddc447d824349b2 +Bob Owen +BoneNI +Boyuan Yang +Bruno Fragoso +ButterflyOfFire +Charles Kerr +Chrismeurer +Cleverson Cândido +Colin Watson +Cristian Gherman +Csaba +Daniel Frost +Danjela Hoxha +David Barth +David Mohammed +David Planella +Davit Mayilyan +Didier Roche +Doma Gergő +Droit +Dylan McCall +Eduardo Addad De Oliveira +ElectrifiedSpeed +Elizabeth Sherrock +EminUZUN +Eryk Michalak +Espen Wiborg +Eugen Wesseloh +Evgeni Golov +Farkasdvd +Gabor Kelemen +Gallegonovato +Gediminas Murauskas +Geni +Giorgio Saragnese +Gökhan Barış Göbet +Grace Guo +György Balló +Heimen Stoffels +Henrik Dankvardt +Hosted Weblate +Hugoalh +HuNteR GaMinG +Iain Lane +Ida Brenna +INetRoos +Iván Seoane +Javier Jardón +Jeannette L +Jeremy Bicha +J Lavoie +Joan CiberSheep +Johntini +Jörn Horstmann +Juraj Liso +Karel Van Dongen +Karl-qdh +Karol Kosek +Ken VanDine +Klausade +Koffevar +Kristjan Räts +Kugiigi +Kyle Nitzsche +Kyrylo Yanukovych +Laércio Cordeiro +Lars Uebernickel +Larsu <Unknown> +Leela +Lejo +Lionel Duboeuf +Luigi311 +Lukáš Tinkl +Łukasz 'sil2100' Zemczak +Luke Yelavich +Luna Jernberg +Marco Scaglioni +Marco Trevisan (Treviño) +Marcus Tomlinson +Marius Gripsgard +MarongHappy +Martin Pitt +Martin Šikuda +Mateusz Rumiński +Mathieu Trudel-Lapierre +Mertcan Gokgoz +Michael Terry +Michalis +Michele +Mike Gabriel +Milan Korecky +Milo Ivir +Mirco Müller +MoccoCoffee +Moo +M Ramani Priya +Mv87 +Naveen Rajan +Nicholas Guriev +Nimradium +Nugullpunch +Oğuz Ersen +Olivier Macchioni +Olivier Tilloy +OPNA2608 +OrionJK - +Pavel Borecki +Phil Clifford +Phlostically +Priit Jõerüüt +Quentin PAGÈS +Ratchanan Srirattanamet +Remus-Gabriel Chelu +Renato Araujo Oliveira Filho +Reza Almanda +Ricardo Salveti De Araujo +Richard Somlói +Robert Ancell +Robert Tari +Rob Pearson +Rodney Dawes +Rodrigo Moya +Rondy Andersson +Rui Mendes +Ryan Lortie +SapuSeven +Sebastian Rasmussen +Sebastien Bacher +Sergey Shnatsel Davidoff +Sergii Horichenko +Simon Quigley +Sock-et +Spnux +Ssantos +Steve +Swann Martinet +Sylke Vicious +Taoky +Ted Gould +Temuri Doghonadze +THANOS SIOURDAKIS +Thebylito +Tiago Silva Miguel +Timo Jyrinki +Tobias P +Tomáš Marný +Tommy Cheng +Uddin Mtm +Umesaburo Sagawa +Veselin Georgiev +Viktar Vauchkevich +WaldiS +Wdggg +Weblate +Wellington Terumi Uemura +Wigy +Yaron Shahrabani +Zdeněk Klauda +Zhaoyu Gan +Артем +Володимир Бриняк +Марс Ямбар +Мира Странная +தமிழ்நேரம் +复予 diff --git a/CMakeLists.txt b/CMakeLists.txt index e20f9fb..53e6c2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 3.16) -project (ayatana-indicator-datetime VERSION 25.4.0 LANGUAGES C CXX) +project (ayatana-indicator-datetime VERSION 26.6.0 LANGUAGES C CXX) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -13,7 +13,9 @@ set (PACKAGE ${CMAKE_PROJECT_NAME}) option(ENABLE_TESTS "Enable all tests and checks" OFF) option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF) option(ENABLE_WERROR "Treat all build warnings as errors" OFF) -option(ENABLE_LOMIRI_FEATURES "Build with Lomiri-specific libraries, schemas, media and backend" OFF) +option(ENABLE_LOMIRI_FEATURES "Build with Lomiri-specific libraries, schemas, media" OFF) +option(ENABLE_MKCAL "Use mkcal (libmkcal-qt5) instead of Evolution Data Server backend ( default )" OFF) + if(ENABLE_COVERAGE) set(ENABLE_TESTS ON) @@ -76,7 +78,6 @@ if (ENABLE_LOMIRI_FEATURES) lomiri-url-dispatcher>=0 lomiri-sounds lomiri-schemas - libmkcal-qt5 ) pkg_get_variable(ALARM_DEFAULT_SOUND lomiri-sounds alarm_default_sound) @@ -89,11 +90,31 @@ if (ENABLE_LOMIRI_FEATURES) -DALARM_DEFAULT_SOUND="${ALARM_DEFAULT_SOUND}" -DCALENDAR_DEFAULT_SOUND="${CALENDAR_DEFAULT_SOUND}" ) +else () + add_definitions ( + -DALARM_DEFAULT_SOUND="dummy" + -DCALENDAR_DEFAULT_SOUND="dummy" + ) + + set (ALARM_DEFAULT_SOUND "dummy") +endif () + +if (ENABLE_MKCAL) + list ( + APPEND + SERVICE_DEPS + libmkcal-qt5 + ) find_package (ECM REQUIRED NO_MODULE) list (APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package (KF5 COMPONENTS CalendarCore REQUIRED) + add_definitions ( + -DHAS_MKCAL + ) + else () + # default is EDS list ( APPEND SERVICE_DEPS @@ -101,13 +122,6 @@ else () libedataserver-1.2>=3.5 libical>=0.48 ) - - add_definitions ( - -DALARM_DEFAULT_SOUND="dummy" - -DCALENDAR_DEFAULT_SOUND="dummy" - ) - - set (ALARM_DEFAULT_SOUND "dummy") endif () pkg_check_modules (SERVICE_DEPS REQUIRED ${SERVICE_DEPS}) @@ -1,6 +1,71 @@ +2026-06-11 Mike Gabriel + + * Release 26.6.0 (HEAD -> main, tag: 26.6.0) + * d/{control,rules}: Enable mkcal build variant for l-i-d (b8488dac) + * d/rules: Fix syntax (no '..' needed in dh_override_*) (ee17fc97) + * Merge branch 'lduboeuf-personal/lduboeuf/separate_mkcal' (8b6b6880) + +2025-10-11 Lionel Duboeuf + + * d/control: update description Lomiri variant has EDS backend by + default (13d4f324) + * separate mkCal Option from Lomiri (c2bb201c) + +2026-03-18 Andi Chandler + + * Translated using Weblate (English (United Kingdom)) (ef5f625e) + +2026-02-16 Arif Budiman + + * Translated using Weblate (Indonesian) (b150ba2b) + +2026-01-27 BoneNI + + * Translated using Weblate (Lao) (841aa045) + +2025-12-02 Daniel Frost + + * Translated using Weblate (German) (21a80986) + +2025-11-14 BoneNI + + * Translated using Weblate (Lao) (64b5150e) + +2025-09-16 Ida Brenna + + * Translated using Weblate (Norwegian Bokmål) (703b16c6) + +2025-09-01 Mike Gabriel + + * Merge branch 'sunweaver-pr/fix-google-calendar-syncing-crashes' + (85bd5d9d) + +2025-05-07 Priit Jõerüüt + + * Translated using Weblate (Estonian) (3323e18a) + +2025-04-27 தமிழ்நேரம் + + * Translated using Weblate (Tamil) (c89d6234) + +2025-08-05 Mike Gabriel + + * src/date-time.cpp: Don't segfault-by-assert if m_dt is not + initialized. Fixes syncing from Google Calendar where + sometimes events in Evolution can result in incomplete + DateTime objects. (47e005dc) + +2025-05-07 Priit Jõerüüt + + * Translated using Weblate (Estonian) (280e39c5) + +2025-04-27 தமிழ்நேரம் + + * Translated using Weblate (Tamil) (387e90ae) + 2025-04-02 Mike Gabriel - * release 25.4.0 (HEAD -> main, tag: 25.4.0) + * release 25.4.0 (18ab458c) (tag: 25.4.0) 2025-04-01 Robert Tari @@ -1,3 +1,12 @@ +Overview of changes in ayatana-indicator-datetime 26.6.0 + + - separate mkCal Option from Lomiri. + - src/date-time.cpp: Don't segfault-by-assert if m_dt is not + initialized. Fixes syncing from Google Calendar where sometimes + events in Evolution can result in incomplete DateTime objects. + - Translation updates (thanks to all contributors on + hosted.weblate.org). + Overview of changes in ayatana-indicator-datetime 25.4.0 - Add mkCal backend (to support Lomiri's calendar app backend). diff --git a/debian/changelog b/debian/changelog index 3d115ac..3894f52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ayatana-indicator-datetime (26.6.0) unstable; urgency=medium + + * Upstream-provided Debian package for ayatana-indicator-datetime. See + upstream ChangeLog for recent changes. + + -- UBports developers <developers@ubports.com> Thu, 11 Jun 2026 22:22:10 +0200 + ayatana-indicator-datetime (25.4.0-0) unstable; urgency=medium * Upstream-provided Debian package for ayatana-indicator-datetime. diff --git a/debian/control b/debian/control index 64d69f6..c9e2b98 100644 --- a/debian/control +++ b/debian/control @@ -14,11 +14,11 @@ Build-Depends: cmake, libgstreamer1.0-dev, libmessaging-menu-dev, uuid-dev, -# for non-Lomiri ICS data storage backend +# for EDS data storage backend libecal2.0-dev (>= 3.16), libical-dev (>= 1.0), libedataserver1.2-dev (>= 3.5), -# for Lomiri ICS data storage backend +# for mkcal data storage backend libkf5calendarcore-dev, libmkcal-qt5-dev, # more Lomiri features diff --git a/debian/rules b/debian/rules index 932a8d8..779c82b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +NULL = + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -24,47 +26,49 @@ override_dh_auto_configure: -- \ $(DEB_CMAKE_EXTRA_FLAGS) \ -DENABLE_LOMIRI_FEATURES=ON \ - .. + -DENABLE_MKCAL=ON \ + $(NULL) dh_auto_configure --builddirectory=ayatana-variant \ --buildsystem=cmake \ -- \ $(DEB_CMAKE_EXTRA_FLAGS) \ -DENABLE_LOMIRI_FEATURES=OFF \ - .. + -DENABLE_MKCAL=OFF \ + $(NULL) override_dh_auto_build: dh_auto_build --builddirectory=lomiri-variant \ --buildsystem=cmake \ - .. + $(NULL) dh_auto_build --builddirectory=ayatana-variant \ --buildsystem=cmake \ - .. + $(NULL) override_dh_auto_test: dh_auto_test --no-parallel \ --builddirectory=lomiri-variant \ --buildsystem=cmake \ - .. + $(NULL) dh_auto_test --no-parallel \ --builddirectory=ayatana-variant \ --buildsystem=cmake \ - .. + $(NULL) override_dh_auto_install: dh_auto_install --builddirectory=lomiri-variant \ --buildsystem=cmake \ - .. + $(NULL) dh_auto_install --builddirectory=ayatana-variant \ --buildsystem=cmake \ - .. + $(NULL) override_dh_auto_clean: dh_auto_clean --builddirectory=lomiri-variant \ --buildsystem=cmake \ - .. + $(NULL) dh_auto_clean --builddirectory=ayatana-variant \ --buildsystem=cmake \ - .. + $(NULL) override_dh_missing: dh_missing --fail-missing diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2bc4452..c015d33 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,7 +46,7 @@ set (SERVICE_CXX_SOURCES wakeup-timer-mainloop.cpp wakeup-timer-powerd.cpp) -if (ENABLE_LOMIRI_FEATURES) +if (ENABLE_MKCAL) list (APPEND SERVICE_CXX_SOURCES engine-mkcal.cpp) else () list (APPEND SERVICE_CXX_SOURCES engine-eds.cpp) @@ -80,7 +80,7 @@ endif() include_directories (${CMAKE_SOURCE_DIR}) link_directories (${SERVICE_DEPS_LIBRARY_DIRS}) -if (ENABLE_LOMIRI_FEATURES) +if (ENABLE_MKCAL) set_source_files_properties (engine-mkcal.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") target_link_libraries (${SERVICE_LIB} KF5::CalendarCore) target_compile_definitions (${SERVICE_LIB} PRIVATE -DQT_DEBUG -DQT_MESSAGELOGCONTEXT) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4aaee45..f6d5089 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -77,7 +77,7 @@ target_link_libraries (${TEST_NAME} indicatordatetimeservice ${SERVICE_DEPS_LIBR find_program(DBUS_RUNNER dbus-test-runner) -if (ENABLE_LOMIRI_FEATURES) +if (ENABLE_MKCAL) function(add_eds_ics_test_by_name name) set (TEST_NAME ${name}) set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE) diff --git a/tests/test-eds-ics-all-day-events.cpp b/tests/test-eds-ics-all-day-events.cpp index e38c7c7..069b4d8 100644 --- a/tests/test-eds-ics-all-day-events.cpp +++ b/tests/test-eds-ics-all-day-events.cpp @@ -80,7 +80,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) // what we expect to get... Appointment expected_appt; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL expected_appt.uid = "20150521T111538Z-7449-1000-3572-0@ghidorah"; #else expected_appt.uid = "51340540-a924-468e-b3ee-0c0f222cd0f8"; @@ -102,7 +102,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2) { return sColourIn == sColourExpected1 || sColourIn == sColourExpected2; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL }, appt.color, "#becedd", "#62a0ea"); #else }, appt.color, "#0000FF", ""); diff --git a/tests/test-eds-ics-missing-trigger.cpp b/tests/test-eds-ics-missing-trigger.cpp index 69ca109..a006c9a 100644 --- a/tests/test-eds-ics-missing-trigger.cpp +++ b/tests/test-eds-ics-missing-trigger.cpp @@ -82,7 +82,7 @@ TEST_F(VAlarmFixture, MissingTriggers) std::vector<Appointment> expected1; Appointment a1; a1.type = Appointment::ALARM; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL a1.uid = "20150617T211838Z-6217-32011-2036-1@lomiri-phablet"; a1.color = "#becedd"; #else @@ -99,7 +99,7 @@ TEST_F(VAlarmFixture, MissingTriggers) expected1.push_back(a1); // build expected: recurring alarm 1 -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL a1.uid = "20150617T211913Z-6217-32011-2036-5@lomiri-phablet"; #else a1.uid = "3b45cbc9-d5c3-49a4-ad29-acc776818259"; @@ -130,7 +130,7 @@ TEST_F(VAlarmFixture, MissingTriggers) std::vector<Appointment> expected2; Appointment a2; a2.type = Appointment::ALARM; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL a2.uid = "20150617T211838Z-6217-32011-2036-1@lomiri-phablet"; a2.color = "#62a0ea"; #else @@ -147,7 +147,7 @@ TEST_F(VAlarmFixture, MissingTriggers) expected2.push_back(a2); // build expected: recurring alarm 2 -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL a2.uid = "20150617T211913Z-6217-32011-2036-5@lomiri-phablet"; #else a2.uid = "3b45cbc9-d5c3-49a4-ad29-acc776818259"; diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp index c126dba..6e9c0f1 100644 --- a/tests/test-eds-ics-nonrepeating-events.cpp +++ b/tests/test-eds-ics-nonrepeating-events.cpp @@ -80,7 +80,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) // what we expect to get... Appointment expected_appt; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL expected_appt.uid = "20150520T000726Z-3878-32011-1770-81@lomiri-phablet"; #else expected_appt.uid = "d7aeb192-8b2c-4427-834f-f30388e9e73c"; @@ -103,7 +103,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2) { return sColourIn == sColourExpected1 || sColourIn == sColourExpected2; - #ifndef LOMIRI_FEATURES_ENABLED + #ifndef HAS_MKCAL }, appt.color, "#becedd", "#62a0ea"); #else }, appt.color, "#0000FF", ""); diff --git a/tests/test-eds-ics-repeating-events.cpp b/tests/test-eds-ics-repeating-events.cpp index 701f8da..8ab200e 100644 --- a/tests/test-eds-ics-repeating-events.cpp +++ b/tests/test-eds-ics-repeating-events.cpp @@ -80,7 +80,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) // what we expect to get... Appointment expected_appt; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL expected_appt.uid = "20150507T211449Z-4262-32011-1418-1@lomiri-phablet"; #else expected_appt.uid = "840ab899-1b0e-4697-9514-dcd336a5e125"; @@ -110,7 +110,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2) { return sColourIn == sColourExpected1 || sColourIn == sColourExpected2; - #ifndef LOMIRI_FEATURES_ENABLED + #ifndef HAS_MKCAL }, appt.color, "#becedd", "#62a0ea"); #else }, appt.color, "#0000FF", ""); diff --git a/tests/test-eds-ics-tzids-2.cpp b/tests/test-eds-ics-tzids-2.cpp index aff9de7..3654e83 100644 --- a/tests/test-eds-ics-tzids-2.cpp +++ b/tests/test-eds-ics-tzids-2.cpp @@ -81,7 +81,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) // what we expect to get... std::array<Appointment,1> expected_appts1; auto appt1 = &expected_appts1[0]; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL appt1->uid = "109264742"; appt1->color = "#becedd"; #else @@ -95,7 +95,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) std::array<Appointment,1> expected_appts2; auto appt2 = &expected_appts2[0]; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL appt2->uid = "109264742"; appt2->color = "#62a0ea"; #else diff --git a/tests/test-eds-ics-tzids-utc.cpp b/tests/test-eds-ics-tzids-utc.cpp index 8226061..5c85b1c 100644 --- a/tests/test-eds-ics-tzids-utc.cpp +++ b/tests/test-eds-ics-tzids-utc.cpp @@ -82,7 +82,7 @@ TEST_F(VAlarmFixture, UTCAppointments) // what we expect to get... std::array<Appointment,1> expected_appts1; auto appt1 = &expected_appts1[0]; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL appt1->uid = "20160322T132738Z"; appt1->color = "#becedd"; #else @@ -95,7 +95,7 @@ TEST_F(VAlarmFixture, UTCAppointments) std::array<Appointment,1> expected_appts2; auto appt2 = &expected_appts2[0]; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL appt2->uid = "20160322T132738Z"; appt2->color = "#62a0ea"; #else diff --git a/tests/test-eds-ics-tzids.cpp b/tests/test-eds-ics-tzids.cpp index e676001..1fa6d08 100644 --- a/tests/test-eds-ics-tzids.cpp +++ b/tests/test-eds-ics-tzids.cpp @@ -81,7 +81,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) // what we expect to get... std::array<Appointment,1> expected_appts1; auto appt1 = &expected_appts1[0]; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL appt1->uid = "8ggc30kh89qql8vjumgtug7l14@google.com"; appt1->color = "#becedd"; #else @@ -94,7 +94,7 @@ TEST_F(VAlarmFixture, MultipleAppointments) std::array<Appointment,1> expected_appts2; auto appt2 = &expected_appts2[0]; -#ifndef LOMIRI_FEATURES_ENABLED +#ifndef HAS_MKCAL appt2->uid = "8ggc30kh89qql8vjumgtug7l14@google.com"; appt2->color = "#62a0ea"; #else |