xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xwayland/meson.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 41c3155fdf71cd17d374f0e0a4fdf2830a354f04
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Apr 17 15:59:44 2024 +0200

    xwayland: Use exec name instead of hardcoding '/Xwayland'
    
    Use the target name instead of hardcoding the 'Xwayland' executable
    name, along with the / operator.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1490>

diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index bca6a899a..458f3c09e 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -184,7 +184,7 @@ pkgconfig.generate(
     description: 'X Server for Wayland',
     variables: [
         'exec_prefix=${prefix}',
-        'xwayland=' + xwayland_path + '/Xwayland',
+        'xwayland=' + xwayland_path / xwayland_server.name(),
     ] + xwayland_vars,
 )
 
@@ -196,7 +196,7 @@ xwayland_manpage = configure_file(
 install_man(xwayland_manpage)
 
 desktop_data = configuration_data()
-desktop_data.set('XWAYLAND', xwayland_path + '/Xwayland'))
+desktop_data.set('XWAYLAND', xwayland_path / xwayland_server.name())
 desktop_data.set('DECORATE', have_libdecor ? '-decorate' : '')
 desktop_file = configure_file(
     input: 'desktop/org.freedesktop.Xwayland.desktop.in',
commit 8ff88ffec9fc3d842b54f6a90cffda752cab3e40
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Apr 17 15:13:06 2024 +0200

    xwayland: Use the path to Xwayland as installed
    
    Otherwise the executable cannot be found where specified.
    
    v2: Use 'xwayland_path' (Simon)
    
    Fixes: fbf5e26b5 - xwayland: Use full path for Xwayland exec
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1490>

diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 9b1e5b6ce..bca6a899a 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -196,7 +196,7 @@ xwayland_manpage = configure_file(
 install_man(xwayland_manpage)
 
 desktop_data = configuration_data()
-desktop_data.set('XWAYLAND', xwayland_server.full_path())
+desktop_data.set('XWAYLAND', xwayland_path + '/Xwayland'))
 desktop_data.set('DECORATE', have_libdecor ? '-decorate' : '')
 desktop_file = configure_file(
     input: 'desktop/org.freedesktop.Xwayland.desktop.in',