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

postmarketos-ui-phosh: add workaround for starting gsd-xsettings (MR 2233)

Browse source 
This package sets GDK_BACKEND=wayland (in gtk-app-wayland.sh), and some
apps (firefox) still need that set to work. gsd-xsettings, which is
launched explicitly by Phosh 0.11.0+, does not work when this var is set
to wayland.
This commit is contained in:
Clayton Craft 2021-06-08 08:46:44 -07:00 committed by Oliver Smith
parent b76c2551b2
commit d7bcaece8e
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=postmarketos-ui-phosh pkgname=postmarketos-ui-phosh
pkgver=6 pkgver=7
pkgrel=10 pkgrel=0
pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)" pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)"
url="https://puri.sm" url="https://puri.sm"
arch="noarch !armhf" arch="noarch !armhf"
@ -44,6 +44,7 @@ _pmb_recommends="calls
_pmb_groups="feedbackd" _pmb_groups="feedbackd"
subpackages="$pkgname-qt_tweaks $pkgname-pipewire" subpackages="$pkgname-qt_tweaks $pkgname-pipewire"
install="$pkgname.post-install $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
replaces="gnome-settings-daemon"
source=" source="
000-gschema.override 000-gschema.override
01-phoc-scaling 01-phoc-scaling
@ -52,10 +53,11 @@ source="
gtk-app-wayland.sh gtk-app-wayland.sh
mimeapps.list mimeapps.list
mpris-proxy.desktop mpris-proxy.desktop
org.gnome.SettingsDaemon.XSettings.desktop
osk.sh osk.sh
pipewire.desktop
phosh-qt-mobile-controls.sh phosh-qt-mobile-controls.sh
phosh-qt-wayland.sh phosh-qt-wayland.sh
pipewire.desktop
" "
options="!check" options="!check"
@ -76,6 +78,8 @@ package() {
"$pkgdir"/etc/dconf/db/postmarketos.d/02-gnome-software-no-first-run "$pkgdir"/etc/dconf/db/postmarketos.d/02-gnome-software-no-first-run
install -Dm644 "$srcdir"/mpris-proxy.desktop \ install -Dm644 "$srcdir"/mpris-proxy.desktop \
"$pkgdir"/etc/xdg/autostart/mpris-proxy.desktop "$pkgdir"/etc/xdg/autostart/mpris-proxy.desktop
install -Dm644 "$srcdir"/org.gnome.SettingsDaemon.XSettings.desktop \
"$pkgdir"/etc/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
} }
qt_tweaks() { qt_tweaks() {
@ -94,14 +98,17 @@ pipewire() {
install -Dm644 "$srcdir"/pipewire.desktop \ install -Dm644 "$srcdir"/pipewire.desktop \
-t "$subpkgdir"/etc/xdg/autostart/ -t "$subpkgdir"/etc/xdg/autostart/
} }
sha512sums="77a8aec2a43829422481c17beaf4224d686cc973f80d72be383103a6be0bf5d0689486c50a1dffecf9f2605bd607647e23ab539dc283978792d248625ab327d5 000-gschema.override sha512sums="
77a8aec2a43829422481c17beaf4224d686cc973f80d72be383103a6be0bf5d0689486c50a1dffecf9f2605bd607647e23ab539dc283978792d248625ab327d5 000-gschema.override
4a60c08c86688f2d92820bc07305fe1bcff54986d29ee5dd84c7902ea5247b73b96f7453d2da9931a19903b2f5825b8a636f92edcf89bc205a7d389defea0b0e 01-phoc-scaling 4a60c08c86688f2d92820bc07305fe1bcff54986d29ee5dd84c7902ea5247b73b96f7453d2da9931a19903b2f5825b8a636f92edcf89bc205a7d389defea0b0e 01-phoc-scaling
834d1c558b6a9ca26345928895a5436919aab13f944410240516953a13f8fdafae995af4b1baeee560a800c405a4d67c44bb92499bf8cacae7a17f6d9893577e 02-gnome-software-no-first-run 834d1c558b6a9ca26345928895a5436919aab13f944410240516953a13f8fdafae995af4b1baeee560a800c405a4d67c44bb92499bf8cacae7a17f6d9893577e 02-gnome-software-no-first-run
e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178 dconf-profile-postmarketos e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178 dconf-profile-postmarketos
57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh 57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh
0a376140da36538fd73cbd8305ff97b54d2b82831bab64a3b7167019f1d005752eda4e81ef7c19fd64fcba3a775c9e87fca1a250b55a522a0ee9728ab712f089 mimeapps.list 0a376140da36538fd73cbd8305ff97b54d2b82831bab64a3b7167019f1d005752eda4e81ef7c19fd64fcba3a775c9e87fca1a250b55a522a0ee9728ab712f089 mimeapps.list
9276b4282860229da47b8b690307a8bf8907370fcdebf0be4c2b71f933593e115572e61d846cb13821d51859ec9e53af6de250afa953b42c06cf0ad4905377c3 mpris-proxy.desktop 9276b4282860229da47b8b690307a8bf8907370fcdebf0be4c2b71f933593e115572e61d846cb13821d51859ec9e53af6de250afa953b42c06cf0ad4905377c3 mpris-proxy.desktop
673cd3c947f5a9e62d487ea34ae5664ba4214bb9d002820415c635c2c1852cafc3f9325bf9070700f338de60ddc6dc85dbfad583193f4a83ccffb540660afdcd org.gnome.SettingsDaemon.XSettings.desktop
4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a osk.sh 4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a osk.sh
e499c5440e1690447ea0840898b577083be0387264e0b5c65e93ee5b4bdf7a01ad51814be4168d75e167451baebcd4cc37a55920a4240249b268dad8b180f540 pipewire.desktop
bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 phosh-qt-mobile-controls.sh bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 phosh-qt-mobile-controls.sh
6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 phosh-qt-wayland.sh" 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 phosh-qt-wayland.sh
e499c5440e1690447ea0840898b577083be0387264e0b5c65e93ee5b4bdf7a01ad51814be4168d75e167451baebcd4cc37a55920a4240249b268dad8b180f540 pipewire.desktop
"

10
main/postmarketos-ui-phosh/org.gnome.SettingsDaemon.XSettings.desktop Normal file
View file

@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Name=GNOME XSettings
Exec=env -u GDK_BACKEND /usr/libexec/gsd-xsettings
OnlyShowIn=GNOME;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
X-GNOME-Autostart-Notify=true
X-GNOME-AutoRestart=true
X-GNOME-HiddenUnderSystemd=false