Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 908254 - x11-base/xwayland: automagic sys-apps/systemd dependency
Summary: x11-base/xwayland: automagic sys-apps/systemd dependency
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo X packagers
URL:
Whiteboard:
Keywords: PATCH
: 921965 (view as bug list)
Depends on:
Blocks:
 
Reported: 2023-06-10 18:26 UTC by Sam James
Modified: 2024-01-12 20:07 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
some naive attempt to fix the ebuild (fix_xwayland_ebuild.patch,681 bytes, patch)
2023-12-31 16:10 UTC, alexander-n8hgeg5e
Details | Diff
the files/patch part of some naive attempt to fix it (no-systemd.patch,2.60 KB, patch)
2023-12-31 16:14 UTC, alexander-n8hgeg5e
Details | Diff
for application on a copy of 23.2.3 (xwayland-23.2.3-r1.ebuild.patch,1.11 KB, patch)
2024-01-01 14:28 UTC, alexander-n8hgeg5e
Details | Diff
maybe this helps if you want to patch 23.2.3 (did not apply by itself) (meson-add-option-for-systemd.patch,1.66 KB, patch)
2024-01-01 14:33 UTC, alexander-n8hgeg5e
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-06-10 18:26:46 UTC
* Package:    x11-base/xwayland-23.1.2:0
 * Repository: gentoo
 * Maintainer: x11@gentoo.org
 * USE:        abi_x86_64 amd64 elibc_glibc kernel_linux
 * FEATURES:   network-sandbox preserve-libs sandbox userpriv usersandbox
 * Applying xwayland-drop-redundantly-installed-files.patch ...
 * Clang 16 testing: this build is using a /etc/portage/bashrc hook!
 * Clang 16 testing: see https://wiki.gentoo.org/wiki/Modern_C_porting for more info.
 * Final size of build directory: 27500 KiB (26.8 MiB)
 * Final size of installed tree:   2592 KiB ( 2.5 MiB)
 * VDB: detected possibly incorrect RDEPEND (x11-base/xwayland-23.1.2)
 *                     > sys-apps/systemd:=
 * x11-libs/libxkbfile <

----

# emerge --info
Portage 3.0.48.1 (python 3.12.0-beta-2, default/linux/amd64/17.1/hardened, gcc-13, glibc-2.37-r3, 6.1.33-sam_box x86_64)
=================================================================
System uname: Linux-6.1.33-sam_box-x86_64-AMD_Ryzen_9_3950X_16-Core_Processor-with-glibc2.37
KiB Mem:    65757432 total,  24532528 free
KiB Swap:   16662520 total,  16589560 free
Timestamp of repository gentoo: Sat, 10 Jun 2023 18:02:02 +0000
Head commit of repository gentoo: c02b33506e73e5381937b50ff4c0c42b3550610a

Timestamp of repository emacs: Sat, 10 Jun 2023 10:33:32 +0000
Head commit of repository emacs: 73c8759ef90c945270d251e0a6e49998e2908320

Timestamp of repository kde: Sat, 10 Jun 2023 10:33:51 +0000
Head commit of repository kde: 9e44908959197143d91c696509eba241cdf9b5b3

Timestamp of repository qt: Sat, 10 Jun 2023 10:33:39 +0000
Head commit of repository qt: 26d68b0e75d0d251d4d7f27b2d80299d6d8eac06

Timestamp of repository sam_c: Sat, 10 Jun 2023 10:33:57 +0000
Head commit of repository sam_c: 151379a52d0a116b60306733ce834ac78989d046

Timestamp of repository steam-overlay: Sat, 10 Jun 2023 10:33:41 +0000
Head commit of repository steam-overlay: e7211fbc19bd4c8e0b6e240eda670a010576f45d

