gentoo resync : 12.05.2022

1 files changed, 30 insertions, 0 deletions

diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
new file mode 100644
index 000000000000..ea765d3dcfcd
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
@@ -0,0 +1,30 @@
+diff --git a/dix/meson.build b/dix/meson.build
+index fbbcf8646..15ca7d3b0 100644
+--- a/dix/meson.build
++++ b/dix/meson.build
+@@ -57,8 +57,3 @@ libxserver_main = static_library('libxserver_main',
+     include_directories: inc,
+     dependencies: common_dep,
+ )
+-
+-install_data(
+-    'protocol.txt',
+-    install_dir: serverconfigdir,
+-)
+diff --git a/meson.build b/meson.build
+index db1d63f3e..b9cef5a56 100644
+--- a/meson.build
++++ b/meson.build
+@@ -806,12 +806,6 @@ if host_machine.system() != 'windows'
+     subdir('test')
+ endif
+ 
+-install_man(configure_file(
+-    input: 'man/Xserver.man',
+-    output: 'Xserver.1',
+-    configuration: manpage_config,
+-))
+-
+ if build_xorg
+     sdkconfig = configuration_data()
+     awk = find_program('awk')