[gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/

[James Le Cuirot]

commit:     2487bf5db21890b5712ea7056f5a558a1af8e9bc
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 23:00:18 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 23:00:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2487bf5d

dev-libs/weston: Use upstream patch to fix USE=-desktop on 10.0.0

Closes: https://bugs.gentoo.org/832950
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../weston/files/weston-10.0.0-test-deps.patch     | 34 ++++++++++++++++++++++
 dev-libs/weston/weston-10.0.0.ebuild               |  1 +
 2 files changed, 35 insertions(+)

diff --git a/dev-libs/weston/files/weston-10.0.0-test-deps.patch b/dev-libs/weston/files/weston-10.0.0-test-deps.patch
new file mode 100644
index 000000000000..cc6ad8c6e130
--- /dev/null
+++ b/dev-libs/weston/files/weston-10.0.0-test-deps.patch
@@ -0,0 +1,34 @@
+From 9516859b9fdb2899a37116b55200fb04f7726b45 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels@×××××××××.com>
+Date: Tue, 8 Feb 2022 22:39:42 +0000
+Subject: [PATCH] tests: Add dependency on screenshooter client protocol
+
+Given that the test-helper code relies on the screenshooter protocol,
+make sure it's available for us to build, and the dependency ensures we
+build in order.
+
+Fixes: #588
+
+Signed-off-by: Daniel Stone <daniels@×××××××××.com>
+---
+ tests/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index d8e96e77d..955c4226c 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -29,8 +29,9 @@ lib_test_client = static_library(
+ 		'weston-test-client-helper.c',
+ 		'weston-test-fixture-compositor.c',
+ 		weston_test_client_protocol_h,
+-		weston_screenshooter_protocol_c,
+ 		weston_test_protocol_c,
++		weston_screenshooter_client_protocol_h,
++		weston_screenshooter_protocol_c,
+ 		viewporter_client_protocol_h,
+ 		viewporter_protocol_c,
+ 		'color_util.h',
+-- 
+GitLab
+

diff --git a/dev-libs/weston/weston-10.0.0.ebuild b/dev-libs/weston/weston-10.0.0.ebuild
index ef2891bf73bb..d488637fff57 100644
--- a/dev-libs/weston/weston-10.0.0.ebuild
+++ b/dev-libs/weston/weston-10.0.0.ebuild
@@ -98,6 +98,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.0.0-backend-default.patch
+	"${FILESDIR}"/${PN}-10.0.0-test-deps.patch
 )
 
 src_configure() {