commit: b9101c9850fe395e71fb0086082d9d8b8d04e305
Author: Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
AuthorDate: Wed Jan 26 02:03:53 2022 +0000
Commit: Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
CommitDate: Wed Jan 26 02:03:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b9101c98
gui-wm/phosh: Version bump to 0.15.0
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver.nl>
gui-wm/phosh/Manifest | 4 ++--
gui-wm/phosh/files/phosh.service | 8 ++++++--
gui-wm/phosh/files/sm.puri.OSK0.desktop | 2 +-
gui-wm/phosh/{phosh-0.14.1.ebuild => phosh-0.15.0.ebuild} | 13 ++++---------
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/gui-wm/phosh/Manifest b/gui-wm/phosh/Manifest
index bd8a75c2a..e305366f1 100644
--- a/gui-wm/phosh/Manifest
+++ b/gui-wm/phosh/Manifest
@@ -1,3 +1,3 @@
-DIST libcall-ui-0d255a96cc166d890e8785d3acbe04c269401af0.tar.gz 153233 BLAKE2B
ad0b1e91f824aeac1f1bc8a61360e02d629784b9ea0fa39e14d0f607d36c162ad5a71fc0de040d644f906e06d3abde5968f379ceb6b238802a74dfb1849928d2
SHA512
52a8d6ea6b77e0118280cbbf87546bc60f019277cb21d1afb1dfdf62728fba0171beb4063427957852a00cbdc6daea540e022a48d2538c706c3ea57615f72691
+DIST libcall-ui-5c79ccfc017db217d3a23a211919604083438846.tar.gz 153925 BLAKE2B
21ce9280b8c39e8ee459b24dc92cb465053f68c507743c771ef6a24434f3b2b96c0791ecedd895129264fb036400ccdde4722916662b684a6e85f65513e7543e
SHA512
e9c22efe724c3cfa9cc233f2abdea65c4ed6d366c9fd36c7865dbd7afb458f360ba7533dbb9898d705344f61f67b9232546466f322f29d508c12239ee288a488
DIST libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057.tar.gz
45164 BLAKE2B
c6807f855e7d4f45b58c7776cd497077b4adf8d577f9af014a8631a054c47374dfe5caa5652be208c6e566bfb8af70a0bb5e164f345b7612cb8786039625a191
SHA512
723334bff55927363dab47ef22c71dcaf94263fe76e49c40f1cbfbd5f86383e68fd4bf2182eb5777dda8e2ede4ee4710e1a7ab1379d3ca40d68f68ff30c62e21
-DIST phosh-v0.14.1.tar.gz 620452 BLAKE2B
631902ad639e1b9f8dfe956df27b7cb245f64098b36387ca66fcc801367e19fe20e10fd24f77e5d51290c9260cc34a23098d11be1515764c89f0fff1be1b36cc
SHA512
21220e6db097352e3a137fe80cae541e6f995fb38b44f19cf7134a156cdd5731518d19cafec82874e55019a4e562a82e67ace4df077e9cb00d4cce6875f0ae1b
+DIST phosh-v0.15.0.tar.gz 707553 BLAKE2B
b19a57a7913168efb650d5d8b1534d0065e8868354fff9195afb4943a7692e72f7c68d917a89f9d475c67720d76e41b96ff93952bb4bb9e2796d3d304970cd50
SHA512
bd560cb7446e27a2d4f8c59de93a27b63157cc151547cb224035f9d4b01275ca1c96dc341842cec0f213b332a63fb130c173af4e1ad990e6b42813eda41d3e4b
diff --git a/gui-wm/phosh/files/phosh.service b/gui-wm/phosh/files/phosh.service
index 698cdf0ed..6a1bda33c 100644
--- a/gui-wm/phosh/files/phosh.service
+++ b/gui-wm/phosh/files/phosh.service
@@ -1,6 +1,6 @@
[Unit]
Description=Phosh, a shell for mobile phones
-Documentation=https://source.puri.sm/Librem5/phosh
+Documentation=https://gitlab.gnome.org/World/Phosh/phosh
# Make sure we are started after logins are permitted.
After=systemd-user-sessions.service
@@ -25,12 +25,16 @@ Before=graphical.target
ConditionPathExists=/dev/tty0
[Service]
+Environment=LANG=C.UTF-8
+Environment=XDG_CURRENT_DESKTOP=GNOME:Phosh
+Environment=XDG_SESSION_DESKTOP=phosh
+Environment=XDG_SESSION_TYPE=wayland
ExecStart=/usr/bin/phosh
TimeoutStartSec=30
User=1000
PAMName=login
WorkingDirectory=~
-Restart=on-failure
+Restart=always
RestartSec=5s
# A virtual terminal is needed.
diff --git a/gui-wm/phosh/files/sm.puri.OSK0.desktop
b/gui-wm/phosh/files/sm.puri.OSK0.desktop
index bb075694b..e4a875340 100644
--- a/gui-wm/phosh/files/sm.puri.OSK0.desktop
+++ b/gui-wm/phosh/files/sm.puri.OSK0.desktop
@@ -2,7 +2,7 @@
Type=Application
Name=On-screen keyboard
Comment=Default on-screen keyboard
-Exec=/usr/bin/osk-wayland
+Exec=/usr/bin/phosh-osk-stub
Categories=GNOME;Core;
OnlyShowIn=GNOME;
NoDisplay=true
diff --git a/gui-wm/phosh/phosh-0.14.1.ebuild b/gui-wm/phosh/phosh-0.15.0.ebuild
similarity index 86%
rename from gui-wm/phosh/phosh-0.14.1.ebuild
rename to gui-wm/phosh/phosh-0.15.0.ebuild
index a84f5bf3c..68a68fcba 100644
--- a/gui-wm/phosh/phosh-0.14.1.ebuild
+++ b/gui-wm/phosh/phosh-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit desktop gnome2-utils meson pam readme.gentoo-r1 vala
systemd xdg
MY_P="${PN}-v${PV}"
LVC_COMMIT="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
-LCU_COMMIT="0d255a96cc166d890e8785d3acbe04c269401af0"
+LCU_COMMIT="5c79ccfc017db217d3a23a211919604083438846"
DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/";
@@ -46,12 +46,6 @@ BDEPEND="
dev-util/meson
"
-PATCHES=(
- "${FILESDIR}"/0001-system-prompt-allow-blank-passwords.patch
- "${FILESDIR}"/0002-fix-locale-issue.patch
- "${FILESDIR}"/0003-fix-locale-issue-in-service-file-1.patch
-)
-
src_prepare() {
default
eapply_user
@@ -66,7 +60,8 @@ src_install() {
meson_src_install
newpamd "${FILESDIR}"/pam_phosh 'phosh'
systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
- domenu "${FILESDIR}"/sm.puri.OSK0.desktop
+ insinto /usr/share/applications/
+ doins "${FILESDIR}"/sm.puri.OSK0.desktop
DOC_CONTENTS="To amend the existing password policy please see the man
5 passwdqc.conf
page and then edit the
/etc/security/passwdqc.conf file to change enforce=none
