commit: f329a6500fa173c6f65003336a5b2c0829a23fbd
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Jun 30 16:32:47 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Jul 1 22:38:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f329a650
gui-wm/hyprland: sync live
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
gui-wm/hyprland/Manifest | 1 +
gui-wm/hyprland/hyprland-9999.ebuild | 25 +++++--------------------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 5c20668dfb5d..e0ea2aaefb47 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -2,3 +2,4 @@ DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B
92bd78168909510ffb21b46f7d66e139
DIST hyprland-0.39.1.gh.tar.gz 54681029 BLAKE2B
5a78c5e7cef3369fd72abc05941f88f0391fb87e79afaa13c128acd9f8d2aa79d6af4d0dc82a90c09689993fe914ac48bc5ba4a32173eed31ecc20204f5a4edc
SHA512
da8ee577aa823c9fb7b45bfd07503656561c1cd4cac42a9bf8f582f653c93b20824b3bce7bbcbd47b7f7f8e83fb1b630d6d5c983fe345c971322369f193c2c8f
DIST hyprland-0.40.0.gh.tar.gz 54734246 BLAKE2B
54d5b1bb062003e38156c67bfc0b796d0e4d855f35b0122fa191037caa47e5be2a25acfe588835c49ac747fc7430124480e4a7716782fd23d028289bee236e7f
SHA512
948e7237fa811f104ee11764d7947d2fd8291e79cf6db00d3f3905204f5bb2df1e51e26b2600f086f5b22d910ef50c2941343dd05e7a5d2f4b6053b150800f21
DIST hyprland-0.41.1.gh.tar.gz 54813832 BLAKE2B
1dd17e7e1f885da91fca596bf8ce9efc76b3110640a9bc11538fabf975eb55d76180c202527e0b0eac300f027adfed815d2a9a5396a48429097ef2a5ffcc4d9e
SHA512
fa63e7c429e33535fa30ca70133f6ac8617f2386bdca1e8063628a2895677c9b80965548ee21f897aea2fe6bdcc10d74d8c46989a7563b36504f4a4f43c3eaad
+DIST hyprland-0.41.2.gh.tar.gz 54821598 BLAKE2B
026559e9319690e6b48863ffdc2e059c969ab45e7bfe75578b7e41f1d10b36e720ae0655f7003107a4ff4e94c1e95aba3e8a1af8ed01bae369c571e24d966aec
SHA512
5a138d9ad6de2d45d8d0a5cde8c39ba3cd4c6bac61caf5b9f8520d0adcafe6ac1dfec4c529b8a6608133ffe9409935c1414a86d98d743be6766bdbc72641179d
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild
b/gui-wm/hyprland/hyprland-9999.ebuild
index 1b9ccde49fd6..f7df6d445341 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libinput
>=dev-libs/wayland-1.20.0
- >=gui-libs/hyprcursor-0.1.7
+ >=gui-libs/hyprcursor-0.1.9
media-libs/libglvnd
x11-libs/cairo
x11-libs/libdrm
@@ -87,16 +87,17 @@ RDEPEND="
DEPEND="
${RDEPEND}
${WLROOTS_DEPEND}
- >=dev-libs/hyprland-protocols-0.2
+ >=dev-libs/hyprland-protocols-0.3
>=dev-libs/hyprlang-0.3.2
- >=dev-libs/wayland-protocols-1.34
+ >=dev-libs/wayland-protocols-1.36
+ >=gui-libs/hyprutils-0.1.5
"
BDEPEND="
${WLROOTS_BDEPEND}
|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
app-misc/jq
dev-build/cmake
- dev-util/hyprwayland-scanner
+ >=dev-util/hyprwayland-scanner-0.3.8
virtual/pkgconfig
"
@@ -126,19 +127,3 @@ src_configure() {
meson_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
- # 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
-}
