Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
Date: Mon, 13 Sep 2021 07:28:20
Message-Id: 1631518088.2d44632fa830ebb984ab52f6afe8ab1734e51f8f.juippis@gentoo
1 commit: 2d44632fa830ebb984ab52f6afe8ab1734e51f8f
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 13 07:26:05 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 13 07:28:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d44632f
7
8 gui-wm/wayfire: add X? ( x11-base/xwayland ) dep
9
10 Bug: https://bugs.gentoo.org/811888
11 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
12
13 gui-wm/wayfire/wayfire-0.7.2.ebuild | 5 ++++-
14 gui-wm/wayfire/wayfire-9999.ebuild | 9 ++++++---
15 2 files changed, 10 insertions(+), 4 deletions(-)
16
17 diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild
18 index f0a550b499d..15d00602b19 100644
19 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild
20 +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild
21 @@ -35,7 +35,10 @@ DEPEND="
22 x11-libs/cairo:=[X?,svg]
23 x11-libs/libxkbcommon:=[X?]
24 x11-libs/pixman
25 - X? ( x11-libs/libxcb )
26 + X? (
27 + x11-base/xwayland
28 + x11-libs/libxcb
29 + )
30 system-wfconfig? (
31 >=gui-libs/wf-config-0.7.1
32 <gui-libs/wf-config-0.8.0
33
34 diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
35 index ed76917f7d8..01dc7698d0f 100644
36 --- a/gui-wm/wayfire/wayfire-9999.ebuild
37 +++ b/gui-wm/wayfire/wayfire-9999.ebuild
38 @@ -35,7 +35,10 @@ DEPEND="
39 x11-libs/cairo:=[X?,svg]
40 x11-libs/libxkbcommon:=[X?]
41 x11-libs/pixman
42 - X? ( x11-libs/libxcb )
43 + X? (
44 + x11-libs/libxcb
45 + x11-base/xwayland
46 + )
47 system-wfconfig? ( ~gui-libs/wf-config-9999:= )
48 !system-wfconfig? ( !gui-libs/wf-config )
49 system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
50 @@ -54,9 +57,9 @@ BDEPEND="
51
52 src_configure() {
53 sed -e "s:@EPREFIX@:${EPREFIX}:" \
54 - "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
55 + "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
56 sed -e "s:@EPREFIX@:${EPREFIX}:" \
57 - "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
58 + "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
59 local emesonargs=(
60 $(meson_feature system-wfconfig use_system_wfconfig)
61 $(meson_feature system-wlroots use_system_wlroots)