commit: 0341dc62576853a537af25547ac6a93acf842913 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Tue Aug 1 18:03:07 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32131 Signed-off-by: Sam James <sam <AT> 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 ) "
