1 |
commit: e8760e71afdded29cc222777d0a2b81b8496fe4a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 22 09:31:16 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 22 09:31:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8760e71 |
7 |
|
8 |
gui-libs/xdg-desktop-portal-wlr: fix typo; sync live |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../xdg-desktop-portal-wlr-0.5.0.ebuild | 4 ++-- |
13 |
.../xdg-desktop-portal-wlr-9999.ebuild | 22 +++++++++++++++------- |
14 |
2 files changed, 17 insertions(+), 9 deletions(-) |
15 |
|
16 |
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild |
17 |
index 429dff91055c..f0ce88fcabfe 100644 |
18 |
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild |
19 |
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild |
20 |
@@ -45,9 +45,9 @@ src_configure() { |
21 |
"-Dwerror=false" |
22 |
) |
23 |
if use systemd; then |
24 |
- emesonargs+=(-Dsd-bus-provider=systemd) |
25 |
+ emesonargs+=(-Dsd-bus-provider=libsystemd) |
26 |
elif use elogind; then |
27 |
- emesonargs+=(-Dsd-bus-provider=elogind) |
28 |
+ emesonargs+=(-Dsd-bus-provider=libelogind) |
29 |
else |
30 |
emesonargs+=(-Dsd-bus-provider=basu) |
31 |
fi |
32 |
|
33 |
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild |
34 |
index 20c8e55c9735..f0ce88fcabfe 100644 |
35 |
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild |
36 |
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild |
37 |
@@ -22,20 +22,21 @@ IUSE="elogind systemd" |
38 |
REQUIRED_USE="?? ( elogind systemd )" |
39 |
|
40 |
DEPEND=" |
41 |
- >=media-video/pipewire-0.3.2:= |
42 |
+ >=media-video/pipewire-0.3.34:= |
43 |
+ dev-libs/inih |
44 |
dev-libs/wayland |
45 |
- >=dev-libs/wayland-protocols-1.14:= |
46 |
- elogind? ( >=sys-auth/elogind-237 ) |
47 |
- systemd? ( >=sys-apps/systemd-237 ) |
48 |
+ || ( |
49 |
+ systemd? ( >=sys-apps/systemd-237 ) |
50 |
+ elogind? ( >=sys-auth/elogind-237 ) |
51 |
+ sys-libs/basu |
52 |
+ ) |
53 |
" |
54 |
RDEPEND=" |
55 |
${DEPEND} |
56 |
sys-apps/xdg-desktop-portal |
57 |
" |
58 |
BDEPEND=" |
59 |
- >=media-video/pipewire-0.3.2:= |
60 |
- >=dev-libs/wayland-protocols-1.14 |
61 |
- dev-libs/inih:0 |
62 |
+ dev-libs/wayland-protocols |
63 |
virtual/pkgconfig |
64 |
" |
65 |
|
66 |
@@ -43,5 +44,12 @@ src_configure() { |
67 |
local emesonargs=( |
68 |
"-Dwerror=false" |
69 |
) |
70 |
+ if use systemd; then |
71 |
+ emesonargs+=(-Dsd-bus-provider=libsystemd) |
72 |
+ elif use elogind; then |
73 |
+ emesonargs+=(-Dsd-bus-provider=libelogind) |
74 |
+ else |
75 |
+ emesonargs+=(-Dsd-bus-provider=basu) |
76 |
+ fi |
77 |
meson_src_configure |
78 |
} |