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 880CF15801B for ; Mon, 7 Aug 2023 02:55:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 976072BC01F; Mon, 7 Aug 2023 02:55:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6CDA82BC01C for ; Mon, 7 Aug 2023 02:55:12 +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 6A559335D68 for ; Mon, 7 Aug 2023 02:55:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B33B6F22 for ; Mon, 7 Aug 2023 02:55:09 +0000 (UTC) From: "Sam James" 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" Message-ID: <1691376823.0341dc62576853a537af25547ac6a93acf842913.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/wayfire/wayfire-0.7.5-r1.ebuild gui-wm/wayfire/wayfire-9999.ebuild X-VCS-Directories: gui-wm/wayfire/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0341dc62576853a537af25547ac6a93acf842913 X-VCS-Branch: master Date: Mon, 7 Aug 2023 02:55:09 +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: 29e357cf-c092-43fc-a7b5-7bbd0f530d76 X-Archives-Hash: f538487200865e70d0e829ca14d52910 commit: 0341dc62576853a537af25547ac6a93acf842913 Author: Alfred Wingate protonmail com> AuthorDate: Tue Aug 1 18:03:07 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 7 02:53:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0341dc62 gui-wm/wayfire: require missing use flags * drm and libinput were made optional in wlroots-0.15, they are required by wayfire unconditionally though. * Require x11-backend in wlroots to avoid automagic in wayfire. https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/b37731cdbbef4dc52033c2d26b04d2329720fa07 https://github.com/WayfireWM/wayfire/blob/v0.7.5/meson.build#L133 Closes: https://bugs.gentoo.org/907638 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32131 Signed-off-by: Sam James gentoo.org> gui-wm/wayfire/{wayfire-9999.ebuild => wayfire-0.7.5-r1.ebuild} | 8 ++++++-- gui-wm/wayfire/wayfire-9999.ebuild | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild similarity index 93% copy from gui-wm/wayfire/wayfire-9999.ebuild copy to gui-wm/wayfire/wayfire-0.7.5-r1.ebuild index 42ab1b20d21d..7f3bce722041 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.5-r1.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} == 9999 ]] ; then DEPEND+=" system-wfconfig? ( ~gui-libs/wf-config-9999:= ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] ) + system-wlroots? ( ~gui-libs/wlroots-9999:=[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " else @@ -57,7 +57,7 @@ else ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( - >=gui-libs/wlroots-0.16.0:0/16[X?] + >=gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -73,6 +73,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-0.7.5-gcc13.patch +) + src_configure() { sed -e "s:@EPREFIX@:${EPREFIX}:" \ "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild index 42ab1b20d21d..9ff84a6351ce 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-9999.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} == 9999 ]] ; then DEPEND+=" system-wfconfig? ( ~gui-libs/wf-config-9999:= ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] ) + system-wlroots? ( ~gui-libs/wlroots-9999:=[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) " else @@ -57,7 +57,7 @@ else ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( - >=gui-libs/wlroots-0.16.0:0/16[X?] + >=gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?] ) !system-wlroots? ( !gui-libs/wlroots ) "