The continuation from https://bugs.gentoo.org/904142.
Alright, so to recap To fix this the PR needs to create the file files/0.24.1-meson.patch with content: diff --git a/protocols/meson.build b/protocols/meson.build index 458de86..294d9ee 100644 --- a/protocols/meson.build +++ b/protocols/meson.build @@ -31,8 +31,8 @@ protocols = [ ['pointer-constraints-unstable-v1.xml'], ['tablet-unstable-v2.xml'], ['idle.xml'], - [hl_protocol_dir, 'protocols/hyprland-toplevel-export-v1.xml'], - [hl_protocol_dir, 'protocols/hyprland-global-shortcuts-v1.xml'] + ['/usr/share', 'protocols/hyprland-toplevel-export-v1.xml'], + ['/usr/share', 'protocols/hyprland-global-shortcuts-v1.xml'] ] wl_protos_src = [] wl_protos_headers = [] And it has to add a line under 84 with the content: cp "${S}/subprojects/hyprland-protocols/protocols/hyprland-global-shortcuts-v1.xml" "${S}/protocols" || die (And obviously bumping to version to hyprland-0.24.1-r1) Am I right?
Yes, exactly! :)
This is the PR: https://github.com/gentoo-mirror/guru/pull/11
Please file it at https://github.com/gentoo/guru
I just realized that all this time I was using the mirror ahahah
Alright, it's this now: https://github.com/gentoo/guru/pull/93
Created attachment 860173 [details] hyprland-0.24.1-r1.ebuild Can you try to merge this ebuild? I changed the source of the tarball to use upstream's "dist tarballs" which includes sources for submodules, instead of fetching it manually. I'm curious to see if you can replicate the issue with this ebuild. If it still doesn't work, we'll get back to your PR, but it would be easier to help you through IM instead of comments on the PR. If you use Matrix, IRC, Telegram or Discord, I can be reached on any of those.
Created attachment 860191 [details] hyprland-0.24.1-r1.ebuild (2) If the above ebuild works for you, try to emerge it twice to make sure the issue isn't reproducible. If it doesn't work, try the attached ebuild instead (and again, if it works, emerge it twice) Let me know if either ebuild worked for you (and if so, which one).
Alright, my Discord is sicro#5550 hit me up there. So, to emerge the ebuild you gave me I have to just put them in the `gui-wm/hyprland` directory and run `ebuild clean->manifest->merge`, right?
(In reply to ignamartinoli from comment #9) > Alright, my Discord is sicro#5550 hit me up there. > > So, to emerge the ebuild you gave me I have to just put them in the > `gui-wm/hyprland` directory and run `ebuild clean->manifest->merge`, right? Yes exactly
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8576ffbcd6f5a330c9e136fb403839ebc5c166f commit e8576ffbcd6f5a330c9e136fb403839ebc5c166f Author: Julien Roy <julien@jroy.ca> AuthorDate: 2023-04-17 01:58:07 +0000 Commit: Julien Roy <julien@jroy.ca> CommitDate: 2023-04-17 01:58:07 +0000 gui-wm/hyprland: add 0.24.1-r1 Drop workaround for meson issue Add dependency for hyprland-protocols Closes: https://bugs.gentoo.org/904299 Thanks to: Tano <ignamartinoli@proton.me> Signed-off-by: Julien Roy <julien@jroy.ca> gui-wm/hyprland/Manifest | 1 + gui-wm/hyprland/hyprland-0.24.1-r1.ebuild | 93 +++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+)
