| 1 |
commit: b018c0aeaad98098c876a493a682b47f948f6e1a |
| 2 |
Author: Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com> |
| 3 |
AuthorDate: Sun May 16 22:13:48 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 8 01:27:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b018c0ae |
| 7 |
|
| 8 |
x11-wm/mutter: Accept cvt from x11-libs/libxcvt |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/777564 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/20844 |
| 12 |
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com> |
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
x11-wm/mutter/mutter-40.2.1.ebuild | 11 ++++++++--- |
| 16 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild |
| 19 |
index 62bbdb155ee..e981a487b65 100644 |
| 20 |
--- a/x11-wm/mutter/mutter-40.2.1.ebuild |
| 21 |
+++ b/x11-wm/mutter/mutter-40.2.1.ebuild |
| 22 |
@@ -82,7 +82,7 @@ DEPEND="${DEPEND} |
| 23 |
x11-base/xorg-proto |
| 24 |
sysprof? ( >=dev-util/sysprof-common-3.38.0 ) |
| 25 |
" |
| 26 |
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility |
| 27 |
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary |
| 28 |
BDEPEND=" |
| 29 |
dev-libs/wayland |
| 30 |
dev-util/gdbus-codegen |
| 31 |
@@ -90,8 +90,13 @@ BDEPEND=" |
| 32 |
>=sys-devel/gettext-0.19.8 |
| 33 |
virtual/pkgconfig |
| 34 |
test? ( app-text/docbook-xml-dtd:4.5 ) |
| 35 |
- wayland? ( >=sys-kernel/linux-headers-4.4 |
| 36 |
- x11-base/xorg-server ) |
| 37 |
+ wayland? ( |
| 38 |
+ >=sys-kernel/linux-headers-4.4 |
| 39 |
+ || ( |
| 40 |
+ x11-libs/libxcvt |
| 41 |
+ x11-base/xorg-server[xorg,-minimal] |
| 42 |
+ ) |
| 43 |
+ ) |
| 44 |
" |
| 45 |
|
| 46 |
PATCHES=( |
Archives