Index: head/x11/phosh/Makefile =================================================================== --- head/x11/phosh/Makefile (revision 565084) +++ head/x11/phosh/Makefile (revision 565085) @@ -1,43 +1,43 @@ # $FreeBSD$ PORTNAME= phosh DISTVERSIONPREFIX= v -DISTVERSION= 0.8.0 +DISTVERSION= 0.8.1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org COMMENT= Pure Wayland shell prototype for mobile devices LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= wayland-protocols>=1.12:graphics/wayland-protocols LIB_DEPENDS= libfeedback-0.0.so:accessibility/feedbackd \ libpulse-mainloop-glib.so:audio/pulseaudio \ libwayland-client.so:graphics/wayland \ libgcr-ui-3.so:security/gcr \ libpolkit-agent-1.so:sysutils/polkit \ libupower-glib.so:sysutils/upower \ libhandy-1.so:x11-toolkits/libhandy RUN_DEPENDS= phoc:x11-wm/phoc \ gnome-session:x11/gnome-session USES= compiler:c11 gettext gnome meson pkgconfig python:build shebangfix USE_GITLAB= yes USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 GL_SITE= https://source.puri.sm GL_ACCOUNT= Librem5 -GL_COMMIT= f6fe549ec2b5656a071fb10f1443fc42f3fd3a94 +GL_COMMIT= d048a5e1cce62ba5a8ccc8b14bdd740eaf619825 GL_TUPLE= https://gitlab.gnome.org:GNOME:libgnome-volume-control:ae1a34aafce7026b8c0f65a43c9192d756fe1057:gvc/subprojects/gvc SHEBANG_FILES= build-aux/post_install.py MESON_ARGS= -Dgvc:alsa=false GLIB_SCHEMAS= 00_sm.puri.Phosh.gschema.override \ sm.puri.phosh.enums.xml \ sm.puri.phosh.gschema.xml post-patch: @${REINPLACE_CMD} -e 's/bash -l/sh -/' \ -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/data/phosh.in .include Index: head/x11/phosh/distinfo =================================================================== --- head/x11/phosh/distinfo (revision 565084) +++ head/x11/phosh/distinfo (revision 565085) @@ -1,5 +1,5 @@ -TIMESTAMP = 1610902165 -SHA256 (Librem5-phosh-f6fe549ec2b5656a071fb10f1443fc42f3fd3a94_GL0.tar.gz) = f46ecbdb634cb57254f45de53cde160833474de01b418b61bc05913d72ee93cb -SIZE (Librem5-phosh-f6fe549ec2b5656a071fb10f1443fc42f3fd3a94_GL0.tar.gz) = 383532 +TIMESTAMP = 1612900821 +SHA256 (Librem5-phosh-d048a5e1cce62ba5a8ccc8b14bdd740eaf619825_GL0.tar.gz) = 15f4f2fe9257bcb47db82c2c94485cc4d762fc92da66a0b1e66424f5862a3d3e +SIZE (Librem5-phosh-d048a5e1cce62ba5a8ccc8b14bdd740eaf619825_GL0.tar.gz) = 385119 SHA256 (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = 780143bef70698e402b099f300f5c82bfbb38ef5c3b6d89b1efeb7a45a5d8dc1 SIZE (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = 45245 Index: head/x11/phosh/files/patch-no-libnm =================================================================== --- head/x11/phosh/files/patch-no-libnm (revision 565084) +++ head/x11/phosh/files/patch-no-libnm (revision 565085) @@ -1,145 +1,143 @@ 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/panel.c.orig 2020-10-28 08:27:41 UTC -+++ src/panel.c -@@ -15,7 +15,6 @@ - #include "config.h" - +--- 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 "panel.h" - #include "shell.h" -@@ -379,7 +378,6 @@ phosh_panel_class_init (PhoshPanelClass *klass) - NULL, G_TYPE_NONE, 0); - - 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_SETTINGS); - ---- src/shell.c.orig 2020-09-18 11:42:34 UTC -+++ src/shell.c -@@ -48,7 +48,6 @@ - #include "session.h" - #include "system-prompter.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" -@@ -90,7 +89,6 @@ typedef struct +@@ -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; -@@ -344,7 +342,6 @@ phosh_shell_dispose (GObject *object) +@@ -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); -@@ -494,7 +491,6 @@ static void - type_setup (void) +@@ -510,7 +506,6 @@ type_setup (void) { - phosh_battery_info_get_type(); -- phosh_wifi_info_get_type(); - phosh_wwan_info_get_type(); + 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); } -@@ -784,21 +780,6 @@ phosh_shell_get_monitor_manager (PhoshShell *self) +@@ -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',