x11/phosh: update to 0.4.4

Changes:	https://source.puri.sm/Librem5/phosh/-/tags/v0.4.4
Reported by:	Repology

4 files changed, 67 insertions, 27 deletions

diff --git a/x11/phosh/Makefile b/x11/phosh/Makefile
index ee341a534bbc..cf3bfb61b34e 100644
--- a/x11/phosh/Makefile
+++ b/x11/phosh/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	phosh
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.3
-PORTREVISION=	1
+DISTVERSION=	0.4.4
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -19,7 +18,7 @@ LIB_DEPENDS=	libfeedback-0.0.so:accessibility/feedbackd \
 		libgcr-ui-3.so:security/gcr \
 		libpolkit-agent-1.so:sysutils/polkit \
 		libupower-glib.so:sysutils/upower \
-		libhandy-0.0.so:x11-toolkits/libhandy0
+		libhandy-1.so:x11-toolkits/libhandy
 RUN_DEPENDS=	phoc:x11-wm/phoc \
 		gnome-session:x11/gnome-session
 
@@ -28,15 +27,11 @@ USE_GITLAB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3
 GL_SITE=	https://source.puri.sm
 GL_ACCOUNT=	Librem5
-GL_COMMIT=	99d18088f1e44a19db870649559451e91adf204e
+GL_COMMIT=	0592c987a6784312651ab3fec416d2bfd6291e6d
 GL_TUPLE=	https://gitlab.gnome.org:GNOME:libgnome-volume-control:ae1a34aafce7026b8c0f65a43c9192d756fe1057:gvc/subprojects/gvc
 MESON_ARGS=	-Dgvc:alsa=false
-PLIST_FILES=	bin/${PORTNAME} \
-		bin/${PORTNAME}-osk-stub \
-		libexec/${PORTNAME} \
-		${DATADIR}/phoc.ini \
-		share/wayland-sessions/${PORTNAME}.desktop
-GLIB_SCHEMAS=	sm.puri.phosh.gschema.xml
+GLIB_SCHEMAS=	sm.puri.phosh.enums.xml \
+		sm.puri.phosh.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/bash -l/sh -/' \
diff --git a/x11/phosh/distinfo b/x11/phosh/distinfo
index 12f0ec733aaa..f43576243ba9 100644
--- a/x11/phosh/distinfo
+++ b/x11/phosh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1596442228
-SHA256 (Librem5-phosh-99d18088f1e44a19db870649559451e91adf204e_GL0.tar.gz) = 1bb107f432289594ca564839772cac3960d930ef1e281bdec442558632c40f5f
-SIZE (Librem5-phosh-99d18088f1e44a19db870649559451e91adf204e_GL0.tar.gz) = 312123
+TIMESTAMP = 1600429354
+SHA256 (Librem5-phosh-0592c987a6784312651ab3fec416d2bfd6291e6d_GL0.tar.gz) = 6fde583db9bb6e02ca5132f4cf7e0d8076a9476ce34f71fd6bf912ea4ef99e65
+SIZE (Librem5-phosh-0592c987a6784312651ab3fec416d2bfd6291e6d_GL0.tar.gz) = 326181
 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 496d14d7020e..d608a2727c40 100644
--- a/x11/phosh/files/patch-no-libnm
+++ b/x11/phosh/files/patch-no-libnm
@@ -75,17 +75,17 @@ meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig
    g_type_ensure (PHOSH_TYPE_SETTINGS);
  
    gtk_widget_class_set_template_from_resource (widget_class,
---- src/shell.c.orig	2020-08-03 08:10:28 UTC
+--- src/shell.c.orig	2020-09-18 11:42:34 UTC
 +++ src/shell.c
-@@ -43,7 +43,6 @@
+@@ -48,7 +48,6 @@
  #include "session.h"
  #include "system-prompter.h"
  #include "util.h"
 -#include "wifiinfo.h"
  #include "wwaninfo.h"
- #include "bt-manager.h"
- 
-@@ -83,7 +82,6 @@ typedef struct
+ #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;
@@ -93,15 +93,15 @@ meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig
    PhoshPolkitAuthAgent *polkit_auth_agent;
    PhoshScreenSaverManager *screen_saver_manager;
    PhoshNotifyManager *notify_manager;
-@@ -332,7 +330,6 @@ phosh_shell_dispose (GObject *object)
-   g_clear_object (&priv->lockscreen_manager);
-   g_clear_object (&priv->monitor_manager);
-   g_clear_object (&priv->toplevel_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->polkit_auth_agent);
-   g_clear_object (&priv->background_manager);
-@@ -477,7 +474,6 @@ static void
+   g_clear_object (&priv->idle_manager);
+@@ -494,7 +491,6 @@ static void
  type_setup (void)
  {
    phosh_battery_info_get_type();
@@ -109,7 +109,7 @@ meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig
    phosh_wwan_info_get_type();
  }
  
-@@ -767,21 +763,6 @@ phosh_shell_get_monitor_manager (PhoshShell *self)
+@@ -784,21 +780,6 @@ phosh_shell_get_monitor_manager (PhoshShell *self)
    return priv->monitor_manager;
  }
  
@@ -129,8 +129,8 @@ meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig
 -  return priv->wifi_manager;
 -}
  
+ 
  PhoshBtManager *
- phosh_shell_get_bt_manager (PhoshShell *self)
 --- tests/meson.build.orig	2020-08-03 08:10:28 UTC
 +++ tests/meson.build
 @@ -57,7 +57,6 @@ tests = [
diff --git a/x11/phosh/pkg-plist b/x11/phosh/pkg-plist
new file mode 100644
index 000000000000..240f1f430766
--- /dev/null
+++ b/x11/phosh/pkg-plist
@@ -0,0 +1,45 @@
+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/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_BR/LC_MESSAGES/phosh.mo
+share/locale/pt_PT/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