From 5659271ec3697a9b3b51d967ef81ed3cccf15058 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 16 Mar 2018 13:03:04 -0300 Subject: build: Drop remaining libnm-glib usage This library is deprecated for a long time now, and Fedora Rawhide removed the package. Since our CI is based on Rawhide, it began to fail. In the end, the usage was just legacy code that doesn't exist anymore, so it's pretty safe to just plain drop it. --- meson.build | 4 ---- panels/network/connection-editor/meson.build | 7 +------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 06aeff832..e1d32f4d7 100644 --- a/meson.build +++ b/meson.build @@ -189,10 +189,6 @@ if host_is_linux dependency('libnma', version: '>= 1.2.0'), dependency('mm-glib', version: '>= 0.7') ] - - network_manager_dep = dependency('NetworkManager') - nm_vpn_config_dir = join_paths(network_manager_dep.get_pkgconfig_variable('configdir'), 'VPN') - nm_vpn_module_dir = network_manager_dep.get_pkgconfig_variable('plugindir') endif config_h.set('BUILD_NETWORK', host_is_linux, description: 'Define to 1 to build the Network panel') diff --git a/panels/network/connection-editor/meson.build b/panels/network/connection-editor/meson.build index 86913dc02..616bafdb1 100644 --- a/panels/network/connection-editor/meson.build +++ b/panels/network/connection-editor/meson.build @@ -37,16 +37,11 @@ sources += gnome.compile_resources( export: true ) -ce_cflags = cflags + [ - '-DNM_VPN_CONFIG_DIR="@0@"'.format(nm_vpn_config_dir), - '-DNM_VPN_MODULE_DIR="@0@"'.format(nm_vpn_module_dir) -] - libconnection_editor = static_library( name, sources: sources, include_directories: [top_inc, wireless_security_inc], dependencies: deps, - c_args: ce_cflags, + c_args: cflags, link_with: libwireless_security ) -- cgit v1.2.1