sh dash 0.5.12
ld GNU ld (Gentoo 2.40 p5) 2.40.0
ccache version 4.8 [disabled]
app-misc/pax-utils:        1.3.7::gentoo
app-shells/bash:           5.2_p15-r3::gentoo
dev-java/java-config:      2.3.1-r1::gentoo
dev-lang/perl:             5.36.1-r2::gentoo
dev-lang/python:           3.10.12::gentoo, 3.11.4::gentoo, 3.12.0_beta2::gentoo
dev-lang/rust:             1.69.0-r1::gentoo
dev-util/ccache:           4.8-r2::gentoo
dev-util/cmake:            3.27.0_rc1::gentoo
dev-util/meson:            1.1.1::gentoo
sys-apps/baselayout:       2.13-r1::gentoo
sys-apps/sandbox:          2.30-r1::gentoo
sys-apps/systemd:          253.5::gentoo
sys-devel/autoconf:        2.13-r8::gentoo, 2.69-r9::gentoo, 2.71-r6::gentoo, 9999::gentoo
sys-devel/automake:        1.16.5-r1::gentoo
sys-devel/binutils:        2.38-r2::gentoo, 2.39-r5::gentoo, 2.40-r5::gentoo
sys-devel/binutils-config: 5.5::gentoo
sys-devel/clang:           15.0.7-r3::gentoo, 16.0.5::gentoo, 17.0.0_pre20230609::gentoo
sys-devel/gcc:             10.4.1_p20230607::gentoo, 11.4.1_p20230608::gentoo, 12.3.1_p20230609::gentoo, 13.1.1_p20230603::gentoo, 14.0.0_pre20230529::gentoo
sys-devel/gcc-config:      2.11::gentoo
sys-devel/libtool:         2.4.7-r1::gentoo
sys-devel/lld:             17.0.0_pre20230609::gentoo
sys-devel/llvm:            15.0.7-r3::gentoo, 16.0.5::gentoo, 17.0.0_pre20230609::gentoo
sys-devel/make:            4.4.1-r1::gentoo
sys-kernel/linux-headers:  6.3::gentoo (virtual/os-headers)
sys-libs/glibc:            2.37-r3::gentoo
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/gentoo.git
    priority: -1000
    eclass-overrides: sam_c
    volatile: False
    sync-git-verify-commit-signature: yes
    sync-git-clone-extra-opts: -b stable -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now

crossdev
    location: /var/db/repos/crossdev
    masters: gentoo
    eclass-overrides: sam_c
    volatile: True

emacs
    location: /var/db/repos/emacs
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/emacs.git
    masters: gentoo
    eclass-overrides: sam_c
    volatile: False

kde
    location: /var/db/repos/kde
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/kde.git
    masters: gentoo
    eclass-overrides: sam_c
    volatile: False

local
    location: /var/db/repos/local
    masters: gentoo
    eclass-overrides: sam_c
    volatile: False

qt
    location: /var/db/repos/qt
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/qt.git
    masters: gentoo
    eclass-overrides: sam_c
    volatile: False

sam_c
    location: /var/db/repos/sam_c
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/sam_c.git
    masters: gentoo
    eclass-overrides: sam_c
    volatile: False

steam-overlay
    location: /var/db/repos/steam-overlay
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/steam-overlay.git
    masters: gentoo
    eclass-overrides: sam_c
    volatile: False

test
    location: /var/db/repos/test
    masters: gentoo
    eclass-overrides: sam_c
    volatile: False

