[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     8b89d304c6654d162619cb514aa62e4fd0962e3e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 21:41:14 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 21:45:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b89d304

dev-qt/qtwayland: potentially fix downgrade edge case (qt6)

Albeit overall downgrading Qt is hardly supported and unlikely
to be smooth either way, esp. if revdeps have arleady been built
against the newer version given backward compat is not guaranteed.

Just repeat the find_package line rather than do extra conditionals,
it'll repeat the argument but it's simpler/readable.

Closes: https://bugs.gentoo.org/947049
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtwayland/qtwayland-6.8.1.ebuild    | 1 +
 dev-qt/qtwayland/qtwayland-6.8.9999.ebuild | 1 +
 dev-qt/qtwayland/qtwayland-6.9.9999.ebuild | 1 +
 dev-qt/qtwayland/qtwayland-6.9999.ebuild   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/dev-qt/qtwayland/qtwayland-6.8.1.ebuild b/dev-qt/qtwayland/qtwayland-6.8.1.ebuild
index 7354b8e1d011..fba61eb81b67 100644
--- a/dev-qt/qtwayland/qtwayland-6.8.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.8.1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package compositor Qt6Quick)
 		$(cmake_use_find_package qml Qt6Quick)
 		$(qt_feature compositor wayland_server)
 		$(qt_feature gnome wayland_decoration_adwaita)

diff --git a/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild
index 677184ab5edf..0d3aa128524d 100644
--- a/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.8.9999.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package compositor Qt6Quick)
 		$(cmake_use_find_package qml Qt6Quick)
 		$(qt_feature compositor wayland_server)
 		$(qt_feature gnome wayland_decoration_adwaita)

diff --git a/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild
index 2da37b7b546c..65f970f02e04 100644
--- a/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.9.9999.ebuild
@@ -49,6 +49,7 @@ CMAKE_SKIP_TESTS=(
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package compositor Qt6Quick)
 		$(cmake_use_find_package qml Qt6Quick)
 		$(qt_feature compositor wayland_server)
 		$(qt_feature gnome wayland_decoration_adwaita)

diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
index 2da37b7b546c..65f970f02e04 100644
--- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
@@ -49,6 +49,7 @@ CMAKE_SKIP_TESTS=(
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package compositor Qt6Quick)
 		$(cmake_use_find_package qml Qt6Quick)
 		$(qt_feature compositor wayland_server)
 		$(qt_feature gnome wayland_decoration_adwaita)