diff options
| -rw-r--r-- | .build.yml | 23 | ||||
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/copyright | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
5 files changed, 3 insertions, 38 deletions
@@ -19,6 +19,7 @@ requires: - vala # For building libayatana-common - gobject-introspection +# - liblomiri-url-dispatcher debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-bluetooth @@ -33,30 +34,12 @@ requires: - mate-common - intltool - libglib2.0-dev - - liblomiri-url-dispatcher-dev - - systemd - - valac - # For building libayatana-common - - gobject-introspection - - libgirepository1.0-dev - - debian:stable: - - autopoint - - clang - - clang-tools - - g++ - - cppcheck - - git - - cmake - - cmake-extras - - mate-common - - intltool - - libglib2.0-dev - systemd - valac # For building libayatana-common - gobject-introspection - libgirepository1.0-dev + - liblomiri-url-dispatcher-dev ubuntu: - autopoint @@ -69,12 +52,12 @@ requires: - mate-common - intltool - libglib2.0-dev - - liblomiri-url-dispatcher-dev - systemd - valac # For building libayatana-common - gobject-introspection - libgirepository1.0-dev + - liblomiri-url-dispatcher-dev ubuntu:focal: - autopoint diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b526a5..66012c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,16 +51,7 @@ pkg_check_modules( include_directories(${BLUETOOTHSERVICE_INCLUDE_DIRS}) -set(URL_DISPATCHER_REQUIRED_VERSION 0) - -pkg_check_modules( - URLDISPATCHER - lomiri-url-dispatcher>=${URL_DISPATCHER_REQUIRED_VERSION} -) -include_directories(${URLDISPATCHER_INCLUDE_DIRS}) - find_package(Vala 0.20) - find_package(GObjectIntrospection 0.9.12) include_directories(${SOURCE_DIR}) diff --git a/debian/control b/debian/control index ae10337..733b566 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9.0), cmake-extras (>= 0.10), intltool, libglib2.0-dev (>= 2.32.0), - liblomiri-url-dispatcher-dev | hello, systemd [linux-any], valac (>= 0.20), Standards-Version: 4.1.1 diff --git a/debian/copyright b/debian/copyright index 24efe7b..1531eb8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -71,7 +71,6 @@ Files: CMakeLists.txt src/CMakeLists.txt tests/manual vapi/config.vapi - vapi/url-dispatcher.vapi Copyright: 2013, Canonical Ltd. License: GPL-3 Comment: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb2e717..8770323 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,11 +6,6 @@ set(HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-bluetooth-service set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-bluetooth-service.def") set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-bluetooth-service.vapi") -if(URLDISPATCHER_FOUND) - set (VALA_DEFINE_URLDISPATCHER "--define=HAS_URLDISPATCHER") - set (VALA_PKG_URLDISPATCHER "lomiri-url-dispatcher") -endif() - vala_init(ayatana-indicator-bluetooth-service DEPENDS PACKAGES @@ -25,7 +20,6 @@ vala_init(ayatana-indicator-bluetooth-service --target-glib=${GLIB_2_0_REQUIRED_VERSION} --vapidir=${CMAKE_SOURCE_DIR}/vapi/ --vapidir=. - ${VALA_DEFINE_URLDISPATCHER} ) vala_add(ayatana-indicator-bluetooth-service @@ -136,7 +130,6 @@ add_library( target_link_libraries( ayatana-indicator-bluetooth-service-lib ${BLUETOOTHSERVICE_LIBRARIES} - ${URLDISPATCHER_LIBRARIES} -lm ) |