[gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/

[gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/

[Matt Turner]

commit:     aef93b002e97f1ee1e2905be66d3c55ad20923bf
Author:     Brett Alcox <brettalcox <AT> gmail <DOT> com>
AuthorDate: Fri Mar 22 00:09:30 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 01:36:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef93b00

x11-base/xwayland: Update patch

Signed-off-by: Brett Alcox <brettalcox <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../xwayland-drop-redundantly-installed-files_v2.patch  | 17 -----------------
 1 file changed, 17 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
index ea765d3dcfcd..f92eaf28ac90 100644
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
+++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
@@ -11,20 +11,3 @@ index fbbcf8646..15ca7d3b0 100644
 -    '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')

[gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/

[Matt Turner]

commit:     98c4deffecd8361cc28f4ec2ad1c20b2e1af748e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 13:57:02 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 13:57:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98c4deff

x11-base/xwayland: Restore necessary bit of patch

Closes: https://bugs.gentoo.org/927506
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../xwayland-drop-redundantly-installed-files_v2.patch     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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
index f92eaf28ac90..11c9bed1e235 100644
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
+++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
@@ -11,3 +11,17 @@ index fbbcf8646..15ca7d3b0 100644
 -    'protocol.txt',
 -    install_dir: serverconfigdir,
 -)
+diff --git a/man/meson.build b/man/meson.build
+index 2961469c5..1183d741d 100644
+--- a/man/meson.build
++++ b/man/meson.build
+@@ -28,9 +28,3 @@ manpage_config.set('modulepath', module_dir)
+ # manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
+ manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
+ manpage_config.set('default_font_path', default_font_path)
+-
+-install_man(configure_file(
+-    input: 'Xserver.man',
+-    output: 'Xserver.1',
+-    configuration: manpage_config,
+-))