diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2024-05-16 10:12:45 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2024-05-16 10:16:02 -0400 |
| commit | a9af4cee408321c9a5ee1c89cf8d1c602d63fcc5 (patch) | |
| tree | 5813ac312209e6dbb2aa046a4bed58ed74add23c | |
| parent | x11-base/xwayland: Add test dependencies (diff) | |
| download | gentoo-a9af4cee408321c9a5ee1c89cf8d1c602d63fcc5.tar.gz gentoo-a9af4cee408321c9a5ee1c89cf8d1c602d63fcc5.tar.bz2 gentoo-a9af4cee408321c9a5ee1c89cf8d1c602d63fcc5.zip | |
x11-base/xwayland: Replace patch with manual removal
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch | 27 | ||||
| -rw-r--r-- | x11-base/xwayland/xwayland-9999.ebuild | 10 |
2 files changed, 6 insertions, 31 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 deleted file mode 100644 index 11c9bed1e235..000000000000 --- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/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, --)) diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild index 30d4b9f53746..3b5d437dd588 100644 --- a/x11-base/xwayland/xwayland-9999.ebuild +++ b/x11-base/xwayland/xwayland-9999.ebuild @@ -66,10 +66,6 @@ BDEPEND=" dev-util/wayland-scanner " -PATCHES=( - "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch -) - src_prepare() { default @@ -128,4 +124,10 @@ src_install() { dosym ../bin/Xwayland /usr/libexec/Xwayland meson_src_install + + # Remove files installed by x11-base/xorg-xserver + rm \ + "${ED}"/usr/share/man/man1/Xserver.1 \ + "${ED}"/usr/$(get_libdir)/xorg/protocol.txt \ + || die } |