From owner-dev-commits-ports-all@freebsd.org Sat May 29 13:41:46 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ADF85640B3B; Sat, 29 May 2021 13:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FsjQL4KCvz3CF5; Sat, 29 May 2021 13:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B8A32FD0; Sat, 29 May 2021 13:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14TDfkxv060211; Sat, 29 May 2021 13:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14TDfkOW060210; Sat, 29 May 2021 13:41:46 GMT (envelope-from git) Date: Sat, 29 May 2021 13:41:46 GMT Message-Id: <202105291341.14TDfkOW060210@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bd9c84a2c7a3 - main - x11/phosh: update to 0.10.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd9c84a2c7a35a143f1585352be299ffe3788250 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2021 13:41:46 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd9c84a2c7a35a143f1585352be299ffe3788250 commit bd9c84a2c7a35a143f1585352be299ffe3788250 Author: Jan Beich AuthorDate: 2021-04-29 13:20:40 +0000 Commit: Jan Beich CommitDate: 2021-05-29 13:40:26 +0000 x11/phosh: update to 0.10.2 Changes: https://source.puri.sm/Librem5/phosh/-/releases/v0.9.0 Changes: https://source.puri.sm/Librem5/phosh/-/releases/v0.10.0 Changes: https://source.puri.sm/Librem5/phosh/-/releases/v0.10.1 Changes: https://source.puri.sm/Librem5/phosh/-/releases/v0.10.2 Reported by: Repology --- x11/phosh/Makefile | 5 ++- x11/phosh/distinfo | 6 ++-- x11/phosh/files/patch-no-libnm | 16 ++++----- x11/phosh/files/patch-no-rfkill | 75 +++++++++++++++++++++++++++++++++++++++++ x11/phosh/pkg-plist | 1 + 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/x11/phosh/Makefile b/x11/phosh/Makefile index f29f6e1441e2..ca20f7da9d8c 100644 --- a/x11/phosh/Makefile +++ b/x11/phosh/Makefile @@ -1,7 +1,6 @@ PORTNAME= phosh DISTVERSIONPREFIX= v -DISTVERSION= 0.8.1 -PORTREVISION= 1 +DISTVERSION= 0.10.2 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -27,7 +26,7 @@ USE_GITLAB= yes USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 GL_SITE= https://source.puri.sm GL_ACCOUNT= Librem5 -GL_COMMIT= d048a5e1cce62ba5a8ccc8b14bdd740eaf619825 +GL_COMMIT= cf35b4dae97db3b33369134ff9b3b082ac3dff72 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 diff --git a/x11/phosh/distinfo b/x11/phosh/distinfo index 344181e5632b..db52086a2727 100644 --- a/x11/phosh/distinfo +++ b/x11/phosh/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1617892690 -SHA256 (Librem5-phosh-d048a5e1cce62ba5a8ccc8b14bdd740eaf619825_GL0.tar.gz) = 7479d612e47b804dd97668edc9ef6d36db9d8ccb320ec579c126116d81e27923 -SIZE (Librem5-phosh-d048a5e1cce62ba5a8ccc8b14bdd740eaf619825_GL0.tar.gz) = 385584 +TIMESTAMP = 1619702440 +SHA256 (Librem5-phosh-cf35b4dae97db3b33369134ff9b3b082ac3dff72_GL0.tar.gz) = 4c8abad0329ed7d0d35949a75df897db4c2fc4b90f9ba80e259225847b61bd9b +SIZE (Librem5-phosh-cf35b4dae97db3b33369134ff9b3b082ac3dff72_GL0.tar.gz) = 432343 SHA256 (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = afc9a7c7fd6de8252430878a753b4dbfd09033a54055e4020ced3d26609143ee SIZE (GNOME-libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057_GL0.tar.gz) = 45164 diff --git a/x11/phosh/files/patch-no-libnm b/x11/phosh/files/patch-no-libnm index 28d7a61a771b..2405fe7df8cf 100644 --- a/x11/phosh/files/patch-no-libnm +++ b/x11/phosh/files/patch-no-libnm @@ -19,18 +19,18 @@ meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig 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.orig 2021-04-29 13:20:40 UTC +++ src/meson.build -@@ -52,8 +52,6 @@ libphosh_tool_sources = [ +@@ -58,8 +58,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 = [ + 'end-session-dialog.c', + 'end-session-dialog.h', + 'hks-info.c', +@@ -131,8 +129,6 @@ libphosh_sources = [ 'bt-info.h', 'bt-manager.c', 'bt-manager.h', @@ -39,7 +39,7 @@ meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig 'fader.c', 'fader.h', 'feedbackinfo.c', -@@ -120,8 +116,6 @@ libphosh_sources = [ +@@ -153,8 +149,6 @@ libphosh_sources = [ 'lockscreen.h', 'monitor-manager.c', 'monitor-manager.h', @@ -48,7 +48,7 @@ meson.build:134:0: ERROR: Dependency "libnm" not found, tried pkgconfig 'osk-manager.c', 'osk-manager.h', 'panel.c', -@@ -158,10 +152,6 @@ libphosh_sources = [ +@@ -195,10 +189,6 @@ libphosh_sources = [ 'torch-manager.h', 'toplevel.c', 'toplevel.h', diff --git a/x11/phosh/files/patch-no-rfkill b/x11/phosh/files/patch-no-rfkill new file mode 100644 index 000000000000..254013cb80ae --- /dev/null +++ b/x11/phosh/files/patch-no-rfkill @@ -0,0 +1,75 @@ +rfkill API differs between Linux and FreeBSD. + +src/hks-manager.c:18:10: fatal error: 'linux/rfkill.h' file not found +#include + ^~~~~~~~~~~~~~~~ + +--- src/meson.build.orig 2021-04-29 13:20:40 UTC ++++ src/meson.build +@@ -63,9 +61,5 @@ + 'end-session-dialog.c', + 'end-session-dialog.h', +- 'hks-info.c', +- 'hks-info.h', +- 'hks-manager.c', +- 'hks-manager.h', + 'docked-info.c', + 'docked-info.h', + 'docked-manager.c', +--- src/shell.c.orig 2021-04-29 13:20:40 UTC ++++ src/shell.c +@@ -36,7 +36,6 @@ + #include "feedbackinfo.h" + #include "feedback-manager.h" + #include "gnome-shell-manager.h" +-#include "hks-info.h" + #include "home.h" + #include "idle-manager.h" + #include "keyboard-events.h" +@@ -124,7 +123,6 @@ typedef struct + PhoshTorchManager *torch_manager; + PhoshModeManager *mode_manager; + PhoshDockedManager *docked_manager; +- PhoshHksManager *hks_manager; + PhoshKeyboardEvents *keyboard_events; + PhoshLocationManager *location_manager; + PhoshGnomeShellManager *gnome_shell_manager; +@@ -352,7 +350,6 @@ phosh_shell_dispose (GObject *object) + /* dispose managers in opposite order of declaration */ + g_clear_object (&priv->screenshot_manager); + g_clear_object (&priv->location_manager); +- g_clear_object (&priv->hks_manager); + g_clear_object (&priv->docked_manager); + g_clear_object (&priv->mode_manager); + g_clear_object (&priv->torch_manager); +@@ -534,7 +531,6 @@ type_setup (void) + 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_HKS_INFO); + g_type_ensure (PHOSH_TYPE_LOCATION_INFO); + g_type_ensure (PHOSH_TYPE_MEDIA_PLAYER); + g_type_ensure (PHOSH_TYPE_QUICK_SETTING); +@@ -1039,22 +1035,6 @@ phosh_shell_get_docked_manager (PhoshShell *self) + + g_return_val_if_fail (PHOSH_IS_DOCKED_MANAGER (priv->docked_manager), NULL); + return priv->docked_manager; +-} +- +- +-PhoshHksManager * +-phosh_shell_get_hks_manager (PhoshShell *self) +-{ +- PhoshShellPrivate *priv; +- +- g_return_val_if_fail (PHOSH_IS_SHELL (self), NULL); +- priv = phosh_shell_get_instance_private (self); +- +- if (!priv->hks_manager) +- priv->hks_manager = phosh_hks_manager_new (); +- +- g_return_val_if_fail (PHOSH_IS_HKS_MANAGER (priv->hks_manager), NULL); +- return priv->hks_manager; + } + + diff --git a/x11/phosh/pkg-plist b/x11/phosh/pkg-plist index 17ddfa92e22f..eba4120f579d 100644 --- a/x11/phosh/pkg-plist +++ b/x11/phosh/pkg-plist @@ -22,6 +22,7 @@ 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/ht/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