From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AEF1C158099 for ; Sun, 26 Nov 2023 07:49:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E105F2BC01A; Sun, 26 Nov 2023 07:49:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2AAD2BC01A for ; Sun, 26 Nov 2023 07:49:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 822FA3408CF for ; Sun, 26 Nov 2023 07:49:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5C2913E7 for ; Sun, 26 Nov 2023 07:49:02 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1700984772.31168cb79e9e17cf75fd1dcf8ae8ed13869622c4.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/hyprland/hyprland-0.31.0-r1.ebuild gui-wm/hyprland/hyprland-0.32.3.ebuild gui-wm/hyprland/hyprland-9999.ebuild X-VCS-Directories: gui-wm/hyprland/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 31168cb79e9e17cf75fd1dcf8ae8ed13869622c4 X-VCS-Branch: master Date: Sun, 26 Nov 2023 07:49:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f69d6c3-a9fb-4e87-98b7-dc76c246df94 X-Archives-Hash: b425611485272c05449495178c262227 commit: 31168cb79e9e17cf75fd1dcf8ae8ed13869622c4 Author: Alfred Wingate protonmail com> AuthorDate: Sun Nov 26 02:25:05 2023 +0000 Commit: Yixun Lan gentoo 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 protonmail.com> Signed-off-by: Yixun Lan 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