From 158a01194c11345f28af1785e13d260fbc357e93 Mon Sep 17 00:00:00 2001 From: "John M. Harris, Jr." Date: Mon, 17 Jun 2024 21:55:39 -0700 Subject: gui-wm/hyprland: Fix wlroots headers Hyprland now uses /usr/include/hyprland/wlroots/ on its own. Signed-off-by: John M. Harris, Jr. --- gui-wm/hyprland/Manifest | 2 +- gui-wm/hyprland/hyprland-9999.ebuild | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest index 6cfab40..80c37bb 100644 --- a/gui-wm/hyprland/Manifest +++ b/gui-wm/hyprland/Manifest @@ -1 +1 @@ -EBUILD hyprland-9999.ebuild 3910 BLAKE2B e9f850cb4227f13c2b013a3d99ad3b1ca22f10fd7c0c26f2a5f108e970d768f6f3d81a96aa0858a50992994594c0625877ee460cd4e542b142c7959e654a9c58 SHA512 963e96e961c3feb259dd47d41c61bc1cbb8c971fb05d49c8babc5c795b2b2b963a56fb2d644e3ede75663119835002bb89dc19185ec3d05f4ebb7ebf5cce5a35 +EBUILD hyprland-9999.ebuild 3360 BLAKE2B 69e35af06ae66a7e44d6296a726e94e035382263616c9d95242228df9319d925977a20e1dae6122edd84b4343b6e553aa381a102ecc5de31269f79b9d13e7fea SHA512 cb34efe3c1bdfcd8693f89bbd29468a071e2393536bf9857ec46bc15d808b3756322646f792fc564297e317756c719e180656b50d3513dca11aeb302245b1fb2 diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild index d1ba88c..4c2186e 100644 --- a/gui-wm/hyprland/hyprland-9999.ebuild +++ b/gui-wm/hyprland/hyprland-9999.ebuild @@ -134,13 +134,4 @@ src_install() { 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 - # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there. - # Ideally you could override includedir per subproject and the install tags would - # be granular enough to only install headers. But its not requiring this. - mkdir "${ED}"/usr/include/hyprland/wlroots || die - mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die - # devel tag includes wlroots .pc and .a files still - rm -rf "${ED}"/usr/$(get_libdir)/ || die } -- cgit v1.2.3-65-gdbad