public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/
Date: Fri, 22 Mar 2024 14:04:48 +0000 (UTC)	[thread overview]
Message-ID: <1711115822.98c4deffecd8361cc28f4ec2ad1c20b2e1af748e.mattst88@gentoo> (raw)

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,
+-))


             reply	other threads:[~2024-03-22 14:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-22 14:04 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-22  1:42 [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/files/ Matt Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1711115822.98c4deffecd8361cc28f4ec2ad1c20b2e1af748e.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox