[PATCH core-updates-frozen 0/2] Fix wlroots build with Meson 0.60.0

  • Done
  • quality assurance status badge
Details
2 participants
  • Josselin Poiret
  • Jack Hill
Owner
unassigned
Submitted by
Jack Hill
Severity
normal
J
J
Jack Hill wrote on 18 Nov 2021 17:43
(address . guix-patches@gnu.org)
alpine.DEB.2.21.2111181142040.13935@marsh.hcoop.net
The build system now automatically detects which logind to use [0], and
specifying the option is an error with Meson 0.60.0.


While I was modifying the package, I also updated its home-page to point
to the new freedesktop.org location.

Jack Hill (2):
gnu: wlroots: Remove logind-provider configure option.
gnu: wlroots: Update home page.

gnu/packages/wm.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

--
2.33.1
J
J
Jack Hill wrote on 18 Nov 2021 17:44
[PATCH core-updates-frozen 1/2] gnu: wlroots: Remove logind-provider configure option.
(address . 51953@debbugs.gnu.org)
20211118164459.7871-1-jackhill@jackhill.us
* gnu/packages/wm.scm (wlroots)[arguments]: Remove #:configure-flags.
---
gnu/packages/wm.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7b7d04eb93..d3edfe3328 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1480,8 +1480,7 @@ (define-public wlroots
(base32 "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Dlogind-provider=elogind")
- #:phases
+ '(#:phases
(modify-phases %standard-phases
(add-before 'configure 'hardcode-paths
(lambda* (#:key inputs #:allow-other-keys)
--
2.33.1
J
J
Jack Hill wrote on 18 Nov 2021 17:44
[PATCH core-updates-frozen 2/2] gnu: wlroots: Update home page.
(address . 51953@debbugs.gnu.org)
20211118164459.7871-2-jackhill@jackhill.us
* gnu/packages/wm.scm (wlroots)[home-page]: Update it.
---
gnu/packages/wm.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index d3edfe3328..a9e13d1cd8 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1505,7 +1505,7 @@ (define-public wlroots
("xorg-server-xwayland" ,xorg-server-xwayland)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "https://github.com/swaywm/wlroots")
+ (home-page "https://gitlab.freedesktop.org/wlroots/wlroots")
(synopsis "Pluggable, composable, unopinionated modules for building a
Wayland compositor")
(description "wlroots is a set of pluggable, composable, unopinionated
--
2.33.1
J
J
Josselin Poiret wrote on 18 Nov 2021 18:22
Re: [bug#51953] [PATCH core-updates-frozen 0/2] Fix wlroots build with Meson 0.60.0
(address . dev@jpoiret.xyz)
87r1bdcr9t.fsf@jpoiret.xyz
Jack Hill <jackhill@jackhill.us> writes:

Toggle quote (5 lines)
> The build system now automatically detects which logind to use [0], and
> specifying the option is an error with Meson 0.60.0.
>
> [0] https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/30308e35fac0491ab777495e2ee7e472378d375a

elogind is no longer a dependency of wlroots because of
included in 0.14.

It is a dependency of seatd though, and it should be propagated because
it is required by the pkg-config of seatd. Since you still specified
elogind here, pkg-config was able to find it nonetheless but this isn't
the proper way to do it.

Best,
Josselin Poiret
J
J
Jack Hill wrote on 19 Nov 2021 16:52
(name . Josselin Poiret)(address . dev@jpoiret.xyz)(address . 51953-done@debbugs.gnu.org)
alpine.DEB.2.21.2111191051280.13935@marsh.hcoop.net
On Thu, 18 Nov 2021, Josselin Poiret via Guix-patches via wrote:

Toggle quote (16 lines)
> Jack Hill <jackhill@jackhill.us> writes:
>
>> The build system now automatically detects which logind to use [0], and
>> specifying the option is an error with Meson 0.60.0.
>>
>> [0] https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/30308e35fac0491ab777495e2ee7e472378d375a
>
> elogind is no longer a dependency of wlroots because of
> https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/d50bbf0bbc49a9a8e010668cd357aba968ae884b
> included in 0.14.
>
> It is a dependency of seatd though, and it should be propagated because
> it is required by the pkg-config of seatd. Since you still specified
> elogind here, pkg-config was able to find it nonetheless but this isn't
> the proper way to do it.

Ah, thanks for pointing that out, and submitted the proper fix in #51972.

I'm closing this issue.

Best,
Jack
Closed
?