[ISSUE] Suspend Boken under Nvidia Gnome Wayland

[ISSUE] Suspend Boken under Nvidia Gnome Wayland

[CuriousApe2020]

[-- Attachment #1: Type: text/plain, Size: 867 bytes --]

New issue by CuriousApe2020 on void-packages repository

https://github.com/void-linux/void-packages/issues/47125

Description:
### Is this a new report?

Yes

### System Info

Void 6.5.10_1 x86_64 GenuineIntel uptodate rrrmmnFF

### Package(s) Affected

Gnome 44.0_1

### Does a report exist for this bug with the project's home (upstream) and/or another distro?

_No response_

### Expected behaviour

Suspend to disk working as expected.

### Actual behaviour

Upon clicking suspend the Screen turns black but the System doesn't go to sleep, when attempting to wake the system the gnome lockscreen is shown with the option to enter the user password but if I enter it the field just clears. But under  x11 the suspend works just fine.

### Steps to reproduce

Install Gnome
Install propriatary Nvidia Driver
Try to suspend from within the Gnome Wayland desktop.

Re: Suspend Boken under Nvidia Gnome Wayland

[Treeniks]

[-- Attachment #1: Type: text/plain, Size: 3659 bytes --]

New comment by Treeniks on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-1809598774

Comment:
When I look into gdm's udev rules, I can find these lines:
```
# Check if suspend/resume services necessary for working wayland support is available
TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
...
```
meaning they specifically disable wayland if a `/usr/bin/nvidia-sleep.sh` file is not found.

The Arch Wiki has some info on this:
<https://wiki.archlinux.org/title/GDM#Wayland_and_the_proprietary_NVIDIA_driver>
> If the Wayland option is not displayed in GDM, even after [enabling KMS](https://wiki.archlinux.org/title/NVIDIA#DRM_kernel_mode_setting) and [configuring Wayland](https://wiki.archlinux.org/title/NVIDIA#Wayland), then you most likely have `NVreg_PreserveVideoMemoryAllocations` and [NVIDIA systemd services](https://gitlab.gnome.org/GNOME/gdm/-/commit/51181871e9db716546e9593216220389de0d8b03) disabled.

<https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend>
> The still experimental system enables saving all video memory (given enough space on disk or main RAM). The interface is through the `/proc/driver/nvidia/suspend` file as follows:
> * write "suspend" (or "hibernate") to `/proc/driver/nvidia/suspend` immediately before writing to the usual Linux `/sys/power/state` file
> * write "resume" to `/proc/driver/nvidia/suspend` immediately after waking up, or after an unsuccessful attempt to suspend or hibernate.
>
> To save and restore all video memory contents, [load](https://wiki.archlinux.org/title/Kernel_modules#Setting_module_options) the nvidia kernel module with the `NVreg_PreserveVideoMemoryAllocations=1` option and [enable](https://wiki.archlinux.org/title/Enable) `nvidia-suspend.service` and `nvidia-hibernate.service`.
> [...]
> The interaction with `/proc/driver/nvidia/suspend` is handled by the simple Unix shell script at `/usr/bin/nvidia-sleep.sh`, which will itself be called by [systemd](https://wiki.archlinux.org/title/Systemd) or other tools. The [nvidia-utils](https://archlinux.org/packages/?name=nvidia-utils) package ships with the following services (which essentially just call `nvidia-sleep.sh`): `nvidia-suspend.service`, `nvidia-hibernate.service`, `nvidia-resume.service`.

The Debian docs on this also have similar instructions:
<https://wiki.debian.org/NvidiaGraphicsDrivers#Wayland>

From what I can tell by using `xlocate`, I cannot find any package which includes such services or scripts.

I am awfully unqualified for this, but I believe the only way to make this work in Void at the moment is to disable the GDM udev rule entirely (with `ln -s /dev/null /etc/udev/rules.d/61-gdm.rules`) and live with a broken suspend, until a similar `nvidia-utils` package is added.

I did however notice that the `/proc/driver/nvidia/suspend` file already has a `suspend hibernate resume` line written in it. Not sure what this does, but maybe by simply adding the `NVreg_PreserveVideoMemoryAllocations=1` kernel module option, suspend can be fixed (or at least improved)?
I.e. adding a `/etc/modprobe.d/nvidia-power-management.conf` file (be careful not to name it `nvidia.conf` like my idiot self, that will override `/lib/modprobe.p/nvidia.conf` which blacklists nouveau) with the following content:
```
options nvidia NVreg_PreserveVideoMemoryAllocations=1
```
(and I believe one has to [reconfigure the linux kernel](https://docs.voidlinux.org/config/kernel.html#install-hooks)?)

Re: Suspend Boken under Nvidia Gnome Wayland

[Treeniks]

[-- Attachment #1: Type: text/plain, Size: 3663 bytes --]

New comment by Treeniks on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-1809598774

Comment:
When I look into gdm's udev rules, I can find these lines:
```
# Check if suspend/resume services necessary for working wayland support is available
TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
...
```
meaning they specifically disable wayland if a `/usr/bin/nvidia-sleep.sh` file is not found.

The Arch Wiki has some info on this:
<https://wiki.archlinux.org/title/GDM#Wayland_and_the_proprietary_NVIDIA_driver>
> If the Wayland option is not displayed in GDM, even after [enabling KMS](https://wiki.archlinux.org/title/NVIDIA#DRM_kernel_mode_setting) and [configuring Wayland](https://wiki.archlinux.org/title/NVIDIA#Wayland), then you most likely have `NVreg_PreserveVideoMemoryAllocations` and [NVIDIA systemd services](https://gitlab.gnome.org/GNOME/gdm/-/commit/51181871e9db716546e9593216220389de0d8b03) disabled.

<https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend>
> The **still experimental** system enables saving all video memory (given enough space on disk or main RAM). The interface is through the `/proc/driver/nvidia/suspend` file as follows:
> * write "suspend" (or "hibernate") to `/proc/driver/nvidia/suspend` immediately before writing to the usual Linux `/sys/power/state` file
> * write "resume" to `/proc/driver/nvidia/suspend` immediately after waking up, or after an unsuccessful attempt to suspend or hibernate.
>
> To save and restore all video memory contents, [load](https://wiki.archlinux.org/title/Kernel_modules#Setting_module_options) the nvidia kernel module with the `NVreg_PreserveVideoMemoryAllocations=1` option and [enable](https://wiki.archlinux.org/title/Enable) `nvidia-suspend.service` and `nvidia-hibernate.service`.
> [...]
> The interaction with `/proc/driver/nvidia/suspend` is handled by the simple Unix shell script at `/usr/bin/nvidia-sleep.sh`, which will itself be called by [systemd](https://wiki.archlinux.org/title/Systemd) or other tools. The [nvidia-utils](https://archlinux.org/packages/?name=nvidia-utils) package ships with the following services (which essentially just call `nvidia-sleep.sh`): `nvidia-suspend.service`, `nvidia-hibernate.service`, `nvidia-resume.service`.

The Debian docs on this also have similar instructions:
<https://wiki.debian.org/NvidiaGraphicsDrivers#Wayland>

From what I can tell by using `xlocate`, I cannot find any package which includes such services or scripts.

I am awfully unqualified for this, but I believe the only way to make this work in Void at the moment is to disable the GDM udev rule entirely (with `ln -s /dev/null /etc/udev/rules.d/61-gdm.rules`) and live with a broken suspend, until a similar `nvidia-utils` package is added.

I did however notice that the `/proc/driver/nvidia/suspend` file already has a `suspend hibernate resume` line written in it. Not sure what this does, but maybe by simply adding the `NVreg_PreserveVideoMemoryAllocations=1` kernel module option, suspend can be fixed (or at least improved)?
I.e. adding a `/etc/modprobe.d/nvidia-power-management.conf` file (be careful not to name it `nvidia.conf` like my idiot self, that will override `/lib/modprobe.p/nvidia.conf` which blacklists nouveau) with the following content:
```
options nvidia NVreg_PreserveVideoMemoryAllocations=1
```
(and I believe one has to [reconfigure the linux kernel](https://docs.voidlinux.org/config/kernel.html#install-hooks)?)

Re: Suspend Boken under Nvidia Gnome Wayland

[Treeniks]

[-- Attachment #1: Type: text/plain, Size: 3708 bytes --]

New comment by Treeniks on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-1809598774

Comment:
When I look into gdm's udev rules (located at /lib/udev/rules.d/61-gdm.rules`), I can find these lines:
```
# Check if suspend/resume services necessary for working wayland support is available
TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
...
```
meaning they specifically disable wayland if a `/usr/bin/nvidia-sleep.sh` file is not found.

The Arch Wiki has some info on this:
<https://wiki.archlinux.org/title/GDM#Wayland_and_the_proprietary_NVIDIA_driver>
> If the Wayland option is not displayed in GDM, even after [enabling KMS](https://wiki.archlinux.org/title/NVIDIA#DRM_kernel_mode_setting) and [configuring Wayland](https://wiki.archlinux.org/title/NVIDIA#Wayland), then you most likely have `NVreg_PreserveVideoMemoryAllocations` and [NVIDIA systemd services](https://gitlab.gnome.org/GNOME/gdm/-/commit/51181871e9db716546e9593216220389de0d8b03) disabled.

<https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend>
> The **still experimental** system enables saving all video memory (given enough space on disk or main RAM). The interface is through the `/proc/driver/nvidia/suspend` file as follows:
> * write "suspend" (or "hibernate") to `/proc/driver/nvidia/suspend` immediately before writing to the usual Linux `/sys/power/state` file
> * write "resume" to `/proc/driver/nvidia/suspend` immediately after waking up, or after an unsuccessful attempt to suspend or hibernate.
>
> To save and restore all video memory contents, [load](https://wiki.archlinux.org/title/Kernel_modules#Setting_module_options) the nvidia kernel module with the `NVreg_PreserveVideoMemoryAllocations=1` option and [enable](https://wiki.archlinux.org/title/Enable) `nvidia-suspend.service` and `nvidia-hibernate.service`.
> [...]
> The interaction with `/proc/driver/nvidia/suspend` is handled by the simple Unix shell script at `/usr/bin/nvidia-sleep.sh`, which will itself be called by [systemd](https://wiki.archlinux.org/title/Systemd) or other tools. The [nvidia-utils](https://archlinux.org/packages/?name=nvidia-utils) package ships with the following services (which essentially just call `nvidia-sleep.sh`): `nvidia-suspend.service`, `nvidia-hibernate.service`, `nvidia-resume.service`.

The Debian docs on this also have similar instructions:
<https://wiki.debian.org/NvidiaGraphicsDrivers#Wayland>

From what I can tell by using `xlocate`, I cannot find any package which includes such services or scripts.

I am awfully unqualified for this, but I believe the only way to make this work in Void at the moment is to disable the GDM udev rule entirely (with `ln -s /dev/null /etc/udev/rules.d/61-gdm.rules`) and live with a broken suspend, until a similar `nvidia-utils` package is added.

I did however notice that the `/proc/driver/nvidia/suspend` file already has a `suspend hibernate resume` line written in it. Not sure what this does, but maybe by simply adding the `NVreg_PreserveVideoMemoryAllocations=1` kernel module option, suspend can be fixed (or at least improved)?
I.e. adding a `/etc/modprobe.d/nvidia-power-management.conf` file (be careful not to name it `nvidia.conf` like my idiot self, that will override `/lib/modprobe.p/nvidia.conf` which blacklists nouveau) with the following content:
```
options nvidia NVreg_PreserveVideoMemoryAllocations=1
```
(and I believe one has to [reconfigure the linux kernel](https://docs.voidlinux.org/config/kernel.html#install-hooks)?)

Re: Suspend Boken under Nvidia Gnome Wayland

[Treeniks]

[-- Attachment #1: Type: text/plain, Size: 3709 bytes --]

New comment by Treeniks on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-1809598774

Comment:
When I look into gdm's udev rules (located at `/lib/udev/rules.d/61-gdm.rules`), I can find these lines:
```
# Check if suspend/resume services necessary for working wayland support is available
TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
...
```
meaning they specifically disable wayland if a `/usr/bin/nvidia-sleep.sh` file is not found.

The Arch Wiki has some info on this:
<https://wiki.archlinux.org/title/GDM#Wayland_and_the_proprietary_NVIDIA_driver>
> If the Wayland option is not displayed in GDM, even after [enabling KMS](https://wiki.archlinux.org/title/NVIDIA#DRM_kernel_mode_setting) and [configuring Wayland](https://wiki.archlinux.org/title/NVIDIA#Wayland), then you most likely have `NVreg_PreserveVideoMemoryAllocations` and [NVIDIA systemd services](https://gitlab.gnome.org/GNOME/gdm/-/commit/51181871e9db716546e9593216220389de0d8b03) disabled.

<https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend>
> The **still experimental** system enables saving all video memory (given enough space on disk or main RAM). The interface is through the `/proc/driver/nvidia/suspend` file as follows:
> * write "suspend" (or "hibernate") to `/proc/driver/nvidia/suspend` immediately before writing to the usual Linux `/sys/power/state` file
> * write "resume" to `/proc/driver/nvidia/suspend` immediately after waking up, or after an unsuccessful attempt to suspend or hibernate.
>
> To save and restore all video memory contents, [load](https://wiki.archlinux.org/title/Kernel_modules#Setting_module_options) the nvidia kernel module with the `NVreg_PreserveVideoMemoryAllocations=1` option and [enable](https://wiki.archlinux.org/title/Enable) `nvidia-suspend.service` and `nvidia-hibernate.service`.
> [...]
> The interaction with `/proc/driver/nvidia/suspend` is handled by the simple Unix shell script at `/usr/bin/nvidia-sleep.sh`, which will itself be called by [systemd](https://wiki.archlinux.org/title/Systemd) or other tools. The [nvidia-utils](https://archlinux.org/packages/?name=nvidia-utils) package ships with the following services (which essentially just call `nvidia-sleep.sh`): `nvidia-suspend.service`, `nvidia-hibernate.service`, `nvidia-resume.service`.

The Debian docs on this also have similar instructions:
<https://wiki.debian.org/NvidiaGraphicsDrivers#Wayland>

From what I can tell by using `xlocate`, I cannot find any package which includes such services or scripts.

I am awfully unqualified for this, but I believe the only way to make this work in Void at the moment is to disable the GDM udev rule entirely (with `ln -s /dev/null /etc/udev/rules.d/61-gdm.rules`) and live with a broken suspend, until a similar `nvidia-utils` package is added.

I did however notice that the `/proc/driver/nvidia/suspend` file already has a `suspend hibernate resume` line written in it. Not sure what this does, but maybe by simply adding the `NVreg_PreserveVideoMemoryAllocations=1` kernel module option, suspend can be fixed (or at least improved)?
I.e. adding a `/etc/modprobe.d/nvidia-power-management.conf` file (be careful not to name it `nvidia.conf` like my idiot self, that will override `/lib/modprobe.p/nvidia.conf` which blacklists nouveau) with the following content:
```
options nvidia NVreg_PreserveVideoMemoryAllocations=1
```
(and I believe one has to [reconfigure the linux kernel](https://docs.voidlinux.org/config/kernel.html#install-hooks)?)

Re: Suspend Boken under Nvidia Gnome Wayland

[Treeniks]

[-- Attachment #1: Type: text/plain, Size: 3923 bytes --]

New comment by Treeniks on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-1809598774

Comment:
When I look into gdm's udev rules (located at `/lib/udev/rules.d/61-gdm.rules`), I can find these lines:
```
# Check if suspend/resume services necessary for working wayland support is available
TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
...
```
meaning they specifically disable wayland if a `/usr/bin/nvidia-sleep.sh` file is not found.

The Arch Wiki has some info on this:
<https://wiki.archlinux.org/title/GDM#Wayland_and_the_proprietary_NVIDIA_driver>
> If the Wayland option is not displayed in GDM, even after [enabling KMS](https://wiki.archlinux.org/title/NVIDIA#DRM_kernel_mode_setting) and [configuring Wayland](https://wiki.archlinux.org/title/NVIDIA#Wayland), then you most likely have `NVreg_PreserveVideoMemoryAllocations` and [NVIDIA systemd services](https://gitlab.gnome.org/GNOME/gdm/-/commit/51181871e9db716546e9593216220389de0d8b03) disabled.

<https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend>
> The **still experimental** system enables saving all video memory (given enough space on disk or main RAM). The interface is through the `/proc/driver/nvidia/suspend` file as follows:
> * write "suspend" (or "hibernate") to `/proc/driver/nvidia/suspend` immediately before writing to the usual Linux `/sys/power/state` file
> * write "resume" to `/proc/driver/nvidia/suspend` immediately after waking up, or after an unsuccessful attempt to suspend or hibernate.
>
> To save and restore all video memory contents, [load](https://wiki.archlinux.org/title/Kernel_modules#Setting_module_options) the nvidia kernel module with the `NVreg_PreserveVideoMemoryAllocations=1` option and [enable](https://wiki.archlinux.org/title/Enable) `nvidia-suspend.service` and `nvidia-hibernate.service`.
> [...]
> The interaction with `/proc/driver/nvidia/suspend` is handled by the simple Unix shell script at `/usr/bin/nvidia-sleep.sh`, which will itself be called by [systemd](https://wiki.archlinux.org/title/Systemd) or other tools. The [nvidia-utils](https://archlinux.org/packages/?name=nvidia-utils) package ships with the following services (which essentially just call `nvidia-sleep.sh`): `nvidia-suspend.service`, `nvidia-hibernate.service`, `nvidia-resume.service`.

The Debian docs on this also have similar instructions:
<https://wiki.debian.org/NvidiaGraphicsDrivers#Wayland>

From what I can tell by using `xlocate`, I cannot find any package which includes such services or scripts.

I am awfully unqualified for this, but I believe the only way to make this work in Void at the moment is to disable the GDM udev rule entirely (with `ln -s /dev/null /etc/udev/rules.d/61-gdm.rules`) and live with a broken suspend, until a similar `nvidia-utils` package is added.

I did however notice that the `/proc/driver/nvidia/suspend` file already has a `suspend hibernate resume` line written in it. Not sure what this does, ~~but maybe by simply adding the `NVreg_PreserveVideoMemoryAllocations=1` kernel module option, suspend can be fixed (or at least improved)?~~ After short testing, seems to change nothing.
I.e. adding a `/etc/modprobe.d/nvidia-power-management.conf` file (be careful not to name it `nvidia.conf` like my idiot self, that will override `/lib/modprobe.p/nvidia.conf` which blacklists nouveau) with the following content:
```
options nvidia NVreg_PreserveVideoMemoryAllocations=1
```
(and I believe one has to [reconfigure the linux kernel](https://docs.voidlinux.org/config/kernel.html#install-hooks)?)

It might also be possible to simply add `nvidia-sleep.sh` etc. manually by copying it over from the Arch or Debian packages, though that does seem rather hacky.

Re: Suspend Boken under Nvidia Gnome Wayland

[m3tav3rse]

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-1819250501

Comment:
It's a bug in elogind's workaround for nvidia driver.
Upstream issues: https://github.com/elogind/elogind/issues/234 https://github.com/elogind/elogind/issues/243

As a workaround you could try putting system to sleep with [zzz](https://man.voidlinux.org/zzz), works on my sway + nvidia system.

> It might also be possible to simply add nvidia-sleep.sh etc. manually by copying it over from the Arch or Debian packages, though that does seem rather hacky.

I doubt it would change anything but you can always copy nvidia-sleep.sh from arch [package](https://archlinux.org/packages/extra/x86_64/nvidia-utils/download/) and test it.

Re: Suspend Boken under Nvidia Gnome Wayland

[tgorordo]

[-- Attachment #1: Type: text/plain, Size: 708 bytes --]

New comment by tgorordo on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-2092949391

Comment:
The upstream issue may be resolved? It's recently marked closed at least.

Manually tweaking the package template and using `xbps-src` etc. to install `elogind-252.24` instead of the `elogind-252.9` that void currently ships seems to fix some suspend-related nvidia issues I was having, though I can't say with confidence I didn't break something else (to get things to build quick-&-dirty I removed all patches from the template). I'm too much of a newbie to do anything more myself with confidence, but an update of the package might fix things at this point?

Re: Suspend Boken under Nvidia Gnome Wayland

[tgorordo]

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

New comment by tgorordo on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-2092949391

Comment:
The upstream issue may be resolved? It's recently marked closed at least.

Manually tweaking the package template and using `xbps-src` etc. to install `elogind-252.24` instead of the `elogind-252.9` that void currently ships seems to fix some suspend-related nvidia issues I was having, though I can't say for sure I didn't break anything else (to get things to build quick-&-dirty I removed all patches from the template). I'm too much of a newbie to do anything more myself with confidence, but an update of the package might fix things at this point?

Re: Suspend Boken under Nvidia Gnome Wayland

[mtvrsh]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

New comment by mtvrsh on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-2093882188

Comment:
You're right upstream fixed this issue.
You only needed to remove 1 patch, like this: https://github.com/mtvrsh/void-packages/commit/ac8d2fec5f2058cbedf382564bf8d8f2f51fe76e

Re: Suspend Boken under Nvidia Gnome Wayland

[morphalus]

[-- Attachment #1: Type: text/plain, Size: 9818 bytes --]

New comment by morphalus on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-2597755845

Comment:
Thanks, it worked great by using `xbps-src`, changing `version` and `checksum` in `template` file and also removing some patches.

`git diff`
```
diff --git a/srcpkgs/elogind/patches/SEEK_DATA.patch b/srcpkgs/elogind/patches/SEEK_DATA.patch
deleted file mode 100644
index f1e308ca90a..00000000000
--- a/srcpkgs/elogind/patches/SEEK_DATA.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream:no
-
-Our musl version doesn't expose the SEEK_DATA and SEEK_HOLE in `unisted.h`...
-Only version >= 1.2.3 do that.
----
- src/shared/copy.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/shared/copy.h b/src/shared/copy.h
-index a34a87c..d258afc 100644
---- a/src/shared/copy.h
-+++ b/src/shared/copy.h
-@@ -79,3 +79,11 @@ static inline int copy_rights(int fdf, int fdt) {
- }
- int copy_xattr(int fdf, int fdt, CopyFlags copy_flags);
- #endif // 0
-+
-+#ifndef SEEK_DATA
-+#define SEEK_DATA 3
-+#endif
-+
-+#ifndef SEEK_HOLE
-+#define SEEK_HOLE 4
-+#endif
---
-2.42.0
diff --git a/srcpkgs/elogind/patches/getdents.patch b/srcpkgs/elogind/patches/getdents.patch
deleted file mode 100644
index 485145f83ec..00000000000
--- a/srcpkgs/elogind/patches/getdents.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream: no
-Source: https://raw.githubusercontent.com/chimera-linux/cports/81f0a3c25df2a841c2d99d752e60296062bf7543/main/elogind/patches/getdents.patch
-
-From dab02796780f00d689cc1c7a0ba81abe7c5f28d0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 21 Jan 2022 15:15:11 -0800
-Subject: [PATCH] pass correct parameters to getdents64
-
-Fixes musl system only
-../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
-                n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size);
-                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-../git/src/basic/stat-util.c:102:28: error: incompatible pointer types passing 'union (unnamed union at ../git/src/basic/stat-util.c:78:9) *' to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
-        n = getdents64(fd, &buffer, sizeof(buffer));
-
-diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
-index d16ca98..0480a69 100644
---- a/src/basic/recurse-dir.c
-+++ b/src/basic/recurse-dir.c
-@@ -54,7 +54,11 @@ int readdir_all(int dir_fd,
-                 bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX);
-                 assert(bs > de->buffer_size);
-
-+            #ifdef __GLIBC__
-                 n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size);
-+            #else
-+                n = getdents(dir_fd, (struct dirent*)((uint8_t*) de->buffer + de->buffer_size), bs - de->buffer_size);
-+            #endif
-                 if (n < 0)
-                         return -errno;
-                 if (n == 0)
diff --git a/srcpkgs/elogind/patches/gshadow.patch b/srcpkgs/elogind/patches/gshadow.patch
deleted file mode 100644
index a890917ddfe..00000000000
--- a/srcpkgs/elogind/patches/gshadow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h
-index 7a41be7..3a970a6 100644
---- a/src/shared/user-record-nss.h
-+++ b/src/shared/user-record-nss.h
-@@ -2,7 +2,6 @@
- #pragma once
- 
- #include <grp.h>
--#include <gshadow.h>
- #include <pwd.h>
- #include <shadow.h>
- 
diff --git a/srcpkgs/elogind/patches/id-nobody.patch b/srcpkgs/elogind/patches/id-nobody.patch
deleted file mode 100644
index ab892cd63f6..00000000000
--- a/srcpkgs/elogind/patches/id-nobody.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/basic/user-util.h
-+++ b/src/basic/user-util.h
-@@ -70,8 +70,8 @@ int take_etc_passwd_lock(const char *root);
- #define UID_INVALID ((uid_t) -1)
- #define GID_INVALID ((gid_t) -1)
- 
--#define UID_NOBODY ((uid_t) 65534U)
--#define GID_NOBODY ((gid_t) 65534U)
-+#define UID_NOBODY ((uid_t) 99U)
-+#define GID_NOBODY ((gid_t) 99U)
- 
- #define ETC_PASSWD_LOCK_PATH "/etc/.pwd.lock"
diff --git a/srcpkgs/elogind/patches/musl-basename.patch b/srcpkgs/elogind/patches/musl-basename.patch
deleted file mode 100644
index ff04009ffc4..00000000000
--- a/srcpkgs/elogind/patches/musl-basename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Add missing include for POSIX basename, since systemd-logind expects basename in string.h
-
-diff -rup src/basic/musl_missing.h.orig src/basic/musl_missing.h
---- a/src/basic/musl_missing.h
-+++ b/src/basic/musl_missing.h
-@@ -56,6 +54,10 @@ void elogind_set_program_name(const char
-         } ) )
- #endif
- 
-+/* Poor man's basename */
-+#define basename(path) \
-+        (strrchr(path, '/') ? strrchr(path, '/')+1 : path)
-+
- /* getnameinfo(3) glibc extensions are undefined in musl libc */
- #define NI_IDN 0
- #define NI_IDN_USE_STD3_ASCII_RULES 0
-From c8d96ff2b87b8dfb8d521d4c2e6fb57992dbf659 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Wed, 21 Dec 2022 16:13:23 +0100
-Subject: [PATCH] tests: we don't actually use basename() anymore
-
----
- src/shared/tests.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/shared/tests.c b/src/shared/tests.c
-index 5a05daa643..9d8bbeea79 100644
---- a/src/shared/tests.c
-+++ b/src/shared/tests.c
-@@ -7,12 +7,6 @@
- #include <sys/mount.h>
- #include <sys/wait.h>
- 
--/* When we include libgen.h because we need dirname() we immediately
-- * undefine basename() since libgen.h defines it as a macro to the POSIX
-- * version which is really broken. We prefer GNU basename(). */
--#include <libgen.h>
--#undef basename
--
- #include "sd-bus.h"
- 
- #include "alloc-util.h"
diff --git a/srcpkgs/elogind/patches/rlim-max.patch b/srcpkgs/elogind/patches/rlim-max.patch
deleted file mode 100644
index a0b01d51637..00000000000
--- a/srcpkgs/elogind/patches/rlim-max.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
-index afd74ac..3a731f4 100644
---- a/src/basic/rlimit-util.c
-+++ b/src/basic/rlimit-util.c
-@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
-             fixed.rlim_max == highest.rlim_max)
-                 return 0;
- 
--        log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", rlim->rlim_max, rlimit_to_string(resource), fixed.rlim_max);
-+        log_debug("Failed at setting rlimit %ju for resource RLIMIT_%s. Will attempt setting value %ju instead.", (uintmax_t)rlim->rlim_max, rlimit_to_string(resource), (uintmax_t)fixed.rlim_max);
- 
-         return RET_NERRNO(setrlimit(resource, &fixed));
- }
-
diff --git a/srcpkgs/elogind/patches/rootlibexecdir.patch b/srcpkgs/elogind/patches/rootlibexecdir.patch
deleted file mode 100644
index 11650a1f31b..00000000000
--- a/srcpkgs/elogind/patches/rootlibexecdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch-Source: https://github.com/elogind/elogind/issues/258
---
-diff --git a/meson.build b/meson.build
-index 694a2fd..a575f69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2903,7 +2903,7 @@ executable('elogind',
-                 dependencies : [threads,
-                                 libacl,
-                                 libudev],
--                install_rpath : rootlibexecdir,
-+                install_rpath : rootpkglibdir,
-                 install : true,
-                 install_dir : rootlibexecdir)
- 
-@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
-                         link_with : [libshared],
-                         dependencies : [threads,
-                                         libudev],
--                        install_rpath : rootlibexecdir,
-+                        install_rpath : rootpkglibdir,
-                         install : true,
-                         install_dir : rootbindir)
- public_programs += [exe]
-@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
-                         include_directories : includes,
-                         link_with : [libshared],
-                         dependencies : [threads],
--                        install_rpath : rootlibexecdir,
-+                        install_rpath : rootpkglibdir,
-                         install : true,
-                         install_dir : rootbindir)
- public_programs += [exe]
-@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
-                         libshared],
-            dependencies: [libacl,
-                           libudev],
--           install_rpath : rootlibexecdir,
-+           install_rpath : rootpkglibdir,
-            install : true,
-            install_dir : rootlibexecdir)
- #endif // 0
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 3275f48acc8..52d13ac3107 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,6 +1,6 @@
 # Template file for 'elogind'
 pkgname=elogind
-version=252.9
+version=252.24
 revision=2
 build_style=meson
 configure_args="-Dcgroup-controller=elogind -Ddefault-hierarchy=legacy
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/elogind/elogind"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=7af8caa8225a406e77fb99c9f33dba5e1f0a94f0e1277c9d91dcfc016f116d85
+checksum=ade9f24def98d26fdcfc2b8f58e6a7af987adf3616fbf95db14d1e532d5bacd7
 conf_files="/etc/elogind/*.conf"
 # tests fail differently due to containerization and kernel features
 make_check=ci-skip
```

Re: Suspend Boken under Nvidia Gnome Wayland

[RandallFlagg]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New comment by RandallFlagg on void-packages repository

https://github.com/void-linux/void-packages/issues/47125#issuecomment-3129494940

Comment:
Is there going to be a fix for this?