SPS · log · files · refs · tags · releases · people · languages · GitHub · commit
42c40bb
mkiso: ship kwin_wayland_wrapper so Plasma can create a compositor
DistroDeveloperParents
Stat
bin/mkiso | 9 ++++++++- lib/mkiso/plasma-bins | 5 +++++ tests/test_mkiso.sh | 8 ++++++-- 3 files changed, 19 insertions(+), 3 deletions(-)
Diff
diff --git a/bin/mkiso b/bin/mkiso
index f344ea4..4954f7a 100755
--- a/bin/mkiso
+++ b/bin/mkiso
@@ -506,7 +506,8 @@ mkiso_copy_plasma()
/usr/lib64/libEGL.so* /usr/lib64/libGL.so* \
/usr/lib64/libEGL_mesa.so* /usr/lib64/libGLX_mesa.so* \
/usr/lib64/libgallium*.so* /usr/lib64/dri/libdril_dri.so \
- /usr/lib64/libLLVM.so /usr/lib64/libLLVM.so.[0-9]*
+ /usr/lib64/libLLVM.so /usr/lib64/libLLVM.so.[0-9]* \
+ /usr/lib64/libOpenGL.so* /usr/lib64/libxcb-cursor.so*
do
for mkiso_so in $mkiso_pat; do
[ -e "$mkiso_so" ] || continue
@@ -542,6 +543,12 @@ EOF
mkiso_copy_host_cmd "$mkiso_cmd" || :
done
mkiso_copy_path /usr/libexec/dbus-daemon-launch-helper
+ # startplasmacompositor looks up `qdbus` on PATH. This host ships qdbus6.
+ if [ -e "$mkiso_live/usr/bin/qdbus6" ] &&
+ [ ! -e "$mkiso_live/usr/bin/qdbus" ]
+ then
+ ln -sf qdbus6 "$mkiso_live/usr/bin/qdbus"
+ fi
mkdir -p "$mkiso_live/etc/systemd/system"
ln -sf /dev/null "$mkiso_live/etc/systemd/system/dbus.service"
ln -sf /dev/null "$mkiso_live/etc/systemd/system/dbus.socket"
diff --git a/lib/mkiso/plasma-bins b/lib/mkiso/plasma-bins
index 35d9c98..542e19e 100644
--- a/lib/mkiso/plasma-bins
+++ b/lib/mkiso/plasma-bins
@@ -5,7 +5,10 @@
/usr/bin/startplasma-wayland
/usr/bin/startplasma-x11
/usr/bin/kwin_wayland
+/usr/bin/kwin_wayland_wrapper
/usr/bin/kwin_x11
+/usr/libexec/kwin_dialog_helper
+/usr/libexec/kwin_killer_helper
/usr/bin/plasmashell
/usr/bin/plasma_session
/usr/bin/plasma_waitforname
@@ -42,6 +45,7 @@
/usr/bin/kpackagetool6
/usr/bin/qdbus
/usr/bin/qdbus6
+/usr/lib64/qt6/bin/qdbus
/usr/libexec/kf6/kconf_update
/usr/libexec/kf6/kio_http_cache_cleaner
/usr/libexec/kf6/kiod6
@@ -51,4 +55,5 @@
/usr/libexec/plasma-startup-sound
/usr/libexec/xdg-desktop-portal
/usr/libexec/xdg-desktop-portal-kde
+/usr/libexec/xdg-permission-store
diff --git a/tests/test_mkiso.sh b/tests/test_mkiso.sh
index 53d7b6a..d15220d 100755
--- a/tests/test_mkiso.sh
+++ b/tests/test_mkiso.sh
@@ -118,8 +118,12 @@ grep -q libgallium "$mkiso" ||
fail 'plasma ISO must copy Mesa libgallium'
grep -q 'video:x:18:root' "$layout/etc/group" ||
fail 'live group must include video for seatd/DRM'
-grep -q ksplashqml "$project_dir/lib/mkiso/plasma-bins" ||
- fail 'plasma-bins must include ksplashqml'
+grep -q kwin_wayland_wrapper "$project_dir/lib/mkiso/plasma-bins" ||
+ fail 'plasma-bins must include kwin_wayland_wrapper'
+grep -q xdg-permission-store "$project_dir/lib/mkiso/plasma-bins" ||
+ fail 'plasma-bins must include xdg-permission-store'
+grep -q libxcb-cursor "$mkiso" ||
+ fail 'plasma ISO must copy libxcb-cursor for the xcb QPA plugin'
grep -q plasma_waitforname "$project_dir/lib/mkiso/plasma-bins" ||
fail 'org.kde.KSplash.service Exec is plasma_waitforname'
grep -q -- '-comp zstd' "$mkiso" || fail 'mkiso must write a zstd squashfs'