Fix build on FreeBSD - Refactor spawn_make_environment_for_display()
On FreeBSD environ needs to be defined in the same source file where it is used.
Linux provides a nonstandard extention to avoid needing the definition.
This patch adds back code which was removed in commit 447b3194 but with #ifdef FreeBSD since it is needed only there.
Ref: https://man7.org/linux/man-pages/man7/environ.7.html https://man.freebsd.org/cgi/man.cgi?query=environ&apropos=0&sektion=0&manpath=FreeBSD+13.1-RELEASE+and+Ports&arch=default&format=html
Merge request reports
Activity
Ah yes it was a mistake sorry. That said I would prefer a fix that
- uses
g_get_environ()
, - removes this code duplication by putting
spawn_make_environment_for_display()
inxfce-desktop-utils.c
(no need to bother with the doc).
Are you willing to do this?
Edited by Gaël Bonithon- uses
@Tamaranch I'm looking better at the code, I now see the duplication, so your request makes perfect sense.
I need to study the code a little, but this looks like a relatively simple change, so I should be able to do it, just give me a little time to "cook" it
added 1 commit
- 413ffa16 - Refactor spawn_make_environment_for_display()
- Resolved by Guido Falsi
- Resolved by Guido Falsi
added 1 commit
- f02b83d2 - Refactor spawn_make_environment_for_display()
- Resolved by Guido Falsi
Thanks! Let's wait a few days (maybe a week) to see if any other blocking issues come up, and I'll release 4.18.1.
Edited by Gaël Bonithon
changed milestone to %4.18.1