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

main/postmarketos-ui-phosh: remove workaround for starting gsd-xsettings (MR 2235)

Browse source 
This reverts commit d7bcaece8e.

The following commit fixes this in a better manner by not setting
GDK_BACKEND=wayland.
This commit is contained in:
Newbyte 2021-06-27 21:27:17 +02:00 committed by Clayton Craft
parent 7cd9a2d246
commit 32e78c7933
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ _pmb_recommends="calls
_pmb_groups="feedbackd" _pmb_groups="feedbackd"
subpackages="$pkgname-qt_tweaks" subpackages="$pkgname-qt_tweaks"
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
@ -55,7 +54,6 @@ 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
phosh-qt-mobile-controls.sh phosh-qt-mobile-controls.sh
phosh-qt-wayland.sh phosh-qt-wayland.sh
@ -79,8 +77,6 @@ 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() {
@ -98,7 +94,6 @@ e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742e
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
bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 phosh-qt-mobile-controls.sh bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 phosh-qt-mobile-controls.sh
6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 phosh-qt-wayland.sh 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 phosh-qt-wayland.sh

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

@ -1,10 +0,0 @@
[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