From 6d36d2741727a1f32f74088555cf328c0b1857e5 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 27 Jun 2021 21:34:12 +0200 Subject: [PATCH] main/postmarketos-ui-phosh: don't set GDK_BACKEND=wayland (MR 2235) This causes issues with some programs, chiefly that gsd-xsetttings does not start properly. GDK_BACKEND=wayland is only really necessary to make Firefox run in Wayland mode anyway - other GTK 3/4 apps use it automatically. Firefox will be set to use Wayland via a following commit. --- main/postmarketos-ui-phosh/APKBUILD | 6 +----- main/postmarketos-ui-phosh/gtk-app-wayland.sh | 5 ----- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 main/postmarketos-ui-phosh/gtk-app-wayland.sh diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index fdd7416e6..85c66471d 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-phosh -pkgver=10 +pkgver=11 pkgrel=0 pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)" url="https://puri.sm" @@ -51,7 +51,6 @@ source=" 01-phoc-scaling 02-gnome-software-no-first-run dconf-profile-postmarketos - gtk-app-wayland.sh mimeapps.list mpris-proxy.desktop osk.sh @@ -63,8 +62,6 @@ options="!check" package() { install -Dm644 "$srcdir"/000-gschema.override \ "$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override - install -Dm755 "$srcdir"/gtk-app-wayland.sh \ - "$pkgdir"/etc/profile.d/gtk-app-wayland.sh install -Dm755 "$srcdir"/osk.sh \ "$pkgdir"/usr/bin/osk-wayland install -Dm755 "$srcdir"/dconf-profile-postmarketos \ @@ -91,7 +88,6 @@ b8f9bf9174c30ca5e7fe7533d119af18c73bd7c2509d7cfb1ef49a15cd1e28a35dad467d39f34d1c 4a60c08c86688f2d92820bc07305fe1bcff54986d29ee5dd84c7902ea5247b73b96f7453d2da9931a19903b2f5825b8a636f92edcf89bc205a7d389defea0b0e 01-phoc-scaling 834d1c558b6a9ca26345928895a5436919aab13f944410240516953a13f8fdafae995af4b1baeee560a800c405a4d67c44bb92499bf8cacae7a17f6d9893577e 02-gnome-software-no-first-run e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178 dconf-profile-postmarketos -57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh 0a376140da36538fd73cbd8305ff97b54d2b82831bab64a3b7167019f1d005752eda4e81ef7c19fd64fcba3a775c9e87fca1a250b55a522a0ee9728ab712f089 mimeapps.list 9276b4282860229da47b8b690307a8bf8907370fcdebf0be4c2b71f933593e115572e61d846cb13821d51859ec9e53af6de250afa953b42c06cf0ad4905377c3 mpris-proxy.desktop 4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a osk.sh diff --git a/main/postmarketos-ui-phosh/gtk-app-wayland.sh b/main/postmarketos-ui-phosh/gtk-app-wayland.sh deleted file mode 100644 index 9c4081090..000000000 --- a/main/postmarketos-ui-phosh/gtk-app-wayland.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Most pure GTK3 apps use wayland by default, but some, -# like Firefox, need the backend to be explicitely selected. -export GDK_BACKEND=wayland