Index: head/x11/phosh/Makefile =================================================================== --- head/x11/phosh/Makefile (revision 558418) +++ head/x11/phosh/Makefile (revision 558419) @@ -1,42 +1,42 @@ # $FreeBSD$ PORTNAME= phosh DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0 +DISTVERSION= 0.7.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= 34720663adadc6959dac293ee7371354be26cfa8 +GL_COMMIT= c343fd9e4eb96796fff53a638316cb1b20b5866c 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= 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 558418) +++ head/x11/phosh/distinfo (revision 558419) @@ -1,5 +1,5 @@ -TIMESTAMP = 1607605311 -SHA256 (Librem5-phosh-34720663adadc6959dac293ee7371354be26cfa8_GL0.tar.gz) = a0883ed16448004ef2d6b109c27c42f4ae6249a84b77712a1331206fdb3c1d8f -SIZE (Librem5-phosh-34720663adadc6959dac293ee7371354be26cfa8_GL0.tar.gz) = 368118 +TIMESTAMP = 1608303217 +SHA256 (Librem5-phosh-c343fd9e4eb96796fff53a638316cb1b20b5866c_GL0.tar.gz) = 40e174ae41a0d8f0070a7d3700716dbb9e4abb44461b07010b2f72587ed251d5 +SIZE (Librem5-phosh-c343fd9e4eb96796fff53a638316cb1b20b5866c_GL0.tar.gz) = 374411 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 558418) +++ head/x11/phosh/files/patch-no-libnm (revision 558419) @@ -1,143 +1,145 @@ 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-08-03 08:10:28 UTC +--- meson.build.orig 2020-12-18 14:53:37 UTC +++ meson.build -@@ -131,9 +131,9 @@ libhandy_dep = dependency('libhandy-0.0', +@@ -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" #include "bt-info.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 "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 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) 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) { phosh_battery_info_get_type(); - phosh_wifi_info_get_type(); phosh_wwan_info_get_type(); } @@ -784,21 +780,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', Index: head/x11/phosh/files/patch-no-logind =================================================================== --- head/x11/phosh/files/patch-no-logind (nonexistent) +++ head/x11/phosh/files/patch-no-logind (revision 558419) @@ -0,0 +1,77 @@ +(e)logind is Linux-only. FreeBSD supports libseat but it has a different API. + +--- meson.build.orig 2020-12-18 14:53:37 UTC ++++ meson.build +@@ -134,7 +134,7 @@ libhandy_dep = dependency('libhandy-1', + 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') ++libsystemd_dep = dependency('libsystemd', version: '>= 241', required: false) + 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') +--- src/util.c.orig 2020-12-18 14:53:37 UTC ++++ src/util.c +@@ -9,8 +9,6 @@ + #include "util.h" + #include + +-#include +- + /* Just wraps gtk_widget_destroy so we can use it with g_clear_pointer */ + void + phosh_cp_widget_destroy (void *widget) +@@ -97,51 +95,5 @@ phosh_munge_app_id (const char *app_id) + gboolean + phosh_find_systemd_session (char **session_id) + { +- int n_sessions; +- +- g_auto (GStrv) sessions = NULL; +- char *session; +- int i; +- +- n_sessions = sd_uid_get_sessions (getuid (), 0, &sessions); +- +- if (n_sessions < 0) { +- g_debug ("Failed to get sessions for user %d", getuid ()); +- return FALSE; +- } +- +- session = NULL; +- for (i = 0; i < n_sessions; i++) { +- int r; +- g_autofree char *type = NULL; +- g_autofree char *desktop = NULL; +- +- r = sd_session_get_desktop (sessions[i], &desktop); +- if (r < 0) { +- g_debug ("Couldn't get desktop for session '%s': %s", +- sessions[i], strerror (-r)); +- continue; +- } +- +- if (g_strcmp0 (desktop, "phosh") != 0) +- continue; +- +- r = sd_session_get_type (sessions[i], &type); +- if (r < 0) { +- g_debug ("Couldn't get type for session '%s': %s", +- sessions[i], strerror (-r)); +- continue; +- } +- +- if (g_strcmp0 (type, "wayland") != 0) +- continue; +- +- session = sessions[i]; +- break; +- } +- +- if (session != NULL) +- *session_id = g_strdup (session); +- +- return session != NULL; ++ return FALSE; + } Property changes on: head/x11/phosh/files/patch-no-logind ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/phosh/pkg-plist =================================================================== --- head/x11/phosh/pkg-plist (revision 558418) +++ head/x11/phosh/pkg-plist (revision 558419) @@ -1,45 +1,46 @@ bin/phosh bin/phosh-osk-stub libexec/phosh share/applications/sm.puri.OSK0.desktop share/applications/sm.puri.Phosh.desktop share/gnome-session/sessions/phosh.session share/locale/am/LC_MESSAGES/phosh.mo share/locale/ar/LC_MESSAGES/phosh.mo share/locale/bg/LC_MESSAGES/phosh.mo share/locale/ca/LC_MESSAGES/phosh.mo share/locale/cs/LC_MESSAGES/phosh.mo share/locale/da/LC_MESSAGES/phosh.mo share/locale/de/LC_MESSAGES/phosh.mo share/locale/el/LC_MESSAGES/phosh.mo share/locale/en_GB/LC_MESSAGES/phosh.mo share/locale/eo/LC_MESSAGES/phosh.mo share/locale/es/LC_MESSAGES/phosh.mo share/locale/es_ES/LC_MESSAGES/phosh.mo share/locale/eu/LC_MESSAGES/phosh.mo share/locale/fa/LC_MESSAGES/phosh.mo share/locale/fi/LC_MESSAGES/phosh.mo share/locale/fr/LC_MESSAGES/phosh.mo share/locale/fur/LC_MESSAGES/phosh.mo share/locale/he/LC_MESSAGES/phosh.mo share/locale/hu/LC_MESSAGES/phosh.mo +share/locale/id/LC_MESSAGES/phosh.mo share/locale/it/LC_MESSAGES/phosh.mo share/locale/ja/LC_MESSAGES/phosh.mo share/locale/ko/LC_MESSAGES/phosh.mo share/locale/la/LC_MESSAGES/phosh.mo share/locale/nb/LC_MESSAGES/phosh.mo share/locale/nl/LC_MESSAGES/phosh.mo share/locale/pl/LC_MESSAGES/phosh.mo share/locale/pt/LC_MESSAGES/phosh.mo share/locale/pt_BR/LC_MESSAGES/phosh.mo share/locale/ro/LC_MESSAGES/phosh.mo share/locale/ru/LC_MESSAGES/phosh.mo share/locale/sk/LC_MESSAGES/phosh.mo share/locale/sr/LC_MESSAGES/phosh.mo share/locale/sv/LC_MESSAGES/phosh.mo share/locale/tr/LC_MESSAGES/phosh.mo share/locale/uk/LC_MESSAGES/phosh.mo share/locale/zh_Hans_CN/LC_MESSAGES/phosh.mo share/locale/zh_TW/LC_MESSAGES/phosh.mo %%DATADIR%%/phoc.ini share/wayland-sessions/phosh.desktop