Installed sets: @sam-emacs, @sam-fonts, @sam-fortune
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="@FREE"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php8.2/ext-active/ /etc/php/cgi-php8.2/ext-active/ /etc/php/cli-php8.2/ext-active/ /etc/php/fpm-php8.2/ext-active/ /etc/php/phpdbg-php8.2/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type"
DISTDIR="/var/cache/distfiles"
EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps=y --complete-graph --deep --dynamic-deps=n --changed-deps=n --usepkg-exclude sys-fs/zfs --usepkg-exclude sys-fs/zfs-kmod --usepkg=y --implicit-system-deps=n --jobs=4 --load-average 32"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GDK_PIXBUF_MODULE_FILE GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME"
FCFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance buildpkg cgroup clean-logs config-protect-if-modified distlocks fixlafiles ipc-sandbox mount-sandbox multilib-strict network-sandbox news parallel-fetch parallel-install pid-sandbox pkgdir-index-trusted preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms split-log strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type"
GENTOO_MIRRORS="http://www.mirrorservice.org/sites/distfiles.gentoo.org/ http://mirrors.soeasyto.com/distfiles.gentoo.org/"
LANG="en_GB.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs"
LEX="reflex"
LINGUAS="en en_GB"
MAKEOPTS="-j32 -l32"
PKGDIR="/var/cache/binpkgs"
PORTAGE_BUNZIP2_COMMAND="lbunzip2"
PORTAGE_COMPRESS="xz"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
RUSTFLAGS="-C target-cpu=native -C link-arg=-Wl,-z,pack-relative-relocs"
SHELL="/bin/bash"
USE="PIC X a52 aac acl acpi activities aes alsa amd64 avx avx2 bash-completion bluetooth branding bzip2 cairo caps cdda cdr cet clang cli crypt dbus declarative dist-kernel dri dts dvd dvdr editorconfig emacs encode exif f16c filecaps firewalld flac fma3 fortran freetype gdbm gif gmp gpm graphite gtk gui hardened harfbuzz hunspell iconv icu ipv6 jit jpeg kde kdesu kwallet lcms libnotify libtirpc lto mad mmx mmxext mng mp3 mp4 mpeg multilib ncurses nftables nls nptl ogg opengl openmp pam pango pclmul pcre pdf pgo pie pipewire plasma png policykit popcnt ppds pulseaudio qml qt5 rdrand readline screencast sdl seccomp semantic-desktop sha sound spell sse sse2 sse3 sse4_1 sse4_2 sse4a ssl ssp ssse3 startup-notification svg system-av1 system-binutils system-boost system-bootstrap system-cairo system-clang system-digest system-ffmpeg system-harfbuzz system-heimdal system-icu system-jpeg system-leveldb system-libevent system-libs system-libvpx system-libyaml system-llvm system-lz4 system-mitkrb5 system-sqlite system-ssl system-tbb system-uulib system-webp system-zlib systemd test-rust tiff truetype udev udisks unicode upower usb valgrind verify-sig vorbis vulkan wayland widgets x264 xattr xcb xft xml xtpax xv xvid zlib zsh-completion" ABI_X86="32 64" ADA_TARGET="gnat_2021" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput" KERNEL="linux" L10N="en en-GB" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="AArch64 AMDGPU ARM AVR BPF Hexagon Lanai MSP430 Mips NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-4 php8-0" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_11" PYTHON_TARGETS="python3_11 pypy3 python3_10 python3_12" QEMU_USER_TARGETS="aarch64 aarch64_be alpha armeb hppa m68k ppc ppc64 ppc64le sparc sparc64" RUBY_TARGETS="ruby31 ruby32" VIDEO_CARDS="amdgpu radeonsi radeon" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account"
YACC="byacc"
Unset:  ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LFLAGS, LIBTOOL, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, SIZE, STRINGS, STRIP, YFLAGS
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-06-10 18:27:10 UTC
This really is for systemd rather than e.g. udev:
```
# libsystemd-daemon was moved into libsystemd in version 209
libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
if not libsystemd_daemon_dep.found()
    libsystemd_daemon_dep = dependency('libsystemd-daemon', required: false)
endif
```
Comment 2 alexander-n8hgeg5e 2023-12-31 16:10:58 UTC
Created attachment 881108 [details, diff]
some naive attempt to fix the ebuild

I don't expect this the right way to fix it,...
Comment 3 alexander-n8hgeg5e 2023-12-31 16:14:19 UTC
Created attachment 881109 [details, diff]
the files/patch part of some naive attempt to fix it
Comment 4 alexander-n8hgeg5e 2023-12-31 16:21:35 UTC
At least a line that depends on systemd in case the systemd flag is activated is missing.
Comment 5 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-12-31 16:24:40 UTC
A meson option needs to be added, I'll look at it today.
Comment 6 alexander-n8hgeg5e 2023-12-31 22:47:23 UTC
[here we talked about it and now I know a bit more about how to patch it](https://forums.gentoo.org/viewtopic-t-1166682.html)
Comment 7 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-12-31 23:39:17 UTC
Sent https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1230 upstream.
Comment 8 alexander-n8hgeg5e 2024-01-01 11:31:41 UTC
:-) Thanks, I like your patch.
Comment 9 alexander-n8hgeg5e 2024-01-01 14:15:47 UTC
I "cherry pick merged" it on tag 23.2.3 and made an xwayland-23.2.3-r1.ebuild.
It patches the picked patch and compiles with no flags enabled.
Another test I could do is compile it with systemd enabled and it should fail to compile.
Unfortunately I'm not that well prepared to test packages.
Comment 10 alexander-n8hgeg5e 2024-01-01 14:28:36 UTC
Created attachment 881208 [details, diff]
for application on a copy of 23.2.3
Comment 11 alexander-n8hgeg5e 2024-01-01 14:33:25 UTC
Created attachment 881213 [details, diff]
maybe this helps if you want to patch 23.2.3 (did not apply by itself)
Comment 12 Larry the Git Cow gentoo-dev 2024-01-02 06:00:44 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763d1a19a12b0d2dba941a00ab4c5bd2ac3b8496

