commit: 31168cb79e9e17cf75fd1dcf8ae8ed13869622c4 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Nov 26 02:25:05 2023 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Sun Nov 26 07:46:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31168cb7
gui-wm/hyprland: Expand on comments * Otherwise someone may try simplify without grasping the implications. Closes: https://github.com/gentoo/gentoo/pull/33995 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> gui-wm/hyprland/hyprland-0.31.0-r1.ebuild | 2 ++ gui-wm/hyprland/hyprland-0.32.3.ebuild | 2 ++ gui-wm/hyprland/hyprland-9999.ebuild | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild b/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild index 66a99b216480..cdf924368947 100644 --- a/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild +++ b/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild @@ -119,7 +119,9 @@ src_configure() { } src_install() { + # First install everything except wlroots to avoid conflicts. meson_src_install --skip-subprojects wlroots + # Then install development files (mainly wlroots) for bug #916760. meson_src_install --tags devel # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects diff --git a/gui-wm/hyprland/hyprland-0.32.3.ebuild b/gui-wm/hyprland/hyprland-0.32.3.ebuild index 6b96eb93bc80..1bb1156e24e4 100644 --- a/gui-wm/hyprland/hyprland-0.32.3.ebuild +++ b/gui-wm/hyprland/hyprland-0.32.3.ebuild @@ -115,7 +115,9 @@ src_configure() { } src_install() { + # First install everything except wlroots to avoid conflicts. meson_src_install --skip-subprojects wlroots + # Then install development files (mainly wlroots) for bug #916760. meson_src_install --tags devel # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild index 6132918ba23b..795779f199ad 100644 --- a/gui-wm/hyprland/hyprland-9999.ebuild +++ b/gui-wm/hyprland/hyprland-9999.ebuild @@ -121,7 +121,9 @@ src_configure() { } src_install() { + # First install everything except wlroots to avoid conflicts. meson_src_install --skip-subprojects wlroots + # Then install development files (mainly wlroots) for bug #916760. meson_src_install --tags devel # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects
