From 5e95b1f9ac84775b95ce31f7c85b61fbdef8952c Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Mon, 18 May 2020 19:57:53 -0400 Subject: gui-wm/wayfire: fix dependency versioning for building Closes: https://bugs.gentoo.org/723760 added proper dependency versions of wlroots also changed options to src_configure instead of src_compile as per standard convention not version bumping as this fixes compile bugs and no runtime changes Signed-off-by: Aisha Tammy Closes: https://github.com/gentoo/gentoo/pull/15875 Signed-off-by: Aaron Bauman --- gui-wm/wayfire/wayfire-0.4.0.ebuild | 6 +++--- gui-wm/wayfire/wayfire-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gui-wm') diff --git a/gui-wm/wayfire/wayfire-0.4.0.ebuild b/gui-wm/wayfire/wayfire-0.4.0.ebuild index 96c6375e2b05..960c79380369 100644 --- a/gui-wm/wayfire/wayfire-0.4.0.ebuild +++ b/gui-wm/wayfire/wayfire-0.4.0.ebuild @@ -38,7 +38,7 @@ DEPEND=" gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) + system-wlroots? ( ~gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -55,7 +55,7 @@ BDEPEND=" >=dev-libs/wayland-protocols-1.18 " -src_compile(){ +src_configure() { local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) @@ -66,7 +66,7 @@ src_compile(){ "-Db_sanitize=address,undefined" ) fi - meson_src_compile + meson_src_configure } src_install() { diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild index 96c6375e2b05..2ca45c4a7e86 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-9999.ebuild @@ -38,7 +38,7 @@ DEPEND=" gles2? ( media-libs/libglvnd[X] ) system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] ) !system-wfconfig? ( !gui-libs/wf-config ) - system-wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) + system-wlroots? ( >=gui-libs/wlroots-0.10.1[elogind=,systemd=,X] ) !system-wlroots? ( !gui-libs/wlroots ) " @@ -55,7 +55,7 @@ BDEPEND=" >=dev-libs/wayland-protocols-1.18 " -src_compile(){ +src_configure() { local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) @@ -66,7 +66,7 @@ src_compile(){ "-Db_sanitize=address,undefined" ) fi - meson_src_compile + meson_src_configure } src_install() { -- cgit v1.2.3-65-gdbad