commit 763d1a19a12b0d2dba941a00ab4c5bd2ac3b8496
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2024-01-02 05:59:47 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2024-01-02 05:59:47 +0000

    x11-base/xwayland: fix systemd automagic
    
    Closes: https://bugs.gentoo.org/908254
    Signed-off-by: Sam James <sam@gentoo.org>

 .../files/xwayland-23.2.3-systemd-automagic.patch  |  52 ++++++++++
 x11-base/xwayland/xwayland-23.2.3-r1.ebuild        | 112 +++++++++++++++++++++
 x11-base/xwayland/xwayland-9999.ebuild             |   6 +-
 3 files changed, 168 insertions(+), 2 deletions(-)
Comment 13 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-01-02 06:01:00 UTC
(In reply to alexander-n8hgeg5e from comment #11)
> Created attachment 881213 [details, diff] [details, diff]
> maybe this helps if you want to patch 23.2.3 (did not apply by itself)

Thanks!
Comment 14 Brett Alcox 2024-01-02 15:47:29 UTC
(In reply to Larry the Git Cow from comment #12)
> The bug has been closed via the following commit(s):
> 
> https://gitweb.gentoo.org/repo/gentoo.git/commit/
> ?id=763d1a19a12b0d2dba941a00ab4c5bd2ac3b8496
> 
> commit 763d1a19a12b0d2dba941a00ab4c5bd2ac3b8496
> Author:     Sam James <sam@gentoo.org>
> AuthorDate: 2024-01-02 05:59:47 +0000
> Commit:     Sam James <sam@gentoo.org>
> CommitDate: 2024-01-02 05:59:47 +0000
> 
>     x11-base/xwayland: fix systemd automagic
>     
>     Closes: https://bugs.gentoo.org/908254
>     Signed-off-by: Sam James <sam@gentoo.org>
> 
>  .../files/xwayland-23.2.3-systemd-automagic.patch  |  52 ++++++++++
>  x11-base/xwayland/xwayland-23.2.3-r1.ebuild        | 112
> +++++++++++++++++++++
>  x11-base/xwayland/xwayland-9999.ebuild             |   6 +-
>  3 files changed, 168 insertions(+), 2 deletions(-)

Emerging the 9999 ebuild, I'm getting:

meson.build:1:0: ERROR: Unknown options: "systemd"
Comment 15 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-01-02 15:49:32 UTC
You can't really win with patching live ebuilds - if I add the patch then someone will complain when it gets merged, the hope was it'll get in shortly. But I guess since someone noticed I can sync it later.
Comment 16 Larry the Git Cow gentoo-dev 2024-01-05 06:42:51 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106b87fb06e821743267964c8d36be01d4c44739

commit 106b87fb06e821743267964c8d36be01d4c44739
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2024-01-05 06:41:13 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2024-01-05 06:41:36 +0000

    x11-base/xwayland: drop systemd option from live again for now
    
    meh.
    
    Bug: https://bugs.gentoo.org/908254
    Closes: https://bugs.gentoo.org/921357
    Signed-off-by: Sam James <sam@gentoo.org>

 x11-base/xwayland/xwayland-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Comment 17 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-01-12 19:57:22 UTC
*** Bug 921965 has been marked as a duplicate of this bug. ***