Commit 306f7e7f authored by Philip Müller's avatar Philip Müller
Browse files

[pkg-upd] 0.9.0+42+g403ce64-2

- try to fix locale
- see also manjaro-arm/issues/pinephone/phosh#56
- see also manjaro-arm/issues/pinephone/phosh#68
parent 3ecfc9b8
Pipeline #2879 failed with stage
in 4 minutes and 57 seconds
diff -Npur a/phosh/data/phosh.in b/phosh/data/phosh.in
--- a/phosh/data/phosh.in 2021-03-20 13:53:32.367786000 +0100
+++ b/phosh/data/phosh.in 2021-03-20 13:55:19.327789721 +0100
@@ -56,6 +56,10 @@ elif [ -f /etc/phosh/rootston.ini ]; th
PHOC_INI=/etc/phosh/rootston.ini
fi
+# Set proper locale according to /etc/locale.conf
+source /etc/locale.conf
+export LANG=$LANG
+
# Run gnome-session through a login shell so it picks
# variables from /etc/profile.d (XDG_*)
[ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput
......@@ -2,9 +2,9 @@
# Contributor: Philip Goto <philip.goto@gmail.com>
pkgname=phosh
pkgver=0.9.0+33+gd7e48c8
pkgver=0.9.0+42+g403ce64
_commit=403ce64610ae3a0ad2d22fe74d259dde740a765c
pkgrel=1
pkgrel=2
pkgdesc="A pure Wayland shell prototype for GNOME on mobile devices"
url="https://source.puri.sm/Librem5/phosh"
license=("GPL3")
......@@ -17,19 +17,19 @@ source=(#"git+https://source.puri.sm/Librem5/phosh.git#commit=${_commit}"
"git+https://source.puri.sm/philm/phosh.git#commit=${_commit}"
"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
0001-system-prompt-allow-blank-passwords.patch
0002-fix-locale-issue.patch
MR434.patch
MR434-fix-rotation-on-a-PP.patch
"pam_phosh"
"sm.puri.OSK0.desktop"
"phosh.service")
"sm.puri.OSK0.desktop")
sha256sums=('SKIP'
'SKIP'
'0c5a2dbd0512ab8eca6e667f04ba03ec1b0d2896237b10d239aca63cfc19919e'
'7a0449a8d469953e87f14729e37ce5d785d8977cbcdf8825a57f832384b4a3d0'
'cacfed29c1abefd0ccdd78ebe8f4d5bfd0d709a60f3eac37093e7ce565bc390a'
'76607a3c283546a072965a444bfc1d5f99d74576b27627fa5ecfd670d5da21ad'
'b7793f80c533e84ad8adfe8bb46c69f107575e724aa9b53b41f370baa37e4fd5'
'f0faa73bb7793b7628b6a4ea8ab0059e13f5d46435efee2f4b8d8ac256311372'
'4506a91ccbfdc5c71edd2776024bc667a7f21959b4fd2e4cfae7f82097938a28')
'f0faa73bb7793b7628b6a4ea8ab0059e13f5d46435efee2f4b8d8ac256311372')
pkgver() {
cd $pkgname
......@@ -70,7 +70,7 @@ build() {
package() {
DESTDIR="${pkgdir}" ninja -C build install
install -Dm644 "$srcdir"/phosh.service \
install -Dm644 "$srcdir"/$pkgname/data/phosh.service \
"$pkgdir"/usr/lib/systemd/system/phosh.service
install -Dm644 "$srcdir"/pam_phosh \
"$pkgdir"/etc/pam.d/phosh
......
[Unit]
Description=Phosh, a shell for mobile phones
Documentation=https://source.puri.sm/Librem5/phosh
# Make sure we are started after logins are permitted.
After=systemd-user-sessions.service
# If Plymouth is used, we want to start when it is on its way out.
After=plymouth-quit-wait.service
# D-Bus is necessary for contacting logind. Logind is required.
Wants=dbus.socket
After=dbus.socket
# This scope is created by pam_systemd when logging in as the user.
# This directive is a workaround to a systemd bug, where the setup of the
# user session by PAM has some race condition, possibly leading to a failure.
# See README for more details.
After=session-c1.scope
# Since we are part of the graphical session, make sure we are started before
# it is complete.
Before=graphical.target
# Prevent starting on systems without virtual consoles
ConditionPathExists=/dev/tty0
[Service]
Environment=XDG_CURRENT_DESKTOP=GNOME
Environment=XDG_SESSION_DESKTOP=phosh
Environment=XDG_SESSION_TYPE=wayland
ExecStart=/usr/bin/phosh
TimeoutStartSec=30
User=1000
PAMName=login
WorkingDirectory=~
Restart=always
RestartSec=5s
# A virtual terminal is needed.
TTYPath=/dev/tty7
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
# Fail to start if not controlling the tty.
StandardInput=tty-fail
StandardOutput=journal
StandardError=journal
# Log this user with utmp, letting it show up with commands 'w' and 'who'.
UtmpIdentifier=tty7
UtmpMode=user
[Install]
WantedBy=graphical.target
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment