forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-ui-phosh: drop osk.sh (MR 3487)

Browse source 
Since c49d84f4ab1856156d26d59f5c88387776990d24 in Alpine's aports,
the sm.puri.OSK0.desktop service no longer tries to execute
/usr/bin/osk-wayland and instead just executes /usr/bin/squeekboard
directly, thus avoiding this needless indirection. virtboard hasn't
existed in postmarketOS for years at this point and squeekboard is
a hard dependency of phosh, so it's always going to be present
(thus making this check unnecessary) and the fallback if it isn't
wouldn't work anyway.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Newbyte 2022-10-03 20:32:05 +02:00 committed by Oliver Smith
parent c24bb158a6
commit c995738e07
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/postmarketos-ui-phosh/APKBUILD
View file

@ -1,7 +1,7 @@
# Reference: https://postmarketos.org/uipkg # Reference: https://postmarketos.org/uipkg
# Maintainer: Newbyte <newbyte@postmarketos.org> # Maintainer: Newbyte <newbyte@postmarketos.org>
pkgname=postmarketos-ui-phosh pkgname=postmarketos-ui-phosh
pkgver=22 pkgver=22.1
pkgrel=0 pkgrel=0
pkgdesc="(Wayland) Mobile UI developed for the Librem 5" pkgdesc="(Wayland) Mobile UI developed for the Librem 5"
url="https://puri.sm" url="https://puri.sm"
@ -61,7 +61,6 @@ source="
01_postmarketos-ui-phosh.gschema.override 01_postmarketos-ui-phosh.gschema.override
dconf-profile-postmarketos dconf-profile-postmarketos
mimeapps.list mimeapps.list
osk.sh
phosh-qt-mobile-controls.sh phosh-qt-mobile-controls.sh
phosh-qt-wayland.sh phosh-qt-wayland.sh
udiskie.desktop udiskie.desktop
@ -71,10 +70,6 @@ options="!check pmb:gpu-accel"
package() { package() {
install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \ install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \
-t "$pkgdir"/usr/share/glib-2.0/schemas/ -t "$pkgdir"/usr/share/glib-2.0/schemas/
# Alpine sm.puri.OSK0 service packaged in phosh does not hardcode
# squeekboard, executes /usr/bin/osk-wayland instead
install -Dm755 "$srcdir"/osk.sh \
"$pkgdir"/usr/bin/osk-wayland
install -Dm755 "$srcdir"/dconf-profile-postmarketos \ install -Dm755 "$srcdir"/dconf-profile-postmarketos \
"$pkgdir"/etc/dconf/profile/user "$pkgdir"/etc/dconf/profile/user
install -Dm644 "$srcdir"/mimeapps.list \ install -Dm644 "$srcdir"/mimeapps.list \
@ -96,7 +91,6 @@ sha512sums="
bfdef6d89015c34cbb9cf67f623f8d51f0b2d9665bca447c434ac14031ad13e8a5fe6fc63bdf52957bc6fd5404f2fe1321df8f5f2a9b945a2df09c741a2c672b 01_postmarketos-ui-phosh.gschema.override bfdef6d89015c34cbb9cf67f623f8d51f0b2d9665bca447c434ac14031ad13e8a5fe6fc63bdf52957bc6fd5404f2fe1321df8f5f2a9b945a2df09c741a2c672b 01_postmarketos-ui-phosh.gschema.override
e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178 dconf-profile-postmarketos e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178 dconf-profile-postmarketos
d58379d4dcbcc8df68e20c4a2f45dc320db5e9c383b8ffe2f3ba3815ebff46e8c1c32d18195800ac8b37adfab23ef4f985be2bf5da7ed3f10d15c5e3915c2fd3 mimeapps.list d58379d4dcbcc8df68e20c4a2f45dc320db5e9c383b8ffe2f3ba3815ebff46e8c1c32d18195800ac8b37adfab23ef4f985be2bf5da7ed3f10d15c5e3915c2fd3 mimeapps.list
4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a osk.sh
bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 phosh-qt-mobile-controls.sh bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 phosh-qt-mobile-controls.sh
6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 phosh-qt-wayland.sh 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 phosh-qt-wayland.sh
53f5c565b4ca8a12f12b63ec84a0194ef530703565d123203d41582a35a54d66afaf3a676df158ae0effe327dcfc1c6496a082ce9dbe803b2547417c3c3fad6e udiskie.desktop 53f5c565b4ca8a12f12b63ec84a0194ef530703565d123203d41582a35a54d66afaf3a676df158ae0effe327dcfc1c6496a082ce9dbe803b2547417c3c3fad6e udiskie.desktop

9
main/postmarketos-ui-phosh/osk.sh
View file

@ -1,9 +0,0 @@
#!/bin/sh
set -e
OSK=/usr/bin/virtboard
if [ -x /usr/bin/squeekboard ]; then
OSK=/usr/bin/squeekboard
fi
exec $OSK