xserver: Branch 'master' - 3 commits

[Adam Jackson]

 hw/xfree86/meson.build           |   24 +++++++++++++-----------
 hw/xwin/meson.build              |    7 +++++++
 hw/xwin/winclipboard/meson.build |    7 +++++++
 meson.build                      |    4 ++--
 4 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit 27eff10bfa1a02da7338a82e2312d2080e3e5876
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sun May 13 19:36:05 2018 +0100

    meson: don't put literal 'PACKAGE_STRING' and 'XORG_MAN_PAGE' in man pages
    
    Instead, substitute the same values as autotools does
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/meson.build b/meson.build
index b89c3d426..650018c29 100644
--- a/meson.build
+++ b/meson.build
@@ -507,8 +507,8 @@ top_srcdir_inc = include_directories('.')
 serverconfigdir = join_paths(get_option('libdir'), 'xorg')
 
 manpage_config = configuration_data()
-manpage_config.set('vendorversion', 'PACKAGE_STRING XORG_MAN_PAGE')
-manpage_config.set('xorgversion', 'PACKAGE_STRING XORG_MAN_PAGE')
+manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))
+manpage_config.set('xorgversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))
 manpage_config.set('xservername', 'Xorg')
 manpage_config.set('xconfigfile', 'xorg.conf')
 manpage_config.set('projectroot', get_option('prefix'))
commit 47321bb455b1226c04711241496e62667eea34ea
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sun May 13 19:36:04 2018 +0100

    meson: don't install xorg wrapper manpages if suid-wrapper isn't being used
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 133c96d89..cacf56d4c 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -190,17 +190,19 @@ install_man(configure_file(
     configuration: manpage_config,
 ))
 
-install_man(configure_file(
-    input: 'man/Xorg.wrap.man',
-    output: 'Xorg.wrap.1',
-    configuration: manpage_config,
-))
-
-install_man(configure_file(
-    input: 'man/Xwrapper.config.man',
-    output: 'Xwrapper.config.5',
-    configuration: manpage_config,
-))
+if get_option('suid_wrapper')
+    install_man(configure_file(
+        input: 'man/Xorg.wrap.man',
+        output: 'Xorg.wrap.1',
+        configuration: manpage_config,
+    ))
+
+    install_man(configure_file(
+        input: 'man/Xwrapper.config.man',
+        output: 'Xwrapper.config.5',
+        configuration: manpage_config,
+    ))
+endif
 
 install_man(configure_file(
     input: 'man/xorg.conf.man',
commit 08a3583b5b2f812cc7f039aebd74ff9b1cb0dbcd
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sun May 13 19:36:03 2018 +0100

    meson: install xwinclip and Xwinrc man pages
    
    Omitted from a1e8dc05
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index 1bf9891ed..7e1375cfd 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -172,3 +172,10 @@ xwin_man = configure_file(
     configuration: manpage_config,
 )
 install_man(xwin_man)
+
+xwinrc_man = configure_file(
+    input: 'man/XWinrc.man',
+    output: 'XWinrc.5',
+    configuration: manpage_config,
+)
+install_man(xwinrc_man)
diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
index dd7b2d20e..0395eb32d 100644
--- a/hw/xwin/winclipboard/meson.build
+++ b/hw/xwin/winclipboard/meson.build
@@ -30,3 +30,10 @@ executable(
     dependencies: [dependency('x11')],
     install: true,
 )
+
+xwinclip_man = configure_file(
+    input: 'xwinclip.man',
+    output: 'xwinclip.1',
+    configuration: manpage_config,
+)
+install_man(xwinclip_man)