diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e260047..eeb513cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,8 +41,8 @@ variables: libgcr-3-dev libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev libgspell-1-dev libgtk-3-dev libhandy-0.0-dev libjson-glib-dev libmessaging-menu-dev libpeas-dev libsecret-1-dev - libsqlite3-dev libunity-dev libunwind-dev libwebkit2gtk-4.0-dev - libxml2-dev libytnef0-dev + libsqlite3-dev libunwind-dev libwebkit2gtk-4.0-dev libxml2-dev + libytnef0-dev UBUNTU_TEST_DEPS: locales xauth xvfb fedora: diff --git a/INSTALL b/INSTALL index 5e275d57..1ca42891 100644 --- a/INSTALL +++ b/INSTALL @@ -60,9 +60,9 @@ Install them by running this command: libpeas-dev libsecret-1-dev libsqlite3-dev libunwind-dev \ libwebkit2gtk-4.0-dev libxml2-dev libytnef0-dev -And for Ubuntu Unity integration: +And for Ubuntu Messaging Menu integration: - sudo apt-get install libmessaging-menu-dev libunity-dev + sudo apt-get install libmessaging-menu-dev Running ------- diff --git a/meson.build b/meson.build index af508faa..62f092a6 100644 --- a/meson.build +++ b/meson.build @@ -139,7 +139,6 @@ endif appstream_util = find_program('appstream-util', required: false) desktop_file_validate = find_program('desktop-file-validate', required: false) libmessagingmenu_dep = dependency('messaging-menu', version: '>= 12.10', required: false) -libunity = dependency('unity', version: '>= 5.12.0', required: false) # # Internal build configuration diff --git a/src/client/plugin/notification-badge/meson.build b/src/client/plugin/notification-badge/meson.build index 111660a2..9f106ddf 100644 --- a/src/client/plugin/notification-badge/meson.build +++ b/src/client/plugin/notification-badge/meson.build @@ -1,34 +1,29 @@ plugin_name = 'notification-badge' -if libunity.found() - badge_dependencies = plugin_dependencies - badge_dependencies += libunity +plugin_src = files( + plugin_name + '.vala', + 'unity-launcher-entry.vala' +) +plugin_data = join_paths(plugin_name + '.plugin') +plugin_dest = join_paths(plugins_dir, plugin_name) - plugin_src = files( - plugin_name + '.vala', - 'unity-launcher-entry.vala' - ) - plugin_data = join_paths(plugin_name + '.plugin') - plugin_dest = join_paths(plugins_dir, plugin_name) +shared_module( + plugin_name, + sources: plugin_src, + dependencies: plugin_dependencies, + include_directories: config_h_dir, + vala_args: geary_vala_args, + c_args: plugin_c_args, + install: true, + install_dir: plugin_dest +) - shared_module( - plugin_name, - sources: plugin_src, - dependencies: badge_dependencies, - include_directories: config_h_dir, - vala_args: geary_vala_args, - c_args: plugin_c_args, - install: true, - install_dir: plugin_dest - ) - - i18n.merge_file( - input: plugin_data + '.in', - output: plugin_data, - type: 'desktop', - po_dir: po_dir, - install: true, - install_dir: plugin_dest - ) -endif +i18n.merge_file( + input: plugin_data + '.in', + output: plugin_data, + type: 'desktop', + po_dir: po_dir, + install: true, + install_dir: plugin_dest +)