Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/task-a733-xorg.lintian-overrides
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
task-a733-xorg: package-modifies-ld.so-search-path
task-a733-xorg: package-has-unnecessary-activation-of-ldconfig-trigger

# sddm-greeter-qt6 is just a hack
# sddm-greeter-qt6 and plasma-discover are wrapper scripts.
task-a733-xorg: no-manual-page
2 changes: 1 addition & 1 deletion debian/task-a733-xorg.postrm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ remove)
conflicts="
/usr/lib/xorg/modules/libglamoregl.so /usr/bin/sddm-greeter-qt6
/usr/lib/xorg/modules/drivers/modesetting_drv.so /usr/bin/Xorg
/usr/share/wayland-sessions/plasma.desktop
/usr/share/wayland-sessions/plasma.desktop /usr/bin/plasma-discover
"
for i in $conflicts; do
dpkg-divert --package xserver-xorg-img-bxm-1.21.1-2.deb --rename --remove "$i"
Expand Down
2 changes: 1 addition & 1 deletion debian/task-a733-xorg.preinst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ install | upgrade)
conflicts="
/usr/lib/xorg/modules/libglamoregl.so /usr/bin/sddm-greeter-qt6
/usr/lib/xorg/modules/drivers/modesetting_drv.so /usr/bin/Xorg
/usr/share/wayland-sessions/plasma.desktop
/usr/share/wayland-sessions/plasma.desktop /usr/bin/plasma-discover
"
for i in $conflicts; do
dpkg-divert --package xserver-xorg-img-bxm-1.21.1-2.deb --divert "$i.bak" --rename "$i"
Expand Down
10 changes: 10 additions & 0 deletions task-a733-xorg/usr/bin/plasma-discover
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh

# Trixie's kdeglobals intentionally does not force a Qt Quick backend. Keep
# this workaround local to Discover so the rest of Plasma can use BXM Vulkan.
unset QSG_RHI_BACKEND
export QT_QUICK_BACKEND="${QT_QUICK_BACKEND:-software}"
export QSG_RENDER_LOOP="${QSG_RENDER_LOOP:-basic}"
export QT_XCB_NO_MITSHM="${QT_XCB_NO_MITSHM:-1}"

exec /usr/bin/plasma-discover.bak "$@"
Loading