xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in |    1 +
 hw/xwayland/meson.build                                 |   10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 9a7fb3a1539246c9e4d03eda7639d6d0943b5a89
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Mar 18 17:50:00 2024 +0100

    xwayland: Use "-decorate" if available
    
    That allows to open new Xwayland decorated windows as needed (e.g. using
    the "New window" entry from the launcher)
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1421>

diff --git a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
index 6a9d9fc4b..106c8bc76 100644
--- a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
+++ b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
@@ -4,5 +4,5 @@ Comment=A rootful instance of the Xwayland X11 server
 Terminal=false
 Type=Application
 Categories=System;
-Exec=@XWAYLAND@ -displayfd 1
+Exec=@XWAYLAND@ @DECORATE@ -displayfd 1
 NoDisplay=true
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 3bb7f88c0..ee05749d7 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -197,6 +197,7 @@ install_man(xwayland_manpage)
 
 desktop_data = configuration_data()
 desktop_data.set('XWAYLAND', xwayland_server.full_path())
+desktop_data.set('DECORATE', have_libdecor ? '-decorate' : '')
 desktop_file = configure_file(
     input: 'desktop/org.freedesktop.Xwayland.desktop.in',
     output: 'org.freedesktop.Xwayland.desktop',
commit fbf5e26b5c0b96828c3b34be7be6bceac1819a23
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Mar 18 17:48:56 2024 +0100

    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/1421>

diff --git a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
similarity index 83%
rename from hw/xwayland/desktop/org.freedesktop.Xwayland.desktop
rename to hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
index 32c3e78b2..6a9d9fc4b 100644
--- a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop
+++ b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
@@ -4,5 +4,5 @@ Comment=A rootful instance of the Xwayland X11 server
 Terminal=false
 Type=Application
 Categories=System;
-Exec=Xwayland -displayfd 1
+Exec=@XWAYLAND@ -displayfd 1
 NoDisplay=true
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 4d878dae8..3bb7f88c0 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -195,9 +195,16 @@ xwayland_manpage = configure_file(
 )
 install_man(xwayland_manpage)
 
+desktop_data = configuration_data()
+desktop_data.set('XWAYLAND', xwayland_server.full_path())
+desktop_file = configure_file(
+    input: 'desktop/org.freedesktop.Xwayland.desktop.in',
+    output: 'org.freedesktop.Xwayland.desktop',
+    configuration: desktop_data,
+)
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
 desktopdir = join_paths(datadir, 'applications')
-install_data('desktop/org.freedesktop.Xwayland.desktop', install_dir : desktopdir)
+install_data(desktop_file, install_dir : desktopdir)
 
 meson.override_find_program('Xwayland', xwayland_server)
 meson.override_dependency('xwayland', declare_dependency(
commit 66b371f3064cdfc549422d45bcd49a175368adfa
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Mar 18 17:05:55 2024 +0100

    xwayland: Add the Exec key to the desktop file
    
    This was intentionally left out, but it's against the spec.
    
    Add an Exec key to be conformant.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1654
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1421>

diff --git a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop
index d0122adf5..32c3e78b2 100644
--- a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop
+++ b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop
@@ -4,4 +4,5 @@ Comment=A rootful instance of the Xwayland X11 server
 Terminal=false
 Type=Application
 Categories=System;
+Exec=Xwayland -displayfd 1
 NoDisplay=true