diff options
| author | Robert Tari <robert@tari.in> | 2021-07-28 21:53:06 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-29 14:38:27 +0200 |
| commit | 28d347f433a90dd8a928a417fd7d76b86d576d59 (patch) | |
| tree | 299a8a1f1ce31a0201a1ecd77157e1a7f84a6024 | |
| parent | 6055485c2215e55cc0febe0eb15141e837d8e17b (diff) | |
| download | ayatana-indicator-datetime-28d347f433a90dd8a928a417fd7d76b86d576d59.tar.gz ayatana-indicator-datetime-28d347f433a90dd8a928a417fd7d76b86d576d59.tar.bz2 ayatana-indicator-datetime-28d347f433a90dd8a928a417fd7d76b86d576d59.zip | |
Some fixes in UBports patches after a review
- debian/control: Add liblomiri-url-dispatcher-dev as optional
- .build.yml: Add liblomiri-url-dispatcher-dev dependency
- CMakeLists.txt: Remove duplicate enable_testing()
- include/datetime/actions-live.h: Remove lomiri_open_appointment
| -rw-r--r-- | .build.yml | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | include/datetime/actions-live.h | 4 |
4 files changed, 2 insertions, 5 deletions
@@ -53,6 +53,7 @@ requires: - libedataserver1.2-dev - libproperties-cpp-dev - libmessaging-menu-dev + - liblomiri-url-dispatcher-dev # for the test harness: - libgtest-dev - libdbustest1-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index ef09a60..8e682ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,6 @@ if (ENABLE_TESTS) include(CTest) pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0) - enable_testing () enable_testing() add_subdirectory(tests) diff --git a/debian/control b/debian/control index f819bea..93d2b76 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: cmake, libedataserver1.2-dev (>= 3.5), accountsservice-ubuntu-schemas | hello, libproperties-cpp-dev, + liblomiri-url-dispatcher-dev | hello, # for the test harness: libgtest-dev <!nocheck>, libdbustest1-dev <!nocheck>, diff --git a/include/datetime/actions-live.h b/include/datetime/actions-live.h index 1eb34ec..6f536c4 100644 --- a/include/datetime/actions-live.h +++ b/include/datetime/actions-live.h @@ -46,10 +46,6 @@ public: void open_settings_app() override; void set_location(const std::string& zone, const std::string& name) override; - -protected: - - void lomiri_open_appointment(const Appointment& appt, const DateTime& date); }; } // namespace datetime |