From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1567850-garchives=archives.gentoo.org@lists.gentoo.org>
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 75E61158089
for <garchives@archives.gentoo.org>; Sat, 4 Nov 2023 19:48:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 310652BC01D;
Sat, 4 Nov 2023 19:48:15 +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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 14AD22BC01D
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Nov 2023 19:48:15 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 24B70335C5D
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Nov 2023 19:48:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B0A0C1255
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Nov 2023 19:48:07 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1699127240.bbbcc6ef6470696e11ff79c6a450603494957e5b.sam@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
X-VCS-Directories: gui-wm/hyprland/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: bbbcc6ef6470696e11ff79c6a450603494957e5b
X-VCS-Branch: master
Date: Sat, 4 Nov 2023 19:48:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d1bc32b5-fdbc-4638-8f9d-62f68d8ea45d
X-Archives-Hash: 9c0689d37a337c7d4332e94365d5b80c
commit: bbbcc6ef6470696e11ff79c6a450603494957e5b
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat Nov 4 09:03:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 4 19:47:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbcc6ef
gui-wm/hyprland: remove wlroots subproject patch
* Meson supports subproject specific options making it redundant.
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33661
Signed-off-by: Sam James <sam <AT> gentoo.org>
gui-wm/hyprland/hyprland-0.31.0-r1.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild b/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild
index d418c6225339..0e5c0a9d3180 100644
--- a/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild
@@ -79,7 +79,6 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/hyprland-0.30.0-no-wlroots-automagic-r1.patch"
"${FILESDIR}/hyprland-0.31.0-fix-log-headers.patch"
)
@@ -110,8 +109,11 @@ src_prepare() {
src_configure() {
local emesonargs=(
$(meson_feature legacy-renderer legacy_renderer)
- $(meson_feature X xwayland)
$(meson_feature systemd)
+ $(meson_feature X xwayland)
+ $(meson_feature X wlroots:xwayland)
+ -Dwlroots:backends=drm,libinput$(usev X ',x11')
+ -Dwlroots:xcb-errors=disabled
)
meson_src_configure