main/postmarketos-base-ui: avoid flatpak workaround conflict with adreno quirks

MR 6417 added a workaround for a GTK4 issue in flatpak by setting
GSK_RENDERER=ngl for all Qualcomm devices. This is now causing crashes on
many of the older Qualcomm devices that specifically avoid usage of the ngl
renderer. These devices already set a custom GSK_RENDERER in /etc/profile.d
(e.g. on MSM8916 devices: gl in v24.12, cairo in edge).

Several device packages install those settings into /etc/profile.d/adreno*
so let's avoid the conflict for now by reducing the priority of the flatpak
workaround and installing it to /etc/profile.d/99-flatpak*. That way the
setting from the device packages takes priority.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6434
This commit is contained in:
Minecrell 2025-04-20 19:48:54 +02:00 committed by Oliver Smith
parent 1510e69d9e
commit d976b06e74
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 4 additions and 4 deletions

View file

@ -1,7 +1,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=postmarketos-base-ui
pkgver=36
pkgrel=1
pkgrel=2
pkgdesc="Meta package for minimal postmarketOS UI base"
url="https://postmarketos.org"
arch="noarch"
@ -89,7 +89,7 @@ _source755="
etc/tinydm.d/env-wayland.d/50-sdl-wayland.sh
usr/lib/NetworkManager/dispatcher.d/50-dns-filter.sh
usr/lib/NetworkManager/dispatcher.d/50-tethering.sh
etc/profile.d/flatpak-qcom-workaround.sh
etc/profile.d/99-flatpak-qcom-workaround.sh
etc/profile.d/qt-mobile-controls.sh
etc/profile.d/qt-wayland.sh
"
@ -300,7 +300,7 @@ flatpak() {
amove usr/share/flatpak/remotes.d/flathub.flatpakrepo
# Workaround for:
# https://postmarketos.org/edge/2025/04/13/gtk4-flatpak-apps-fail-to-start/
amove etc/profile.d/flatpak-qcom-workaround.sh
amove etc/profile.d/99-flatpak-qcom-workaround.sh
}
sha512sums="
@ -329,7 +329,7 @@ d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc8435
ecaa57d033a119a53a6574c27636b7c89d659d75ea48a973a6a4ff6f90e5d07202529fd489bfc9dfc7430f5b60f40612f6d5c06f7fab47e681b0a3112a874058 rootfs-etc-tinydm.d-env-wayland.d-50-sdl-wayland.sh
36e0037f6d26a99db7b47831263be610d594e2c1c4a8ee7f6fc8b41092f501d3064d80b80ddf6a82b616bd2da09aa4da896074ad9f7fd53aba7e397da4190d22 rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
802c8ca1603c6bc536f83ea7158f9fb9cf0dd94c59cadab9d059c738ca6bc5c1deb1c982996efd3b1909d01592e5a3e32f005c043e203a83361d3c64994b713b rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
896242cbf0260c96fe3d0efd717352ea51458eab83a2414e735b8443eabbc0a98980b6b99976924f0fab4cc67d5c095fc760904c7111a8dd8ae37327983fab02 rootfs-etc-profile.d-flatpak-qcom-workaround.sh
896242cbf0260c96fe3d0efd717352ea51458eab83a2414e735b8443eabbc0a98980b6b99976924f0fab4cc67d5c095fc760904c7111a8dd8ae37327983fab02 rootfs-etc-profile.d-99-flatpak-qcom-workaround.sh
bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 rootfs-etc-profile.d-qt-mobile-controls.sh
6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 rootfs-etc-profile.d-qt-wayland.sh
"