NetworkManager is Linux-only. FreeBSD has many alternatives but none implements libnm-compatible API required by Phosh and GNOME. meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig --- meson.build.orig 2020-12-18 14:53:37 UTC +++ meson.build @@ -131,11 +131,11 @@ libhandy_dep = dependency('libhandy-1', fallback: ['libhandy', 'libhandy_dep'], default_options: ['introspection=disabled'] ) -libnm_dep = dependency('libnm', version: '>= 1.14') +libnm_dep = dependency('libnm', version: '>= 1.14', required: false) libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.105') # TODO: make optional for elogind? libsystemd_dep = dependency('libsystemd', version: '>= 241') -network_agent_dep = dependency('libsecret-1') +network_agent_dep = dependency('libsecret-1', required: false) upower_glib_dep = dependency('upower-glib', version: '>=0.99.1') wayland_client_dep = dependency('wayland-client', version: '>=1.14') wayland_protos_dep = dependency('wayland-protocols', version: '>=1.12') --- src/meson.build.orig 2020-10-28 08:27:41 UTC +++ src/meson.build @@ -52,8 +52,6 @@ libphosh_tool_sources = [ 'app-list-model.h', 'background.c', 'background.h', - 'connectivity-info.c', - 'connectivity-info.h', 'docked-info.c', 'docked-info.h', 'docked-manager.c', @@ -102,8 +100,6 @@ libphosh_sources = [ 'bt-info.h', 'bt-manager.c', 'bt-manager.h', - 'contrib/shell-network-agent.c', - 'contrib/shell-network-agent.h', 'fader.c', 'fader.h', 'feedbackinfo.c', @@ -120,8 +116,6 @@ libphosh_sources = [ 'lockscreen.h', 'monitor-manager.c', 'monitor-manager.h', - 'network-auth-prompt.c', - 'network-auth-prompt.h', 'osk-manager.c', 'osk-manager.h', 'panel.c', @@ -158,10 +152,6 @@ libphosh_sources = [ 'torch-manager.h', 'toplevel.c', 'toplevel.h', - 'wifiinfo.c', - 'wifiinfo.h', - 'wifimanager.c', - 'wifimanager.h', 'wwaninfo.c', 'wwaninfo.h', phosh_settings_sources, --- src/shell.c.orig 2021-02-09 20:00:21 UTC +++ src/shell.c @@ -29,7 +29,6 @@ #include "background-manager.h" #include "bt-info.h" #include "bt-manager.h" -#include "connectivity-info.h" #include "docked-info.h" #include "docked-manager.h" #include "fader.h" @@ -62,7 +61,6 @@ #include "torch-manager.h" #include "torch-info.h" #include "util.h" -#include "wifiinfo.h" #include "wwaninfo.h" #include "wwan/phosh-wwan-ofono.h" #include "wwan/phosh-wwan-mm.h" @@ -105,7 +103,6 @@ typedef struct PhoshIdleManager *idle_manager; PhoshOskManager *osk_manager; PhoshToplevelManager *toplevel_manager; - PhoshWifiManager *wifi_manager; PhoshPolkitAuthAgent *polkit_auth_agent; PhoshScreenSaverManager *screen_saver_manager; PhoshNotifyManager *notify_manager; @@ -351,7 +348,6 @@ phosh_shell_dispose (GObject *object) g_clear_object (&priv->notify_manager); g_clear_object (&priv->screen_saver_manager); g_clear_object (&priv->polkit_auth_agent); - g_clear_object (&priv->wifi_manager); g_clear_object (&priv->toplevel_manager); g_clear_object (&priv->osk_manager); g_clear_object (&priv->idle_manager); @@ -510,7 +506,6 @@ type_setup (void) { g_type_ensure (PHOSH_TYPE_BATTERY_INFO); g_type_ensure (PHOSH_TYPE_BT_INFO); - g_type_ensure (PHOSH_TYPE_CONNECTIVITY_INFO); g_type_ensure (PHOSH_TYPE_DOCKED_INFO); g_type_ensure (PHOSH_TYPE_FEEDBACK_INFO); g_type_ensure (PHOSH_TYPE_MEDIA_PLAYER); @@ -518,7 +513,6 @@ type_setup (void) g_type_ensure (PHOSH_TYPE_ROTATE_INFO); g_type_ensure (PHOSH_TYPE_SETTINGS); g_type_ensure (PHOSH_TYPE_TORCH_INFO); - g_type_ensure (PHOSH_TYPE_WIFI_INFO); g_type_ensure (PHOSH_TYPE_WWAN_INFO); } @@ -869,21 +863,6 @@ phosh_shell_get_monitor_manager (PhoshShell *self) return priv->monitor_manager; } - -PhoshWifiManager * -phosh_shell_get_wifi_manager (PhoshShell *self) -{ - PhoshShellPrivate *priv; - - g_return_val_if_fail (PHOSH_IS_SHELL (self), NULL); - priv = phosh_shell_get_instance_private (self); - - if (!priv->wifi_manager) - priv->wifi_manager = phosh_wifi_manager_new (); - - g_return_val_if_fail (PHOSH_IS_WIFI_MANAGER (priv->wifi_manager), NULL); - return priv->wifi_manager; -} PhoshBtManager * --- tests/meson.build.orig 2020-08-03 08:10:28 UTC +++ tests/meson.build @@ -57,7 +57,6 @@ tests = [ 'activity', 'app-grid-button', 'app-list-model', - 'connectivity-info', 'favourite-model', 'media-player', 'notification',