diff --git a/x11/phosh/Makefile b/x11/phosh/Makefile index 81b9b9d60e95..0382b02f7013 100644 --- a/x11/phosh/Makefile +++ b/x11/phosh/Makefile @@ -1,41 +1,41 @@ # $FreeBSD$ PORTNAME= phosh DISTVERSIONPREFIX= v -DISTVERSION= 0.4.5 +DISTVERSION= 0.5.0 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 USE_GITLAB= yes USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 GL_SITE= https://source.puri.sm GL_ACCOUNT= Librem5 -GL_COMMIT= 098eff0076011213dfaaa112236cc2a21eeea6b9 +GL_COMMIT= 8c03ae61bdefc5befc58e7db450c86ffbe9551d5 GL_TUPLE= https://gitlab.gnome.org:GNOME:libgnome-volume-control:ae1a34aafce7026b8c0f65a43c9192d756fe1057:gvc/subprojects/gvc 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 diff --git a/x11/phosh/distinfo b/x11/phosh/distinfo index bf376ad5a6bd..ca85b5492fca 100644 --- a/x11/phosh/distinfo +++ b/x11/phosh/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1602417061 -SHA256 (Librem5-phosh-098eff0076011213dfaaa112236cc2a21eeea6b9_GL0.tar.gz) = 89ba61f49047b44da9d58050765eb97223c941e718adf89d9782bad2636d9628 -SIZE (Librem5-phosh-098eff0076011213dfaaa112236cc2a21eeea6b9_GL0.tar.gz) = 341079 +TIMESTAMP = 1603873661 +SHA256 (Librem5-phosh-8c03ae61bdefc5befc58e7db450c86ffbe9551d5_GL0.tar.gz) = 0173e0b8588bb27a9a7c8eec87be6f57a1cc143adfe3e2efcb6bcda703a951dd +SIZE (Librem5-phosh-8c03ae61bdefc5befc58e7db450c86ffbe9551d5_GL0.tar.gz) = 350946 SHA256 (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = 780143bef70698e402b099f300f5c82bfbb38ef5c3b6d89b1efeb7a45a5d8dc1 SIZE (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = 45245 diff --git a/x11/phosh/files/patch-no-libnm b/x11/phosh/files/patch-no-libnm index d608a2727c40..5d181de5b504 100644 --- a/x11/phosh/files/patch-no-libnm +++ b/x11/phosh/files/patch-no-libnm @@ -1,143 +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-08-03 08:10:28 UTC +++ meson.build @@ -131,9 +131,9 @@ libhandy_dep = dependency('libhandy-0.0', 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') -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-08-03 08:10:28 UTC +--- src/meson.build.orig 2020-10-28 08:27:41 UTC +++ src/meson.build -@@ -50,8 +50,6 @@ libphosh_tool_sources = [ +@@ -52,8 +52,6 @@ libphosh_tool_sources = [ 'app-list-model.h', 'background.c', 'background.h', - 'connectivity-info.c', - 'connectivity-info.h', - 'favorite-list-model.c', - 'favorite-list-model.h', - 'feedback-manager.c', -@@ -92,8 +90,6 @@ libphosh_sources = [ + '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', -@@ -110,8 +106,6 @@ libphosh_sources = [ +@@ -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', -@@ -144,10 +138,6 @@ libphosh_sources = [ - 'toplevel-thumbnail.h', +@@ -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-08-03 08:10:28 UTC +--- src/panel.c.orig 2020-10-28 08:27:41 UTC +++ src/panel.c -@@ -13,7 +13,6 @@ +@@ -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" - #include "session.h" -@@ -371,7 +370,6 @@ phosh_panel_class_init (PhoshPanelClass *klass) +@@ -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); - gtk_widget_class_set_template_from_resource (widget_class, --- 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',