commit: 763d1a19a12b0d2dba941a00ab4c5bd2ac3b8496 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jan 2 05:59:47 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 2 05:59:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763d1a19
x11-base/xwayland: fix systemd automagic Closes: https://bugs.gentoo.org/908254 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/xwayland-23.2.3-systemd-automagic.patch | 52 ++++++++++++++++++++++ ...yland-9999.ebuild => xwayland-23.2.3-r1.ebuild} | 13 +++--- x11-base/xwayland/xwayland-9999.ebuild | 6 ++- 3 files changed, 62 insertions(+), 9 deletions(-) diff --git a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch new file mode 100644 index 000000000000..9af034c46fd5 --- /dev/null +++ b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch @@ -0,0 +1,52 @@ +https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1230 + +From 010f6e751e86207a7e88f3504191bcae2d77b458 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Sun, 31 Dec 2023 23:37:19 +0000 +Subject: [PATCH] meson: add option for systemd + +Without this, systemd will be used if installed on the system automagically, +which is a problem if the built e.g. Xwayland is going to be used on a non-systemd +machine. + +Bug: https://bugs.gentoo.org/908254 +Signed-off-by: Sam James <[email protected]> + +diff --git a/include/meson.build b/include/meson.build +index e6e3d553f..ddc18407e 100644 +--- a/include/meson.build ++++ b/include/meson.build +@@ -91,7 +91,7 @@ endif + + conf_data.set('HAVE_LIBBSD', libbsd_dep.found() ? '1' : false) + # Note: this symbol is used by libXtrans. +-conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found() ? '1' : false) ++conf_data.set('HAVE_SYSTEMD_DAEMON', build_systemd ? '1' : false) + conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false) + conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false) + conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF', +diff --git a/meson.build b/meson.build +index 60164d73b..de984760c 100644 +--- a/meson.build ++++ b/meson.build +@@ -99,6 +99,7 @@ xkbcomp_dep = dependency('xkbcomp', required: false) + xkbfile_dep = dependency('xkbfile') + xfont2_dep = dependency('xfont2', version: '>= 2.0') + ++build_systemd = get_option('systemd') == 'true' + # libsystemd-daemon was moved into libsystemd in version 209 + libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false) + if not libsystemd_daemon_dep.found() +diff --git a/meson_options.txt b/meson_options.txt +index af094df70..62c539fbd 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -47,6 +47,8 @@ option('listen_unix', type: 'boolean', value: true, + option('listen_local', type: 'boolean', value: true, + description: 'Listen on local by default') + ++option('systemd', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', ++ description: 'Enable systemd-notify support') + option('dpms', type: 'boolean', value: true, + description: 'Xorg DPMS extension') + option('xf86bigfont', type: 'boolean', value: false, diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-23.2.3-r1.ebuild similarity index 88% copy from x11-base/xwayland/xwayland-9999.ebuild copy to x11-base/xwayland/xwayland-23.2.3-r1.ebuild index 915fd9a08bb3..7cf66e28583c 100644 --- a/x11-base/xwayland/xwayland-9999.ebuild +++ b/x11-base/xwayland/xwayland-23.2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ fi DESCRIPTION="Standalone X server running under Wayland" HOMEPAGE="https://wayland.freedesktop.org/xserver.html"; -IUSE="libei selinux video_cards_nvidia unwind xcsecurity" +IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity" LICENSE="MIT" SLOT="0" @@ -41,6 +41,7 @@ COMMON_DEPEND=" >=x11-misc/xkeyboard-config-2.4.1-r3 libei? ( dev-libs/libei ) + systemd? ( sys-apps/systemd ) unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) " @@ -62,12 +63,14 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch + "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch + "${FILESDIR}"/xwayland-23.2.3-systemd-automagic.patch ) src_configure() { local emesonargs=( $(meson_use selinux xselinux) + $(meson_use systemd) $(meson_use unwind libunwind) $(meson_use xcsecurity) $(meson_use video_cards_nvidia xwayland_eglstream) @@ -91,10 +94,6 @@ src_configure() { -Ddocs=false -Ddevel-docs=false -Ddocs-pdf=false - -Dxorg=false - -Dxnest=false - -Dxvfb=false - -Dxwayland=true ) if use libei; then diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild index 915fd9a08bb3..6d2b4301bc42 100644 --- a/x11-base/xwayland/xwayland-9999.ebuild +++ b/x11-base/xwayland/xwayland-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ fi DESCRIPTION="Standalone X server running under Wayland" HOMEPAGE="https://wayland.freedesktop.org/xserver.html"; -IUSE="libei selinux video_cards_nvidia unwind xcsecurity" +IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity" LICENSE="MIT" SLOT="0" @@ -41,6 +41,7 @@ COMMON_DEPEND=" >=x11-misc/xkeyboard-config-2.4.1-r3 libei? ( dev-libs/libei ) + systemd? ( sys-apps/systemd ) unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) " @@ -68,6 +69,7 @@ PATCHES=( src_configure() { local emesonargs=( $(meson_use selinux xselinux) + $(meson_use systemd) $(meson_use unwind libunwind) $(meson_use xcsecurity) $(meson_use video_cards_nvidia xwayland_eglstream)
