svn commit: r565085 - in head/x11/phosh: . files

[Jan Beich]

Author: jbeich
Date: Sat Feb 13 00:19:53 2021
New Revision: 565085
URL: https://svnweb.freebsd.org/changeset/ports/565085

Log:
  x11/phosh: update to 0.8.1
  
  Changes:	https://source.puri.sm/Librem5/phosh/-/tags/v0.8.1
  Reported by:	Repology

Modified:
  head/x11/phosh/Makefile   (contents, props changed)
  head/x11/phosh/distinfo   (contents, props changed)
  head/x11/phosh/files/patch-no-libnm   (contents, props changed)

Modified: head/x11/phosh/Makefile
==============================================================================
--- head/x11/phosh/Makefile	Fri Feb 12 23:58:53 2021	(r565084)
+++ head/x11/phosh/Makefile	Sat Feb 13 00:19:53 2021	(r565085)
@@ -2,7 +2,7 @@
 
 PORTNAME=	phosh
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.0
+DISTVERSION=	0.8.1
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -27,7 +27,7 @@ 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

Modified: head/x11/phosh/distinfo
==============================================================================
--- head/x11/phosh/distinfo	Fri Feb 12 23:58:53 2021	(r565084)
+++ head/x11/phosh/distinfo	Sat Feb 13 00:19:53 2021	(r565085)
@@ -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

Modified: head/x11/phosh/files/patch-no-libnm
==============================================================================
--- head/x11/phosh/files/patch-no-libnm	Fri Feb 12 23:58:53 2021	(r565084)
+++ head/x11/phosh/files/patch-no-libnm	Sat Feb 13 00:19:53 2021	(r565085)
@@ -59,35 +59,25 @@ meson.build:134:0: ERROR: Dependency "libnm" not found
    '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;
@@ -95,7 +85,7 @@ meson.build:134:0: ERROR: Dependency "libnm" not found
    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);
@@ -103,15 +93,23 @@ meson.build:134:0: ERROR: Dependency "libnm" not found
    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;
  }