diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-28 12:40:58 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-28 12:40:58 +0200 |
| commit | ce0f7ae71905e320868a4f7abfe752f302a8a5a6 (patch) | |
| tree | 7ec74653ad64391017039d2a98c118813bf1614e | |
| parent | b22198ea49012bc34023669b516ddd97f8ed5ae5 (diff) | |
| parent | 5a49c61da24222833ab2d1484ac0bbae58b9e19b (diff) | |
| download | ayatana-indicator-power-ce0f7ae71905e320868a4f7abfe752f302a8a5a6.tar.gz ayatana-indicator-power-ce0f7ae71905e320868a4f7abfe752f302a8a5a6.tar.bz2 ayatana-indicator-power-ce0f7ae71905e320868a4f7abfe752f302a8a5a6.zip | |
Merge branch 'tari01-pr/drop-lomiri-url-dispatcher'
Attributes GH PR #38: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/38
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/notifier.c | 4 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 |
5 files changed, 2 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 72f4bde..a22ab16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,13 +68,6 @@ pkg_check_modules(SERVICE_DEPS REQUIRED include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS}) -set(URL_DISPATCHER_REQUIRED_VERSION 0) -pkg_check_modules( - URLDISPATCHER - lomiri-url-dispatcher>=${URL_DISPATCHER_REQUIRED_VERSION} -) -include_directories(${URLDISPATCHER_INCLUDE_DIRS}) - if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml") set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON) add_definitions ( -DHAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ) diff --git a/debian/control b/debian/control index 534e197..e1f53f2 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: cmake, libayatana-common-dev (>= 0.9.1), libnotify-dev (>= 0.7.6), libglib2.0-dev (>= 2.36), - liblomiri-url-dispatcher-dev | hello, accountsservice-ubuntu-schemas | hello, # for packaging debhelper (>= 9), diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6e3c7b..499efb4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,3 @@ -if(URLDISPATCHER_FOUND) - add_definitions( -DHAS_URLDISPATCHER ) -endif() - # handwritten sources set(SERVICE_MANUAL_SOURCES brightness.c @@ -58,5 +54,5 @@ link_directories(${SERVICE_DEPS_LIBRARY_DIRS}) # the executable: lib + main() add_executable (${SERVICE_EXEC} main.c) set_source_files_properties(${SERVICE_SOURCES} main.c PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -std=c99") -target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${URLDISPATCHER_LIBRARIES}) +target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES}) install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}) diff --git a/src/notifier.c b/src/notifier.c index d982ac2..098c9b8 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -28,10 +28,6 @@ #include "notifier.h" #include "utils.h" -#ifdef HAS_URLDISPATCHER -#include <lomiri-url-dispatcher.h> -#endif - #include <libnotify/notify.h> #include <glib/gi18n.h> diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9c0d222..662c114 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -51,7 +51,7 @@ function(add_test_by_name name) target_link_options(${TEST_NAME} PRIVATE -no-pie) add_test (${TEST_NAME} ${TEST_NAME}) add_dependencies (${TEST_NAME} ${SERVICE_LIB} gschemas-compiled) - target_link_libraries (${TEST_NAME} ${SERVICE_LIB} ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) + target_link_libraries (${TEST_NAME} ${SERVICE_LIB} ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GMOCK_LIBRARIES}) endfunction() add_test_by_name(test-notify) add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true) |